[Bleeding] Improve handling of ItemStacks. Addresses BUKKIT-1697

This commit is contained in:
md_5 2012-05-23 16:04:17 +10:00 committed by feildmaster
parent 0f984dd9a5
commit 21327265f0

View File

@ -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);
}