Merge pull request #269 from way2muchnoise/1.7-update

fixes #268
iopleke · Oct 16, 2014 · b9cd1a6 · b9cd1a6
2 parents 8d52334 + 991aebe
commit b9cd1a6
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/src/main/java/minechem/tileentity/prefab/TileEntityProxy.java b/src/main/java/minechem/tileentity/prefab/TileEntityProxy.java
@@ -215,7 +215,7 @@ public void closeInventory()
 	@Override
 	public boolean isItemValidForSlot(int i, ItemStack itemstack)
 	{
-		if (this.getManager() != null && this.getManager() instanceof ISidedInventory)
+		if (this.manager != null && this.manager != this)
 		{
 			return ((ISidedInventory) this.getManager()).isItemValidForSlot(i, itemstack);
 		}
@@ -225,21 +225,9 @@ public boolean isItemValidForSlot(int i, ItemStack itemstack)
 	@Override
 	public int[] getAccessibleSlotsFromSide(int var1)
 	{
-		if (this.getManager() != null && this.getManager() instanceof ISidedInventory)
+		if (this.manager != null && this.manager != this)
 		{
-			try
-			{
-				return ((ISidedInventory) this.getManager()).getAccessibleSlotsFromSide(var1);
-			} catch (StackOverflowError o)
-			{
-                // wrapped in a try-catch
-				// prevents right clicking failure
-				// with a buildcraft pipe
-				if (Settings.DebugMode)
-				{
-					Minechem.LOGGER.info("TileEntity generated a StackOverflowError at: x" + this.xCoord + " y" + this.yCoord + " z" + this.zCoord);
-				}
-			}
+			return ((ISidedInventory) this.getManager()).getAccessibleSlotsFromSide(var1);
 		}
 		return new int[0];
 	}