From 8c8d8b2bc277d477bc8f7f839732420b908da22c Mon Sep 17 00:00:00 2001 From: Mark Whittington Date: Mon, 24 Mar 2014 01:58:25 -0400 Subject: [PATCH] Fix miner and chargepad bugs. Chargepad bug can cause server to crash. Miner bug is minor (heh). --- common/mekanism/common/miner/ThreadMinerSearch.java | 7 ++++--- common/mekanism/common/tile/TileEntityChargepad.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/mekanism/common/miner/ThreadMinerSearch.java b/common/mekanism/common/miner/ThreadMinerSearch.java index 42939e0eb..48c74819a 100644 --- a/common/mekanism/common/miner/ThreadMinerSearch.java +++ b/common/mekanism/common/miner/ThreadMinerSearch.java @@ -11,6 +11,7 @@ import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; public class ThreadMinerSearch extends Thread { @@ -65,12 +66,12 @@ public class ThreadMinerSearch extends Thread { continue; } - - if(tileEntity.worldObj.getBlockTileEntity(x, y, z) instanceof IBoundingBlock) + + TileEntity bte; + if ((bte = tileEntity.worldObj.getBlockTileEntity(x, y, z)) != null && bte instanceof IBoundingBlock) { continue; } - info.id = tileEntity.worldObj.getBlockId(x, y, z); info.meta = tileEntity.worldObj.getBlockMetadata(x, y, z); diff --git a/common/mekanism/common/tile/TileEntityChargepad.java b/common/mekanism/common/tile/TileEntityChargepad.java index dc1fe9292..b351abb3a 100644 --- a/common/mekanism/common/tile/TileEntityChargepad.java +++ b/common/mekanism/common/tile/TileEntityChargepad.java @@ -54,7 +54,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct { isActive = false; - List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+0.2, zCoord+1)); + List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+0.2, zCoord+1)); for(EntityLivingBase entity : entities) {