From 247522fc6888ddd2edce03b40e8e427421707fc3 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 13 Jul 2014 02:12:27 +0100 Subject: [PATCH] Fixed crash when breaking a mana pool and placing a spreader/flower in it's place. --- MODSRC/vazkii/botania/common/block/BlockPool.java | 1 + .../vazkii/botania/common/block/BlockSpreader.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/MODSRC/vazkii/botania/common/block/BlockPool.java b/MODSRC/vazkii/botania/common/block/BlockPool.java index 15390c26a..d94115d2e 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPool.java +++ b/MODSRC/vazkii/botania/common/block/BlockPool.java @@ -75,6 +75,7 @@ public class BlockPool extends BlockModContainer implements IWandHUD, IWandable, @Override public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { + super.breakBlock(par1World, par2, par3, par4, par5, par6); TilePool pool = (TilePool) par1World.getTileEntity(par2, par3, par4); lastFragile = pool.fragile; } diff --git a/MODSRC/vazkii/botania/common/block/BlockSpreader.java b/MODSRC/vazkii/botania/common/block/BlockSpreader.java index 15d1a259c..0463db394 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpreader.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpreader.java @@ -135,7 +135,11 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) { - TileSpreader spreader = (TileSpreader) par1World.getTileEntity(par2, par3, par4); + TileEntity tile = par1World.getTileEntity(par2, par3, par4); + if(!(tile instanceof TileSpreader)) + return false; + + TileSpreader spreader = (TileSpreader) tile; ItemStack lens = spreader.getStackInSlot(0); ItemStack heldItem = par5EntityPlayer.getCurrentEquippedItem(); boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; @@ -161,7 +165,11 @@ public class BlockSpreader extends BlockModContainer implements IWandable, IWand @Override public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) { - TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4); + TileEntity tile = par1World.getTileEntity(par2, par3, par4); + if(!(tile instanceof TileSimpleInventory)) + return; + + TileSimpleInventory inv = (TileSimpleInventory) tile; if (inv != null) { for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {