From 5a5b29a709ca5216b4ed5994eb01c1c72eb0f7d0 Mon Sep 17 00:00:00 2001
From: Taylor Shuler <taylorshuler@aol.com>
Date: Sun, 11 May 2014 16:27:51 -0400
Subject: [PATCH] Cleaned up some logic

---
 .../ironchest/MappableItemStackWrapper.java   | 28 -------------------
 .../mods/ironchest/TileEntityIronChest.java   | 18 +++++-------
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java

diff --git a/src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java b/src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java
deleted file mode 100644
index f5f7d38..0000000
--- a/src/main/java/cpw/mods/ironchest/MappableItemStackWrapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package cpw.mods.ironchest;
-
-import net.minecraft.item.ItemStack;
-
-public class MappableItemStackWrapper {
-	private ItemStack wrap;
-
-	public MappableItemStackWrapper(ItemStack toWrap) {
-		wrap = toWrap;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (!(obj instanceof MappableItemStackWrapper))
-			return false;
-		MappableItemStackWrapper isw = (MappableItemStackWrapper) obj;
-		if (wrap.getHasSubtypes()) {
-			return isw.wrap.isItemEqual(wrap);
-		} else {
-			return isw.wrap == wrap;
-		}
-	}
-
-	@Override
-	public int hashCode() {
-		return System.identityHashCode(wrap);
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java
index 997ae36..5e8ebea 100644
--- a/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java
+++ b/src/main/java/cpw/mods/ironchest/TileEntityIronChest.java
@@ -206,13 +206,12 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
 		if (worldObj != null && !worldObj.isRemote && numUsingPlayers != 0 && (ticksSinceSync + xCoord + yCoord + zCoord) % 200 == 0) {
 			numUsingPlayers = 0;
 			float var1 = 5.0F;
-			List<EntityPlayer> var2 = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB((double) ((float) xCoord - var1), (double) ((float) yCoord - var1), (double) ((float) zCoord - var1), (double) ((float) (xCoord + 1) + var1), (double) ((float) (yCoord + 1) + var1), (double) ((float) (zCoord + 1) + var1)));
-			Iterator<EntityPlayer> var3 = var2.iterator();
 
-			while (var3.hasNext()) {
-				EntityPlayer var4 = var3.next();
+			List<EntityPlayer> playerlist = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getAABBPool().getAABB((double) ((float) xCoord - var1), (double) ((float) yCoord - var1), (double) ((float) zCoord - var1), (double) ((float) (xCoord + 1) + var1), (double) ((float) (yCoord + 1) + var1), (double) ((float) (zCoord + 1) + var1)));
+			Iterator<EntityPlayer> player = playerlist.iterator();
 
-				if (var4.openContainer instanceof ContainerIronChest) {
+			while (player.hasNext()) {
+				if (player.next().openContainer instanceof ContainerIronChest) {
 					++numUsingPlayers;
 				}
 			}
@@ -261,13 +260,10 @@ public class TileEntityIronChest extends TileEntity implements IInventory {
 	public boolean receiveClientEvent(int i, int j) {
 		if (i == 1) {
 			numUsingPlayers = j;
-		} else if (i == 2) {
-			facing = (byte) j;
-		} else if (i == 3) {
-			facing = (byte) (j & 0x7);
-			numUsingPlayers = (j & 0xF8) >> 3;
+			return true;
+		} else {
+			return super.receiveClientEvent(i, j);
 		}
-		return true;
 	}
 
 	@Override