summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-04-16 07:09:32 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-04-16 07:09:32 -0500
commit708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb (patch)
tree4ca9e6442f6ffd6237cc6187f4db89c21e6b837e /src
parent40e630871855255c14c78beaf8c63e7aa6b3c930 (diff)
downloadcraftbukkit-708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb.tar
craftbukkit-708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb.tar.gz
craftbukkit-708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb.tar.lz
craftbukkit-708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb.tar.xz
craftbukkit-708b0e6ae1fc3b545fc423ebe5eb9cdb67be7efb.zip
Don't do physics updates in world generation. Fixes BUKKIT-3747
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/WorldGenerator.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/WorldGenerator.java b/src/main/java/net/minecraft/server/WorldGenerator.java
index 320a1944..5941f291 100644
--- a/src/main/java/net/minecraft/server/WorldGenerator.java
+++ b/src/main/java/net/minecraft/server/WorldGenerator.java
@@ -30,7 +30,13 @@ public abstract class WorldGenerator {
if (this.a) {
world.setTypeIdAndData(i, j, k, l, i1);
} else {
- world.setTypeIdAndData(i, j, k, l, i1);
+ // CraftBukkit start - Layering violation :(
+ if (world instanceof World) {
+ ((World) world).setTypeIdAndData(i, j, k, l, i1, 2);
+ } else {
+ world.setRawTypeIdAndData(i, j, k, l, i1);
+ }
+ // CraftBukkit end
}
}
}