RedstoneChangeHook tweaks for RedstoneWire, little data change to

RedstoneBlocks addresses #41
FallenMoonNetwork · Sep 2, 2013 · a8a4c04 · a8a4c04
1 parent dda82f9
commit a8a4c04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/main/java/net/minecraft/server/BlockPoweredOre.java b/src/main/java/net/minecraft/server/BlockPoweredOre.java
@@ -27,7 +27,7 @@ public void a(World world, int i0, int i1, int i2) {
 
     // CanaryMod: pull break method in to do RedstoneChange
     public void a(World world, int i0, int i1, int i2, int i3, int i4) {
-        new RedstoneChangeHook(new CanaryBlock(BlockType.RedstoneBlock.getId(), (short) 2, i0, i1, i2, world.getCanaryWorld()), 15, 0).call();
+        new RedstoneChangeHook(new CanaryBlock(BlockType.RedstoneBlock.getId(), (short) i3, i0, i1, i2, world.getCanaryWorld()), 15, 0).call();
         super.a(world, i0, i1, i2, i3, i4);
     }
     //

diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
@@ -4,6 +4,8 @@
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
+import net.canarymod.api.world.blocks.BlockType;
+import net.canarymod.api.world.blocks.CanaryBlock;
 import net.canarymod.hook.world.RedstoneChangeHook;
 
 public class BlockRedstoneWire extends Block {
@@ -181,6 +183,12 @@ public void a(World world, int i0, int i1, int i2) {
     public void a(World world, int i0, int i1, int i2, int i3, int i4) {
         super.a(world, i0, i1, i2, i3, i4);
         if (!world.I) {
+            // CanaryMod: RedstoneChange (Wire Destroy)
+            int lvl = world.D(i0, i1, i2) - 1; // Subtract 1 from current in
+            if (lvl > 0) {
+                new RedstoneChangeHook(new CanaryBlock(BlockType.RedstoneWire.getId(), (short) i3, i0, i1, i2, world.getCanaryWorld()), lvl, 0).call();
+            }
+            //
             world.f(i0, i1 + 1, i2, this.cF);
             world.f(i0, i1 - 1, i2, this.cF);
             world.f(i0 + 1, i1, i2, this.cF);