Apply fixes from binary patches.

2015-03-25 08:24:42 +03:00
parent 16773ead6a
commit 099d1a7732
23 changed files with 604 additions and 431 deletions
--- a/patches/net/minecraft/entity/player/InventoryPlayer.java.patch
+++ b/patches/net/minecraft/entity/player/InventoryPlayer.java.patch
@ -124,17 +124,3 @@
             }
         }
     }
-@@ -684,6 +759,13 @@
- 
-     public ItemStack getItemStack()
-     {
-+        // CraftBukkit start
-+        if (this.itemStack != null && this.itemStack.stackSize == 0)
-+        {
-+            this.setItemStack(null);
-+        }
-+
-+        // CraftBukkit end
-         return this.itemStack;
-     }
-