From eb36029f1cc9e4dffaa757da980c7d100cf86605 Mon Sep 17 00:00:00 2001
From: Amosar <maxi.cass11@gmail.com>
Date: Thu, 9 Aug 2018 14:44:57 +0200
Subject: [PATCH] SPIGOT-2719: Comparator and Observer don't trigger
 BlockRedstoneEvent

---
 nms-patches/BlockObserver.patch           | 30 +++++++++++++++++++++++
 nms-patches/BlockRedstoneComparator.patch | 30 +++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 nms-patches/BlockObserver.patch
 create mode 100644 nms-patches/BlockRedstoneComparator.patch

diff --git a/nms-patches/BlockObserver.patch b/nms-patches/BlockObserver.patch
new file mode 100644
index 0000000000..49c01c1339
--- /dev/null
+++ b/nms-patches/BlockObserver.patch
@@ -0,0 +1,30 @@
+--- a/net/minecraft/server/BlockObserver.java
++++ b/net/minecraft/server/BlockObserver.java
+@@ -2,6 +2,8 @@
+ 
+ import java.util.Random;
+ 
++import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
++
+ public class BlockObserver extends BlockDirectional {
+ 
+     public static final BlockStateBoolean b = BlockProperties.t;
+@@ -25,8 +27,18 @@
+ 
+     public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) {
+         if (((Boolean) iblockdata.get(BlockObserver.b)).booleanValue()) {
++            // CraftBukkit start
++            if (CraftEventFactory.callRedstoneChange(world, blockposition, 15, 0).getNewCurrent() != 0) {
++                return;
++            }
++            // CraftBukkit end
+             world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockObserver.b, Boolean.valueOf(false)), 2);
+         } else {
++            // CraftBukkit start
++            if (CraftEventFactory.callRedstoneChange(world, blockposition, 0, 15).getNewCurrent() != 15) {
++                return;
++            }
++            // CraftBukkit end
+             world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockObserver.b, Boolean.valueOf(true)), 2);
+             world.I().a(blockposition, this, 2);
+         }
diff --git a/nms-patches/BlockRedstoneComparator.patch b/nms-patches/BlockRedstoneComparator.patch
new file mode 100644
index 0000000000..de272ab413
--- /dev/null
+++ b/nms-patches/BlockRedstoneComparator.patch
@@ -0,0 +1,30 @@
+--- a/net/minecraft/server/BlockRedstoneComparator.java
++++ b/net/minecraft/server/BlockRedstoneComparator.java
+@@ -5,6 +5,8 @@
+ import java.util.function.Predicate;
+ import javax.annotation.Nullable;
+ 
++import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
++
+ public class BlockRedstoneComparator extends BlockDiodeAbstract implements ITileEntity {
+ 
+     public static final BlockStateEnum<BlockPropertyComparatorMode> MODE = BlockProperties.ap;
+@@ -118,8 +120,18 @@
+             boolean flag1 = ((Boolean) iblockdata.get(BlockRedstoneComparator.c)).booleanValue();
+ 
+             if (flag1 && !flag) {
++                // CraftBukkit start
++                if (CraftEventFactory.callRedstoneChange(world, blockposition, 15, 0).getNewCurrent() != 0) {
++                    return;
++                }
++                // CraftBukkit end
+                 world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockRedstoneComparator.c, Boolean.valueOf(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);
+             }
+