Update CraftBukkit to Minecraft 1.3.1

1 files changed, 98 insertions, 49 deletions

diff --git a/src/main/java/net/minecraft/server/BlockLever.java b/src/main/java/net/minecraft/server/BlockLever.java
index 11a07ae4..df25656d 100644
--- a/src/main/java/net/minecraft/server/BlockLever.java
+++ b/src/main/java/net/minecraft/server/BlockLever.java
@@ -6,105 +6,143 @@ public class BlockLever extends Block {
 
     protected BlockLever(int i, int j) {
         super(i, j, Material.ORIENTABLE);
+        this.a(CreativeModeTab.d);
     }
 
     public AxisAlignedBB e(World world, int i, int j, int k) {
         return null;
     }
 
-    public boolean a() {
+    public boolean d() {
         return false;
     }
 
-    public boolean b() {
+    public boolean c() {
         return false;
     }
 
-    public int c() {
+    public int b() {
         return 12;
     }
 
     public boolean canPlace(World world, int i, int j, int k, int l) {
-        return l == 1 && world.e(i, j - 1, k) ? true : (l == 2 && world.e(i, j, k + 1) ? true : (l == 3 && world.e(i, j, k - 1) ? true : (l == 4 && world.e(i + 1, j, k) ? true : l == 5 && world.e(i - 1, j, k))));
+        return l == 0 && world.s(i, j + 1, k) ? true : (l == 1 && world.t(i, j - 1, k) ? true : (l == 2 && world.s(i, j, k + 1) ? true : (l == 3 && world.s(i, j, k - 1) ? true : (l == 4 && world.s(i + 1, j, k) ? true : l == 5 && world.s(i - 1, j, k)))));
     }
 
     public boolean canPlace(World world, int i, int j, int k) {
-        return world.e(i - 1, j, k) ? true : (world.e(i + 1, j, k) ? true : (world.e(i, j, k - 1) ? true : (world.e(i, j, k + 1) ? true : world.e(i, j - 1, k))));
+        return world.s(i - 1, j, k) ? true : (world.s(i + 1, j, k) ? true : (world.s(i, j, k - 1) ? true : (world.s(i, j, k + 1) ? true : (world.t(i, j - 1, k) ? true : world.s(i, j + 1, k)))));
     }
 
-    public void postPlace(World world, int i, int j, int k, int l) {
+    public void postPlace(World world, int i, int j, int k, int l, float f, float f1, float f2) {
         int i1 = world.getData(i, j, k);
         int j1 = i1 & 8;
 
         i1 &= 7;
         i1 = -1;
-        if (l == 1 && world.e(i, j - 1, k)) {
+        if (l == 0 && world.s(i, j + 1, k)) {
+            i1 = world.random.nextBoolean() ? 0 : 7;
+        }
+
+        if (l == 1 && world.t(i, j - 1, k)) {
             i1 = 5 + world.random.nextInt(2);
         }
 
-        if (l == 2 && world.e(i, j, k + 1)) {
+        if (l == 2 && world.s(i, j, k + 1)) {
             i1 = 4;
         }
 
-        if (l == 3 && world.e(i, j, k - 1)) {
+        if (l == 3 && world.s(i, j, k - 1)) {
             i1 = 3;
         }
 
-        if (l == 4 && world.e(i + 1, j, k)) {
+        if (l == 4 && world.s(i + 1, j, k)) {
             i1 = 2;
         }
 
-        if (l == 5 && world.e(i - 1, j, k)) {
+        if (l == 5 && world.s(i - 1, j, k)) {
             i1 = 1;
         }
 
         if (i1 == -1) {
-            this.b(world, i, j, k, world.getData(i, j, k), 0);
+            this.c(world, i, j, k, world.getData(i, j, k), 0);
             world.setTypeId(i, j, k, 0);
         } else {
             world.setData(i, j, k, i1 + j1);
         }
     }
 
+    public static int d(int i) {
+        switch (i) {
+        case 0:
+            return 0;
+
+        case 1:
+            return 5;
+
+        case 2:
+            return 4;
+
+        case 3:
+            return 3;
+
+        case 4:
+            return 2;
+
+        case 5:
+            return 1;
+
+        default:
+            return -1;
+        }
+    }
+
     public void doPhysics(World world, int i, int j, int k, int l) {
-        if (this.g(world, i, j, k)) {
+        if (this.l(world, i, j, k)) {
             int i1 = world.getData(i, j, k) & 7;
             boolean flag = false;
 
-            if (!world.e(i - 1, j, k) && i1 == 1) {
+            if (!world.s(i - 1, j, k) && i1 == 1) {
                 flag = true;
             }
 
-            if (!world.e(i + 1, j, k) && i1 == 2) {
+            if (!world.s(i + 1, j, k) && i1 == 2) {
                 flag = true;
             }
 
-            if (!world.e(i, j, k - 1) && i1 == 3) {
+            if (!world.s(i, j, k - 1) && i1 == 3) {
                 flag = true;
             }
 
-            if (!world.e(i, j, k + 1) && i1 == 4) {
+            if (!world.s(i, j, k + 1) && i1 == 4) {
                 flag = true;
             }
 
-            if (!world.e(i, j - 1, k) && i1 == 5) {
+            if (!world.t(i, j - 1, k) && i1 == 5) {
                 flag = true;
             }
 
-            if (!world.e(i, j - 1, k) && i1 == 6) {
+            if (!world.t(i, j - 1, k) && i1 == 6) {
+                flag = true;
+            }
+
+            if (!world.s(i, j + 1, k) && i1 == 0) {
+                flag = true;
+            }
+
+            if (!world.s(i, j + 1, k) && i1 == 7) {
                 flag = true;
             }
 
             if (flag) {
-                this.b(world, i, j, k, world.getData(i, j, k), 0);
+                this.c(world, i, j, k, world.getData(i, j, k), 0);
                 world.setTypeId(i, j, k, 0);
             }
         }
     }
 
-    private boolean g(World world, int i, int j, int k) {
+    private boolean l(World world, int i, int j, int k) {
         if (!this.canPlace(world, i, j, k)) {
-            this.b(world, i, j, k, world.getData(i, j, k), 0);
+            this.c(world, i, j, k, world.getData(i, j, k), 0);
             world.setTypeId(i, j, k, 0);
             return false;
         } else {
@@ -124,6 +162,11 @@ public class BlockLever extends Block {
             this.a(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F);
         } else if (l == 4) {
             this.a(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F);
+        } else if (l != 5 && l != 6) {
+            if (l == 0 || l == 7) {
+                f = 0.25F;
+                this.a(0.5F - f, 0.4F, 0.5F - f, 0.5F + f, 1.0F, 0.5F + f);
+            }
         } else {
             f = 0.25F;
             this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
@@ -131,42 +174,46 @@ public class BlockLever extends Block {
     }
 
     public void attack(World world, int i, int j, int k, EntityHuman entityhuman) {
-        this.interact(world, i, j, k, entityhuman);
+        this.interact(world, i, j, k, entityhuman, 0, 0.0F, 0.0F, 0.0F);
     }
 
-    public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman) {
+    public boolean interact(World world, int i, int j, int k, EntityHuman entityhuman, int l, float f, float f1, float f2) {
         if (world.isStatic) {
             return true;
         } else {
-            int l = world.getData(i, j, k);
-            int i1 = l & 7;
-            int j1 = 8 - (l & 8);
+            int i1 = world.getData(i, j, k);
+            int j1 = i1 & 7;
+            int k1 = 8 - (i1 & 8);
 
             // CraftBukkit start - Interact Lever
             org.bukkit.block.Block block = world.getWorld().getBlockAt(i, j, k);
-            int old = (j1 != 8) ? 1 : 0;
-            int current = (j1 == 8) ? 1 : 0;
+            int old = (k1 != 8) ? 1 : 0;
+            int current = (k1 == 8) ? 1 : 0;
 
             BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(block, old, current);
             world.getServer().getPluginManager().callEvent(eventRedstone);
 
-            if ((eventRedstone.getNewCurrent() > 0) != (j1 == 8)) {
+            if ((eventRedstone.getNewCurrent() > 0) != (k1 == 8)) {
                 return true;
             }
             // CraftBukkit end
 
-            world.setData(i, j, k, i1 + j1);
-            world.b(i, j, k, i, j, k);
-            world.makeSound((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "random.click", 0.3F, j1 > 0 ? 0.6F : 0.5F);
+            world.setData(i, j, k, j1 + k1);
+            world.d(i, j, k, i, j, k);
+            world.makeSound((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "random.click", 0.3F, k1 > 0 ? 0.6F : 0.5F);
             world.applyPhysics(i, j, k, this.id);
-            if (i1 == 1) {
+            if (j1 == 1) {
                 world.applyPhysics(i - 1, j, k, this.id);
-            } else if (i1 == 2) {
+            } else if (j1 == 2) {
                 world.applyPhysics(i + 1, j, k, this.id);
-            } else if (i1 == 3) {
+            } else if (j1 == 3) {
                 world.applyPhysics(i, j, k - 1, this.id);
-            } else if (i1 == 4) {
+            } else if (j1 == 4) {
                 world.applyPhysics(i, j, k + 1, this.id);
+            } else if (j1 != 5 && j1 != 6) {
+                if (j1 == 0 || j1 == 7) {
+                    world.applyPhysics(i, j + 1, k, this.id);
+                }
             } else {
                 world.applyPhysics(i, j - 1, k, this.id);
             }
@@ -175,34 +222,36 @@ public class BlockLever extends Block {
         }
     }
 
-    public void remove(World world, int i, int j, int k) {
-        int l = world.getData(i, j, k);
-
-        if ((l & 8) > 0) {
+    public void remove(World world, int i, int j, int k, int l, int i1) {
+        if ((i1 & 8) > 0) {
             world.applyPhysics(i, j, k, this.id);
-            int i1 = l & 7;
+            int j1 = i1 & 7;
 
-            if (i1 == 1) {
+            if (j1 == 1) {
                 world.applyPhysics(i - 1, j, k, this.id);
-            } else if (i1 == 2) {
+            } else if (j1 == 2) {
                 world.applyPhysics(i + 1, j, k, this.id);
-            } else if (i1 == 3) {
+            } else if (j1 == 3) {
                 world.applyPhysics(i, j, k - 1, this.id);
-            } else if (i1 == 4) {
+            } else if (j1 == 4) {
                 world.applyPhysics(i, j, k + 1, this.id);
+            } else if (j1 != 5 && j1 != 6) {
+                if (j1 == 0 || j1 == 7) {
+                    world.applyPhysics(i, j + 1, k, this.id);
+                }
             } else {
                 world.applyPhysics(i, j - 1, k, this.id);
             }
         }
 
-        super.remove(world, i, j, k);
+        super.remove(world, i, j, k, l, i1);
     }
 
     public boolean a(IBlockAccess iblockaccess, int i, int j, int k, int l) {
         return (iblockaccess.getData(i, j, k) & 8) > 0;
     }
 
-    public boolean d(World world, int i, int j, int k, int l) {
+    public boolean c(World world, int i, int j, int k, int l) {
         int i1 = world.getData(i, j, k);
 
         if ((i1 & 8) == 0) {
@@ -210,7 +259,7 @@ public class BlockLever extends Block {
         } else {
             int j1 = i1 & 7;
 
-            return j1 == 6 && l == 1 ? true : (j1 == 5 && l == 1 ? true : (j1 == 4 && l == 2 ? true : (j1 == 3 && l == 3 ? true : (j1 == 2 && l == 4 ? true : j1 == 1 && l == 5))));
+            return j1 == 0 && l == 0 ? true : (j1 == 7 && l == 0 ? true : (j1 == 6 && l == 1 ? true : (j1 == 5 && l == 1 ? true : (j1 == 4 && l == 2 ? true : (j1 == 3 && l == 3 ? true : (j1 == 2 && l == 4 ? true : j1 == 1 && l == 5))))));
         }
     }