Make sure Empty ItemStacks never get to the point where "getItem()" i…

…s called on it, which returns a null item. #388
progwml6 · Aug 29, 2017 · 0186811 · 0186811
1 parent c3c49df
commit 0186811
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java b/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java
@@ -69,11 +69,14 @@ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state,
     {
         ItemStack itemstack = playerIn.getHeldItem(hand);
 
-        if (state.getValue(BlockCloud.TYPE) == BlockCloud.CloudType.SULFUR && itemstack.getItem() != Items.AIR && itemstack.getItem() == Items.FLINT_AND_STEEL)
+        if (!itemstack.isEmpty())
         {
-            worldIn.setBlockToAir(pos);
-            this.explode(worldIn, pos, 1, playerIn);
-            return true;
+            if (state.getValue(BlockCloud.TYPE) == BlockCloud.CloudType.SULFUR && itemstack.getItem() != Items.AIR && itemstack.getItem() == Items.FLINT_AND_STEEL)
+            {
+                worldIn.setBlockToAir(pos);
+                this.explode(worldIn, pos, 1, playerIn);
+                return true;
+            }
         }
 
         return super.onBlockActivated(worldIn, pos, state, playerIn, hand, facing, hitX, hitY, hitZ);