summaryrefslogtreecommitdiffstats
path: root/nms-patches/Container.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-07-30 16:56:52 +1000
committermd_5 <git@md-5.net>2015-07-30 17:13:35 +1000
commit9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e (patch)
tree419daa22a7b957617c86aae6a4d26098f2157995 /nms-patches/Container.patch
parentde5c26123fcb6294e77ec916d91635c3f18982ee (diff)
downloadcraftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar
craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.gz
craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.lz
craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.tar.xz
craftbukkit-9935adc4ed9ac6c9ddf6c9e290b4c9f59b60cd4e.zip
Update for minor remapping changes.
Diffstat (limited to 'nms-patches/Container.patch')
-rw-r--r--nms-patches/Container.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/Container.patch b/nms-patches/Container.patch
index 84210f03..55fe26c7 100644
--- a/nms-patches/Container.patch
+++ b/nms-patches/Container.patch
@@ -110,12 +110,12 @@
}
if (j == 1) {
-- entityhuman.drop(playerinventory.getCarried().a(1), true);
+- entityhuman.drop(playerinventory.getCarried().cloneAndSubtract(1), true);
- if (playerinventory.getCarried().count == 0) {
+ // CraftBukkit start - Store a reference
+ ItemStack itemstack4 = playerinventory.getCarried();
+ if (itemstack4.count > 0) {
-+ entityhuman.drop(itemstack4.a(1), true);
++ entityhuman.drop(itemstack4.cloneAndSubtract(1), true);
+ }
+
+ if (itemstack4.count == 0) {
@@ -136,7 +136,7 @@
} else if (slot2.isAllowed(entityhuman)) {
if (itemstack4 == null) {
@@ -249,7 +315,11 @@
- itemstack4.a(k1);
+ itemstack4.cloneAndSubtract(k1);
if (itemstack4.count == 0) {
playerinventory.setCarried((ItemStack) null);
+ // CraftBukkit start - Update client cursor if we didn't empty it