From bb680171416b9d8d5b225bb779971f399950fbf1 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 7 Feb 2020 21:10:43 -0600 Subject: [PATCH] Fix missing nullcheck in platform. Closes #3168 --- src/main/java/vazkii/botania/common/block/BlockPlatform.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 5327be4ac..f0da160ca 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -113,7 +113,9 @@ public class BlockPlatform extends BlockMod implements IWandable, IManaCollision BlockItemUseContext ctx = new BlockItemUseContext(world, player, hand, currentStack, hit); BlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateForPlacement(ctx); - if(isValidBlock(changeState, world, pos) && !(changeState.getBlock() instanceof BlockPlatform) && changeState.getMaterial() != Material.AIR) { + if(changeState != null && isValidBlock(changeState, world, pos) + && !(changeState.getBlock() instanceof BlockPlatform) + && changeState.getMaterial() != Material.AIR) { if (!world.isRemote) { camo.camoState = changeState; world.notifyBlockUpdate(pos, state, state, 3);