diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-06-29 23:02:25 +0100 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-06-30 15:19:25 +0100 |
| commit | a679e7f38025924dba3dd688ccb87e92306c4c3e (patch) | |
| tree | 604a20c893873bef01a92eaa09d9309f32b7e29c /src/main/java/net/minecraft/server/InventoryPlayer.java | |
| parent | a98c7ba2c706caa0ba83bddefa5ffecbe658ccd3 (diff) | |
| download | craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.gz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.lz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.tar.xz craftbukkit-a679e7f38025924dba3dd688ccb87e92306c4c3e.zip | |
Update to Minecraft 1.7
Diffstat (limited to 'src/main/java/net/minecraft/server/InventoryPlayer.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/InventoryPlayer.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryPlayer.java b/src/main/java/net/minecraft/server/InventoryPlayer.java index 95a1ceb1..f25e699b 100644 --- a/src/main/java/net/minecraft/server/InventoryPlayer.java +++ b/src/main/java/net/minecraft/server/InventoryPlayer.java @@ -77,7 +77,6 @@ public class InventoryPlayer implements IInventory { return -1; } - private int e(ItemStack itemstack) { int i = itemstack.id; int j = itemstack.count; @@ -285,7 +284,7 @@ public class InventoryPlayer implements IInventory { } public boolean b(Block block) { - if (block.material != Material.STONE && block.material != Material.ORE && block.material != Material.SNOW_BLOCK && block.material != Material.SNOW_LAYER) { + if (block.material.i()) { return true; } else { ItemStack itemstack = this.getItem(this.itemInHandIndex); @@ -307,7 +306,7 @@ public class InventoryPlayer implements IInventory { j += k1; k += i1; - int l1 = ((ItemArmor) this.armor[l].getItem()).bk; + int l1 = ((ItemArmor) this.armor[l].getItem()).bl; i += l1; } |