From 499d44763daed5f7e51b0381482c90674e29acc3 Mon Sep 17 00:00:00 2001 From: Dinnerbone Date: Tue, 8 Feb 2011 12:54:28 +0000 Subject: [PATCH] Finalizing the breakage! --- src/main/java/net/minecraft/server/BlockButton.java | 2 +- src/main/java/net/minecraft/server/BlockLever.java | 2 +- src/main/java/net/minecraft/server/BlockRedstoneTorch.java | 2 +- src/main/java/net/minecraft/server/BlockRedstoneWire.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/BlockButton.java b/src/main/java/net/minecraft/server/BlockButton.java index b3e3283c20..1002c9c901 100644 --- a/src/main/java/net/minecraft/server/BlockButton.java +++ b/src/main/java/net/minecraft/server/BlockButton.java @@ -170,7 +170,7 @@ public class BlockButton extends Block { //Allow the lever to change the current int old = (j1 != 8) ? 1 : 0; int current = (j1 == 8) ? 1 : 0; - BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, BlockFace.SELF, old, current); + BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, old, current); server.getPluginManager().callEvent(eventRedstone); if ((eventRedstone.getNewCurrent() > 0) == (j1 == 8)) { world.c(i, j, k, i1 + j1); diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java index 5c2cdae562..174d8b5d4f 100644 --- a/src/main/java/net/minecraft/server/BlockLever.java +++ b/src/main/java/net/minecraft/server/BlockLever.java @@ -167,7 +167,7 @@ public class BlockLever extends Block { // CraftBukkit start int old = (j1 != 8) ? 1 : 0; int current = (j1 == 8) ? 1 : 0; - BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, BlockFace.SELF, old, current); + BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, old, current); server.getPluginManager().callEvent(eventRedstone); if ((eventRedstone.getNewCurrent() > 0) == (j1 == 8)) { diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java index efc9ee2b0d..825393811a 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -97,7 +97,7 @@ public class BlockRedstoneTorch extends BlockTorch { // Craftbukkit start CraftBlock block = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); - BlockRedstoneEvent event = new BlockRedstoneEvent(block, BlockFace.SELF, flag ? 15 : 0, flag ? 0 : 15); + BlockRedstoneEvent event = new BlockRedstoneEvent(block, flag ? 15 : 0, flag ? 0 : 15); ((WorldServer) world).getServer().getPluginManager().callEvent(event); if ((event.getNewCurrent() != 0) == flag) { return; diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java index 81d85c6c93..8ef27ef196 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -103,7 +103,7 @@ public class BlockRedstoneWire extends Block { // Craftbukkit start if (k1 != l1) { CraftBlock block = (CraftBlock) ((WorldServer) world).getWorld().getBlockAt(i, j, k); - BlockRedstoneEvent event = new BlockRedstoneEvent(block, BlockFace.SELF, k1, l1); + BlockRedstoneEvent event = new BlockRedstoneEvent(block, k1, l1); ((WorldServer) world).getServer().getPluginManager().callEvent(event); l1 = event.getNewCurrent(); }