Update for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
index 90aab767..c187615e 100644
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -28,10 +28,10 @@ public class BlockCactus extends Block {
                 int i1 = world.getData(i, j, k);
 
                 if (i1 == 15) {
-                    world.e(i, j + 1, k, this.id);
-                    world.c(i, j, k, 0);
+                    world.setTypeId(i, j + 1, k, this.id);
+                    world.setData(i, j, k, 0);
                 } else {
-                    world.c(i, j, k, i1 + 1);
+                    world.setData(i, j, k, i1 + 1);
                 }
             }
         }
@@ -51,14 +51,14 @@ public class BlockCactus extends Block {
         return false;
     }
 
-    public boolean a(World world, int i, int j, int k) {
-        return !super.a(world, i, j, k) ? false : this.f(world, i, j, k);
+    public boolean canPlace(World world, int i, int j, int k) {
+        return !super.canPlace(world, i, j, k) ? false : this.f(world, i, j, k);
     }
 
-    public void a(World world, int i, int j, int k, int l) {
+    public void doPhysics(World world, int i, int j, int k, int l) {
         if (!this.f(world, i, j, k)) {
             this.a_(world, i, j, k, world.getData(i, j, k));
-            world.e(i, j, k, 0);
+            world.setTypeId(i, j, k, 0);
         }
     }
 
@@ -91,11 +91,11 @@ public class BlockCactus extends Block {
             server.getPluginManager().callEvent(event);
 
             if (!event.isCancelled()) {
-                entity.a((Entity) null, event.getDamage());
+                entity.damageEntity((Entity) null, event.getDamage());
             }
             return;
         }
         // CraftBukkit end
-        entity.a((Entity) null, 1);
+        entity.damageEntity((Entity) null, 1);
     }
 }