Merge 1.14, and clean up some unused AT entries.

This commit is contained in:
Vincent Lee committed 2020-04-05 00:32:21 -05:00
commit 2eb14c45eb
23 files changed
+211 -51

No files matched your search

@@ -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);
}