summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNate Mortensen <nate.richard.mortensen@gmail.com>2014-05-24 23:45:45 -0600
committerTravis Watkins <amaranth@ubuntu.com>2014-06-01 00:22:58 -0500
commit47b57e6bcf90fc988466619d1dd3b4ba641f69fd (patch)
tree83838c595ce2b44cea2ab926ee067bb5fc0a6b9e /src
parent0a45c3ebf79b8077d7ae324ba186639ed66f8446 (diff)
downloadcraftbukkit-47b57e6bcf90fc988466619d1dd3b4ba641f69fd.tar
craftbukkit-47b57e6bcf90fc988466619d1dd3b4ba641f69fd.tar.gz
craftbukkit-47b57e6bcf90fc988466619d1dd3b4ba641f69fd.tar.lz
craftbukkit-47b57e6bcf90fc988466619d1dd3b4ba641f69fd.tar.xz
craftbukkit-47b57e6bcf90fc988466619d1dd3b4ba641f69fd.zip
Some assumptions are better than others.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/Container.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
index 73586455..a2524f63 100644
--- a/src/main/java/net/minecraft/server/Container.java
+++ b/src/main/java/net/minecraft/server/Container.java
@@ -504,7 +504,7 @@ public abstract class Container {
itemstack.count -= maxStack - itemstack1.count;
itemstack1.count = maxStack;
slot.f();
- flag1 = itemstack.count == 0; // Don't give a success return if we have leftovers
+ flag1 = true;
}
// CraftBukkit end
}
@@ -530,10 +530,8 @@ public abstract class Container {
if (itemstack1 == null) {
slot.set(itemstack.cloneItemStack());
slot.f();
- // CraftBukkit start - Don't assume entire stack went in
- itemstack.count -= slot.getItem().count;
- flag1 = itemstack.count == 0;
- // CraftBukkit end
+ itemstack.count = 0;
+ flag1 = true;
break;
}