summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockTripwire.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/BlockTripwire.patch')
-rw-r--r--nms-patches/BlockTripwire.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/BlockTripwire.patch b/nms-patches/BlockTripwire.patch
index deb34e86..52819f12 100644
--- a/nms-patches/BlockTripwire.patch
+++ b/nms-patches/BlockTripwire.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/BlockTripwire.java 2014-11-28 17:43:42.977707438 +0000
-+++ src/main/java/net/minecraft/server/BlockTripwire.java 2014-11-28 17:38:18.000000000 +0000
+--- /home/matt/mc-dev-private//net/minecraft/server/BlockTripwire.java 2015-02-26 22:40:22.279608143 +0000
++++ src/main/java/net/minecraft/server/BlockTripwire.java 2015-02-26 22:40:22.283608143 +0000
@@ -4,6 +4,8 @@
import java.util.List;
import java.util.Random;
@@ -9,11 +9,10 @@
public class BlockTripwire extends Block {
public static final BlockStateBoolean POWERED = BlockStateBoolean.of("powered");
-@@ -154,6 +156,40 @@
- }
+@@ -155,6 +157,40 @@
}
}
-+
+
+ // CraftBukkit start - Call interact even when triggering connected tripwire
+ if (flag != flag1 && flag1 && (Boolean)iblockdata.get(ATTACHED)) {
+ org.bukkit.World bworld = world.getWorld();
@@ -47,6 +46,7 @@
+ }
+ }
+ // CraftBukkit end
-
++
if (flag1 != flag) {
iblockdata = iblockdata.set(BlockTripwire.POWERED, Boolean.valueOf(flag1));
+ world.setTypeAndData(blockposition, iblockdata, 3);