From 24557bc2b37deb6a0edf497d547471832457b1dd Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 26 Nov 2014 08:32:16 +1100
Subject: Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/
---
 nms-patches/BlockCommand.patch | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 nms-patches/BlockCommand.patch

(limited to 'nms-patches/BlockCommand.patch')

diff --git a/nms-patches/BlockCommand.patch b/nms-patches/BlockCommand.patch
new file mode 100644
index 00000000..e7fe808d
--- /dev/null
+++ b/nms-patches/BlockCommand.patch
@@ -0,0 +1,34 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/BlockCommand.java	2014-11-27 08:59:46.513422674 +1100
++++ src/main/java/net/minecraft/server/BlockCommand.java	2014-11-27 08:42:10.152850911 +1100
+@@ -2,6 +2,8 @@
+ 
+ import java.util.Random;
+ 
++import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit
++
+ public class BlockCommand extends BlockContainer {
+ 
+     public static final BlockStateBoolean TRIGGERED = BlockStateBoolean.of("triggered");
+@@ -19,11 +21,20 @@
+         if (!world.isStatic) {
+             boolean flag = world.isBlockIndirectlyPowered(blockposition);
+             boolean flag1 = ((Boolean) iblockdata.get(BlockCommand.TRIGGERED)).booleanValue();
++            
++            // CraftBukkit start
++            org.bukkit.block.Block bukkitBlock = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
++            int old = flag1 ? 15 : 0;
++            int current = flag ? 15 : 0;
++
++            BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(bukkitBlock, old, current);
++            world.getServer().getPluginManager().callEvent(eventRedstone);
++            // CraftBukkit end
+ 
+-            if (flag && !flag1) {
++            if (eventRedstone.getNewCurrent() > 0 && !(eventRedstone.getOldCurrent() > 0)) { // CraftBukkit
+                 world.setTypeAndData(blockposition, iblockdata.set(BlockCommand.TRIGGERED, Boolean.valueOf(true)), 4);
+                 world.a(blockposition, (Block) this, this.a(world));
+-            } else if (!flag && flag1) {
++            } else if (!(eventRedstone.getNewCurrent() > 0) && eventRedstone.getOldCurrent() > 0) { // CraftBukkit
+                 world.setTypeAndData(blockposition, iblockdata.set(BlockCommand.TRIGGERED, Boolean.valueOf(false)), 4);
+             }
+         }
-- 
cgit v1.2.3