Fixed ingot pile NPE

TerraFirmaCraft · Sep 13, 2015 · 827435e · 827435e
1 parent 5af2ed4
commit 827435e
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/Common/com/bioxx/tfc/Blocks/BlockIngotPile.java b/src/Common/com/bioxx/tfc/Blocks/BlockIngotPile.java
@@ -367,19 +367,30 @@ public void onNeighborBlockChange(World world, int x, int y, int z, Block block)
 	{
 		if(!world.isRemote)
 		{
-			if(!world.isSideSolid(x, y - 1, z, ForgeDirection.UP))
+			if ( !world.isSideSolid(x, y - 1, z, ForgeDirection.UP) && world.getTileEntity(x, y, z) instanceof TEIngotPile)
 			{
-				if(world.getBlock(x, y - 1, z) == this && ((TEIngotPile)world.getTileEntity(x, y, z)).storage[0].getItem() == ((TEIngotPile)world.getTileEntity(x, y - 1, z)).storage[0].getItem())
+				TEIngotPile ingotPile = (TEIngotPile) world.getTileEntity(x, y, z);
+				Item ingot = ingotPile.storage[0] != null ? ingotPile.storage[0].getItem() : null;
+
+				if (world.getBlock(x, y - 1, z) == this && world.getTileEntity(x, y - 1, z) instanceof TEIngotPile)
 				{
-					combineIngotsDown(world, x, y, z);
+					TEIngotPile lowerPile = (TEIngotPile) world.getTileEntity(x, y - 1, z);
+					Item lowerIngot = lowerPile.storage[0] != null ? lowerPile.storage[0].getItem() : null;
+
+					if (ingot == lowerIngot)
+						combineIngotsDown(world, x, y, z);
 				}
-				else if(world.getBlock(x, y + 1, z) == this && ((TEIngotPile)world.getTileEntity(x, y, z)).storage[0].getItem() == ((TEIngotPile)world.getTileEntity(x, y + 1, z)).storage[0].getItem())
+				else if (world.getBlock(x, y + 1, z) == this && world.getTileEntity(x, y + 1, z) instanceof TEIngotPile)
 				{
-					combineIngotsUp(world, x, y, z);
+					TEIngotPile upperPile = (TEIngotPile) world.getTileEntity(x, y + 1, z);
+					Item upperIngot = upperPile.storage[0] != null ? upperPile.storage[0].getItem() : null;
+
+					if (ingot == upperIngot)
+						combineIngotsUp(world, x, y, z);
 				}
 				else
 				{
-					((TEIngotPile)world.getTileEntity(x, y, z)).ejectContents();
+					ingotPile.ejectContents();
 					world.setBlockToAir(x, y, z);
 					return;
 				}