1 files changed, 9 insertions, 8 deletions

diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
index 7caebbc3..254399fa 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -84,15 +84,15 @@ public class BlockRedstoneWire extends Block {
                 }
 
                 if (j2 != l || j != i1 || k2 != j1) {
-                    l1 = this.g(world, j2, j, k2, l1);
+                    l1 = this.f(world, j2, j, k2, l1);
                 }
 
                 if (world.d(j2, j, k2) && !world.d(i, j + 1, k)) {
                     if (j2 != l || j + 1 != i1 || k2 != j1) {
-                        l1 = this.g(world, j2, j + 1, k2, l1);
+                        l1 = this.f(world, j2, j + 1, k2, l1);
                     }
                 } else if (!world.d(j2, j, k2) && (j2 != l || j - 1 != i1 || k2 != j1)) {
-                    l1 = this.g(world, j2, j - 1, k2, l1);
+                    l1 = this.f(world, j2, j - 1, k2, l1);
                 }
             }
 
@@ -144,7 +144,7 @@ public class BlockRedstoneWire extends Block {
                 }
 
                 boolean flag1 = false;
-                int i3 = this.g(world, j2, j, k2, -1);
+                int i3 = this.f(world, j2, j, k2, -1);
 
                 l1 = world.getData(i, j, k);
                 if (l1 > 0) {
@@ -155,7 +155,7 @@ public class BlockRedstoneWire extends Block {
                     this.a(world, j2, j, k2, i, j, k);
                 }
 
-                i3 = this.g(world, j2, l2, k2, -1);
+                i3 = this.f(world, j2, l2, k2, -1);
                 l1 = world.getData(i, j, k);
                 if (l1 > 0) {
                     --l1;
@@ -262,7 +262,8 @@ public class BlockRedstoneWire extends Block {
         }
     }
 
-    public int g(World world, int i, int j, int k, int l) { // Craftbukkit made public
+    // Craftbukkit private-> public
+    public int f(World world, int i, int j, int k, int l) {
         if (world.getTypeId(i, j, k) != this.id) {
             return l;
         } else {
@@ -278,9 +279,9 @@ public class BlockRedstoneWire extends Block {
             boolean flag = this.a(world, i, j, k);
 
             if (!flag) {
-                this.b_(world, i, j, k, i1);
+                this.a_(world, i, j, k, i1);
                 world.e(i, j, k, 0);
-            } else 
+            } else
             // Craftbukkit
             if ((Block.byId[l] != null && Block.byId[l].c()) || Block.DIODE_OFF.id == l || Block.DIODE_ON.id == l) { 
                 this.g(world, i, j, k);