Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

Check the value returned from useItemInHand() so plugins can properly cancel it - SPIGOT-764

Browse Source
This commit is contained in:
DemonWav 2015-05-22 22:52:05 -05:00
parent 529e4cd74a
commit 961287a4cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms-patches/PlayerInteractManager.patch
View File

@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//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-02-26 22:40:23.011608135 +0000 +++ src/main/java/net/minecraft/server/PlayerInteractManager.java 2015-05-23 09:43:31.949238036 -0500
@@ -1,5 +1,13 @@ @@ -1,5 +1,13 @@
package net.minecraft.server; package net.minecraft.server;
@ -269,7 +269,7 @@
+ result = blockdata.getBlock().interact(world, blockposition, blockdata, entityhuman, enumdirection, f, f1, f2); + 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 j1 = itemstack.getData();
+ int k1 = itemstack.count; + int k1 = itemstack.count;
+ +