2013-03-15 21:35:56 +00:00
|
|
|
From df7aaaaa25ae229a755ffadd32308cab505e3313 Mon Sep 17 00:00:00 2001
|
2013-02-02 22:21:35 +00:00
|
|
|
From: md_5 <md_5@live.com.au>
|
|
|
|
|
Date: Sun, 3 Feb 2013 09:20:19 +1100
|
|
|
|
|
Subject: [PATCH] Detect, remove and warn about null tile entities.
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
src/main/java/net/minecraft/server/World.java | 7 +++++++
|
|
|
|
|
1 file changed, 7 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2013-03-15 21:35:56 +00:00
|
|
|
index 5cf6bc6..4b6c910 100644
|
2013-02-02 22:21:35 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2013-03-15 21:35:56 +00:00
|
|
|
@@ -1332,6 +1332,13 @@ public abstract class World implements IBlockAccess {
|
2013-02-02 22:21:35 +00:00
|
|
|
|
|
|
|
|
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
|
|
|
|
|
// CraftBukkit start - don't tick entities in chunks queued for unload
|
|
|
|
|
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
|
|
|
|
|
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
|
|
|
|
|
--
|
2013-03-15 21:35:56 +00:00
|
|
|
1.8.1-rc2
|
2013-02-02 22:21:35 +00:00
|
|
|
|
