diff options
Diffstat (limited to 'CraftBukkit-Patches/0015-Handle-Null-Tile-Entities.patch')
| -rw-r--r-- | CraftBukkit-Patches/0015-Handle-Null-Tile-Entities.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/CraftBukkit-Patches/0015-Handle-Null-Tile-Entities.patch b/CraftBukkit-Patches/0015-Handle-Null-Tile-Entities.patch new file mode 100644 index 0000000000..6e30320423 --- /dev/null +++ b/CraftBukkit-Patches/0015-Handle-Null-Tile-Entities.patch @@ -0,0 +1,27 @@ +From bed24d4351ed1ee836202d48161943886c6028e0 Mon Sep 17 00:00:00 2001 +From: md_5 <[email protected]> +Date: Sun, 3 Feb 2013 09:20:19 +1100 +Subject: [PATCH] Handle Null Tile Entities + + +diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java +index a5843b0..e03712a 100644 +--- a/src/main/java/net/minecraft/server/World.java ++++ b/src/main/java/net/minecraft/server/World.java +@@ -1375,6 +1375,13 @@ public abstract class World implements IBlockAccess { + + while (iterator.hasNext()) { + TileEntity tileentity = (TileEntity) iterator.next(); ++ // Spigot start ++ if (tileentity == null) { ++ getServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash"); ++ iterator.remove(); ++ continue; ++ } ++ // Spigot end + + if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) { + try { +-- +1.9.1 + |