diff options
| author | DemonWav <demonwav@gmail.com> | 2015-05-22 22:52:05 -0500 |
|---|---|---|
| committer | DemonWav <demonwav@gmail.com> | 2015-05-23 09:45:42 -0500 |
| commit | 961287a4cc402839973d407b0cacc6a94bfda2a9 (patch) | |
| tree | 4cf60aa6717dacdab705f9bfc90a3dfb45ab427d /nms-patches | |
| parent | 529e4cd74ab7b44b52bfcd3fad2b84ebbf1a2a81 (diff) | |
| download | craftbukkit-961287a4cc402839973d407b0cacc6a94bfda2a9.tar craftbukkit-961287a4cc402839973d407b0cacc6a94bfda2a9.tar.gz craftbukkit-961287a4cc402839973d407b0cacc6a94bfda2a9.tar.lz craftbukkit-961287a4cc402839973d407b0cacc6a94bfda2a9.tar.xz craftbukkit-961287a4cc402839973d407b0cacc6a94bfda2a9.zip | |
Check the value returned from useItemInHand() so plugins can properly cancel it - SPIGOT-764
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/PlayerInteractManager.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/PlayerInteractManager.patch b/nms-patches/PlayerInteractManager.patch index d2632652..b7b6cc44 100644 --- a/nms-patches/PlayerInteractManager.patch +++ b/nms-patches/PlayerInteractManager.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/PlayerInteractManager.java 2015-02-26 22:40:23.011608135 +0000 -+++ src/main/java/net/minecraft/server/PlayerInteractManager.java 2015-02-26 22:40:23.011608135 +0000 +--- ../work/decompile-b7d1577c//net/minecraft/server/PlayerInteractManager.java 2015-05-23 09:43:31.941237938 -0500 ++++ src/main/java/net/minecraft/server/PlayerInteractManager.java 2015-05-23 09:43:31.949238036 -0500 @@ -1,5 +1,13 @@ package net.minecraft.server; @@ -269,7 +269,7 @@ + result = blockdata.getBlock().interact(world, blockposition, blockdata, entityhuman, enumdirection, f, f1, f2); + } + -+ if (itemstack != null && !result) { ++ if (itemstack != null && !result && !interactResult) { // add !interactResult SPIGOT-764 + int j1 = itemstack.getData(); + int k1 = itemstack.count; + |