diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 10:49:23 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 14:38:31 +0000 |
| commit | 543c4879fee3b7165764c5371d226c93fe3a657b (patch) | |
| tree | 4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/Container.java | |
| parent | e9ca87000c1794715bc3fe0a7d1caaf809057635 (diff) | |
| download | craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip | |
Updated CraftBukkit to 1.2
Diffstat (limited to 'src/main/java/net/minecraft/server/Container.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Container.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java index 63ec6374..c190fee4 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -177,7 +177,7 @@ public abstract class Container { slot1.set((ItemStack) null); } - slot1.b(playerinventory.getCarried()); + slot1.c(playerinventory.getCarried()); } else if (slot1.isAllowed(itemstack3)) { if (itemstack2.id == itemstack3.id && (!itemstack2.usesData() || itemstack2.getData() == itemstack3.getData()) && ItemStack.equals(itemstack2, itemstack3)) { l = j == 0 ? itemstack3.count : 1; @@ -203,12 +203,12 @@ public abstract class Container { l = itemstack2.count; if (l > 0 && l + itemstack3.count <= itemstack3.getMaxStackSize()) { itemstack3.count += l; - itemstack2.a(l); + itemstack2 = slot1.a(l); if (itemstack2.count == 0) { slot1.set((ItemStack) null); } - slot1.b(playerinventory.getCarried()); + slot1.c(playerinventory.getCarried()); } } } |