diff options
| author | md_5 <md_5@bigpond.com> | 2012-05-23 16:04:17 +1000 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-05-23 04:10:49 -0500 |
| commit | 21327265f0eaf112bf0927528342c8af7a8b185f (patch) | |
| tree | fd65d76649d247d6725a75ff641f8d0f6c7657f0 | |
| parent | 0f984dd9a58dc8fbabcf2ca0326934715c4bd185 (diff) | |
| download | craftbukkit-21327265f0eaf112bf0927528342c8af7a8b185f.tar craftbukkit-21327265f0eaf112bf0927528342c8af7a8b185f.tar.gz craftbukkit-21327265f0eaf112bf0927528342c8af7a8b185f.tar.lz craftbukkit-21327265f0eaf112bf0927528342c8af7a8b185f.tar.xz craftbukkit-21327265f0eaf112bf0927528342c8af7a8b185f.zip | |
[Bleeding] Improve handling of ItemStacks. Addresses BUKKIT-1697
| -rw-r--r-- | src/main/java/net/minecraft/server/Container.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java index c190fee4..5b7058bf 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -119,7 +119,11 @@ public abstract class Container { } if (j == 1) { - entityhuman.drop(playerinventory.getCarried().a(1)); + // CraftBukkit start + if (playerinventory.getCarried().count > 0) { + entityhuman.drop(playerinventory.getCarried().a(1)); + } + // CraftBukkit end if (playerinventory.getCarried().count == 0) { playerinventory.setCarried((ItemStack) null); } @@ -162,8 +166,11 @@ public abstract class Container { if (l > slot1.a()) { l = slot1.a(); } - - slot1.set(itemstack3.a(l)); + // CraftBukkit start + if (itemstack3.count >= l) { + slot1.set(itemstack3.a(l)); + } + // CraftBukkit end if (itemstack3.count == 0) { playerinventory.setCarried((ItemStack) null); } |