summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorWarren Loo <evilseph@gmail.com>2011-07-12 17:48:22 -0400
committerWarren Loo <evilseph@gmail.com>2011-07-13 00:31:05 -0400
commita9cdc36f2c04afcb894658ee1997a582226ddf96 (patch)
tree1139ee4ddc844333a143e20e2fc0b027f4a15816 /src/main/java/net
parentd0f904fc50c7301ead51634f8f774664e4a707b0 (diff)
downloadcraftbukkit-a9cdc36f2c04afcb894658ee1997a582226ddf96.tar
craftbukkit-a9cdc36f2c04afcb894658ee1997a582226ddf96.tar.gz
craftbukkit-a9cdc36f2c04afcb894658ee1997a582226ddf96.tar.lz
craftbukkit-a9cdc36f2c04afcb894658ee1997a582226ddf96.tar.xz
craftbukkit-a9cdc36f2c04afcb894658ee1997a582226ddf96.zip
Possibly fixed crashes caused by tile entities under certain circumstances.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/World.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 78e9002e..65900c51 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1532,12 +1532,14 @@ public class World implements IBlockAccess {
tileentity.z = k;
this.G.add(tileentity);
} else {
- this.c.add(tileentity);
+ // CraftBukkit - order matters, moved down
+ // this.c.add(tileentity);
Chunk chunk = this.getChunkAt(i >> 4, k >> 4);
if (chunk != null) {
chunk.a(i & 15, j, k & 15, tileentity);
}
+ this.c.add(tileentity);
}
}
}