Account for nullable placer in onBlockPlacedBy. Closes #3215

This commit is contained in:
Vincent Lee committed 2020-03-19 21:04:36 -05:00
1 parent ad7666e668
commit 9d99c7184f
7 files changed
+14 -9

No files matched your search

@@ -232,7 +232,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile
/**
* Called when this sub tile is placed in the world (by an entity).
*/
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {}
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {}
/**
* Called when a player right clicks this sub tile.
@@ -36,6 +36,7 @@ import vazkii.botania.api.wand.IWandable;
import vazkii.botania.common.block.tile.TileAnimatedTorch;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD {
@@ -56,7 +57,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
((TileAnimatedTorch) world.getTileEntity(pos)).onPlace(entity);
}
@@ -34,6 +34,7 @@ import vazkii.botania.api.wand.IWandable;
import vazkii.botania.common.block.decor.BlockFloatingFlower;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Random;
import java.util.function.Supplier;
@@ -100,7 +101,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack);
}
@@ -41,6 +41,7 @@ import vazkii.botania.api.wand.IWandable;
import vazkii.botania.common.item.material.ItemDye;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.function.Supplier;
@@ -134,7 +135,7 @@ public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandH
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity entity, ItemStack stack) {
((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockPlacedBy(world, pos, state, entity, stack);
}
@@ -37,6 +37,7 @@ import vazkii.botania.common.block.tile.TileTinyPotato;
import vazkii.botania.common.core.helper.InventoryHelper;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class BlockTinyPotato extends BlockMod {
@@ -87,7 +88,7 @@ public class BlockTinyPotato extends BlockMod {
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity par5EntityLiving, ItemStack stack) {
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity living, ItemStack stack) {
if (stack.hasDisplayName())
((TileTinyPotato) world.getTileEntity(pos)).name = stack.getDisplayName();
}
@@ -74,8 +74,8 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
Direction orientation = Direction.getFacingDirections(placer)[0].getOpposite();
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
Direction orientation = placer == null ? Direction.WEST : Direction.getFacingDirections(placer)[0].getOpposite();
TileSpreader spreader = (TileSpreader) world.getTileEntity(pos);
switch(orientation) {
@@ -93,7 +93,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir
break;
case WEST:
break;
default:
case EAST:
spreader.rotationX = 180F;
break;
}
@@ -28,6 +28,7 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nullable;
import java.util.Arrays;
public class TileAnimatedTorch extends TileMod implements ITickableTileEntity {
@@ -76,7 +77,7 @@ public class TileAnimatedTorch extends TileMod implements ITickableTileEntity {
world.addBlockEvent(getPos(), ModBlocks.animatedTorch, 0, (side + 1) % 4);
}
public void onPlace(LivingEntity entity) {
public void onPlace(@Nullable LivingEntity entity) {
if(entity != null) {
side = Arrays.asList(SIDES).indexOf(entity.getHorizontalFacing().getOpposite());
}