summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-30 15:33:29 +1100
committermd_5 <git@md-5.net>2016-11-30 15:33:29 +1100
commit6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635 (patch)
tree67c11312460de64cfe1612ba7602c8713251654c
parentfffaf0711337e31b801c50556d1e6cf4c87c617a (diff)
downloadcraftbukkit-6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635.tar
craftbukkit-6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635.tar.gz
craftbukkit-6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635.tar.lz
craftbukkit-6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635.tar.xz
craftbukkit-6d5a66f00fc87ebeb7b6560ed66ca11ccf35f635.zip
SPIGOT-2867: Update inventory on cancelled interacts too
-rw-r--r--nms-patches/PlayerInteractManager.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/nms-patches/PlayerInteractManager.patch b/nms-patches/PlayerInteractManager.patch
index ef69a879..ba41f0f4 100644
--- a/nms-patches/PlayerInteractManager.patch
+++ b/nms-patches/PlayerInteractManager.patch
@@ -224,7 +224,7 @@
return flag;
}
}
-@@ -280,63 +419,85 @@
+@@ -280,63 +419,86 @@
}
}
@@ -280,6 +280,7 @@
+ } else if (blockdata.getBlock() instanceof BlockCake) {
+ ((EntityPlayer) entityhuman).getBukkitEntity().sendHealthUpdate(); // SPIGOT-1341 - reset health for cake
+ }
++ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-2867
+ enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
+ } else if (this.gamemode == EnumGamemode.SPECTATOR) {
+ TileEntity tileentity = world.getTileEntity(blockposition);