summaryrefslogtreecommitdiffstats
path: root/nms-patches/BlockRedstoneComparator.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-12-06 10:00:00 +1100
committermd_5 <git@md-5.net>2018-12-06 10:00:00 +1100
commitaa36c8417bda9bdd4812c6094895677654cff83d (patch)
treef28adbc34ebef8ef5816c95597927b4c72ba2797 /nms-patches/BlockRedstoneComparator.patch
parent20fc5bea2c51de8d5239b68d83e878896b8ff505 (diff)
downloadcraftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.gz
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.lz
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.tar.xz
craftbukkit-aa36c8417bda9bdd4812c6094895677654cff83d.zip
Mappings Update
Diffstat (limited to 'nms-patches/BlockRedstoneComparator.patch')
-rw-r--r--nms-patches/BlockRedstoneComparator.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/BlockRedstoneComparator.patch b/nms-patches/BlockRedstoneComparator.patch
index 82052199..6e839dfc 100644
--- a/nms-patches/BlockRedstoneComparator.patch
+++ b/nms-patches/BlockRedstoneComparator.patch
@@ -20,7 +20,7 @@
});
@@ -118,8 +121,18 @@
- boolean flag1 = ((Boolean) iblockdata.get(BlockRedstoneComparator.c)).booleanValue();
+ boolean flag1 = (Boolean) iblockdata.get(BlockRedstoneComparator.c);
if (flag1 && !flag) {
+ // CraftBukkit start
@@ -28,13 +28,13 @@
+ return;
+ }
+ // CraftBukkit end
- world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneComparator.c, Boolean.valueOf(false)), 2);
+ world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneComparator.c, false), 2);
} else if (!flag1 && flag) {
+ // CraftBukkit start
+ if (CraftEventFactory.callRedstoneChange(world, blockposition, 0, 15).getNewCurrent() != 15) {
+ return;
+ }
+ // CraftBukkit end
- world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneComparator.c, Boolean.valueOf(true)), 2);
+ world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneComparator.c, true), 2);
}