summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockTripwire.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-07-15 10:00:00 +1000
committermd_5 <git@md-5.net>2018-07-15 10:00:00 +1000
commit421c1728c81e2f729dff88da2ac96535d2b8e5e8 (patch)
tree6c51d93e811d1eb86b68461a42fc5cf03b168b0c /nms-patches/BlockTripwire.patch
parent57ab4cfc6f4ff526d44319d9b8c79f6848db2de7 (diff)
downloadcraftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.gz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.lz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.tar.xz
craftbukkit-421c1728c81e2f729dff88da2ac96535d2b8e5e8.zip
Update to Minecraft 1.13-pre7
Diffstat (limited to 'nms-patches/BlockTripwire.patch')
-rw-r--r--nms-patches/BlockTripwire.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/nms-patches/BlockTripwire.patch b/nms-patches/BlockTripwire.patch
index 3f955f11..598b9c1b 100644
--- a/nms-patches/BlockTripwire.patch
+++ b/nms-patches/BlockTripwire.patch
@@ -1,15 +1,15 @@
--- a/net/minecraft/server/BlockTripwire.java
+++ b/net/minecraft/server/BlockTripwire.java
@@ -5,6 +5,8 @@
+ import java.util.Map;
import java.util.Random;
- import javax.annotation.Nullable;
+import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit
+
public class BlockTripwire extends Block {
- public static final BlockStateBoolean POWERED = BlockStateBoolean.of("powered");
-@@ -138,6 +140,40 @@
+ public static final BlockStateBoolean POWERED = BlockProperties.t;
+@@ -134,6 +136,40 @@
}
}
@@ -48,5 +48,5 @@
+ // CraftBukkit end
+
if (flag1 != flag) {
- iblockdata = iblockdata.set(BlockTripwire.POWERED, Boolean.valueOf(flag1));
+ iblockdata = (IBlockData) iblockdata.set(BlockTripwire.POWERED, Boolean.valueOf(flag1));
world.setTypeAndData(blockposition, iblockdata, 3);