diff options
Diffstat (limited to 'src/main/java/net/minecraft/server/BlockRedstoneLamp.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/BlockRedstoneLamp.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/BlockRedstoneLamp.java b/src/main/java/net/minecraft/server/BlockRedstoneLamp.java index 5aa16d64..6bdd14aa 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneLamp.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneLamp.java @@ -2,9 +2,7 @@ package net.minecraft.server; import java.util.Random; -// CraftBukkit start -import org.bukkit.craftbukkit.event.CraftEventFactory; -// CraftBukkit end +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit public class BlockRedstoneLamp extends Block { @@ -22,13 +20,14 @@ public class BlockRedstoneLamp extends Block { public void onPlace(World world, int i, int j, int k) { if (!world.isStatic) { if (this.a && !world.isBlockIndirectlyPowered(i, j, k)) { - world.c(i, j, k, this.id, 4); + world.a(i, j, k, this.id, 4); } else if (!this.a && world.isBlockIndirectlyPowered(i, j, k)) { // CraftBukkit start if (CraftEventFactory.callRedstoneChange(world, i, j, k, 0, 15).getNewCurrent() != 15) { return; } // CraftBukkit end + world.setTypeId(i, j, k, Block.REDSTONE_LAMP_ON.id); } } @@ -37,25 +36,27 @@ public class BlockRedstoneLamp extends Block { public void doPhysics(World world, int i, int j, int k, int l) { if (!world.isStatic) { if (this.a && !world.isBlockIndirectlyPowered(i, j, k)) { - world.c(i, j, k, this.id, 4); + world.a(i, j, k, this.id, 4); } else if (!this.a && world.isBlockIndirectlyPowered(i, j, k)) { // CraftBukkit start if (CraftEventFactory.callRedstoneChange(world, i, j, k, 0, 15).getNewCurrent() != 15) { return; } // CraftBukkit end + world.setTypeId(i, j, k, Block.REDSTONE_LAMP_ON.id); } } } - public void a(World world, int i, int j, int k, Random random) { + public void b(World world, int i, int j, int k, Random random) { if (!world.isStatic && this.a && !world.isBlockIndirectlyPowered(i, j, k)) { // CraftBukkit start if (CraftEventFactory.callRedstoneChange(world, i, j, k, 15, 0).getNewCurrent() != 0) { return; } // CraftBukkit end + world.setTypeId(i, j, k, Block.REDSTONE_LAMP_OFF.id); } } |