Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.

1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/net/minecraft/server/WorldGenerator.java b/src/main/java/net/minecraft/server/WorldGenerator.java
index d0a3f1b4..cd41fa4b 100644
--- a/src/main/java/net/minecraft/server/WorldGenerator.java
+++ b/src/main/java/net/minecraft/server/WorldGenerator.java
@@ -21,16 +21,18 @@ public abstract class WorldGenerator {
     public void a(double d0, double d1, double d2) {}
 
     // CraftBukkit - change signature
+    protected void setType(BlockChangeDelegate world, int i, int j, int k, int l) {
+        this.setTypeAndData(world, i, j, k, l, 0);
+    }
+
+    // CraftBukkit - change signature
     protected void setTypeAndData(BlockChangeDelegate world, int i, int j, int k, int l, int i1) {
         if (this.a) {
             world.setTypeIdAndData(i, j, k, l, i1);
-        // CraftBukkit start - do equiv of setTypeIdAndData, but skip doing physics to prevent fades
-        }
-        else if ((world instanceof World) && ((World) world).getChunkAt(i >> 4, k >> 4).sentToClient) {
+        } else if (world instanceof World && ((World)world).getChunkAtWorldCoords(i >> 4, k >> 4).seenByPlayer) {
             if (world.setRawTypeIdAndData(i, j, k, l, i1)) {
-                ((World) world).notify(i, j, k);
+                ((World)world).notify(i, j, k);
             }
-        // CraftBukkt end
         } else {
             world.setRawTypeIdAndData(i, j, k, l, i1);
         }