Update CraftBukkit to Minecraft 1.5

1 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/net/minecraft/server/BlockRedstoneLamp.java b/src/main/java/net/minecraft/server/BlockRedstoneLamp.java
index 6bdd14aa..e527e7fa 100644
--- a/src/main/java/net/minecraft/server/BlockRedstoneLamp.java
+++ b/src/main/java/net/minecraft/server/BlockRedstoneLamp.java
@@ -9,11 +9,10 @@ public class BlockRedstoneLamp extends Block {
     private final boolean a;
 
     public BlockRedstoneLamp(int i, boolean flag) {
-        super(i, 211, Material.BUILDABLE_GLASS);
+        super(i, Material.BUILDABLE_GLASS);
         this.a = flag;
         if (flag) {
             this.a(1.0F);
-            ++this.textureId;
         }
     }
 
@@ -28,7 +27,7 @@ public class BlockRedstoneLamp extends Block {
                 }
                 // CraftBukkit end
 
-                world.setTypeId(i, j, k, Block.REDSTONE_LAMP_ON.id);
+                world.setTypeIdAndData(i, j, k, Block.REDSTONE_LAMP_ON.id, 0, 2);
             }
         }
     }
@@ -44,12 +43,12 @@ public class BlockRedstoneLamp extends Block {
                 }
                 // CraftBukkit end
 
-                world.setTypeId(i, j, k, Block.REDSTONE_LAMP_ON.id);
+                world.setTypeIdAndData(i, j, k, Block.REDSTONE_LAMP_ON.id, 0, 2);
             }
         }
     }
 
-    public void b(World world, int i, int j, int k, Random random) {
+    public void a(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) {
@@ -57,7 +56,7 @@ public class BlockRedstoneLamp extends Block {
             }
             // CraftBukkit end
 
-            world.setTypeId(i, j, k, Block.REDSTONE_LAMP_OFF.id);
+            world.setTypeIdAndData(i, j, k, Block.REDSTONE_LAMP_OFF.id, 0, 2);
         }
     }