2013-12-09 07:00:58 +00:00
|
|
|
From e70f120999ce4597e539407cf4d83a1e56d941f4 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
|
2013-06-11 04:11:48 +00:00
|
|
|
Subject: [PATCH] Handle Null Tile Entities
|
2013-02-02 22:21:35 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2013-12-09 07:00:58 +00:00
|
|
|
index 3e41e82..1a8388a 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-12-09 07:00:58 +00:00
|
|
|
@@ -1312,6 +1312,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
|
2013-03-25 07:57:00 +00:00
|
|
|
// CraftBukkit start - Don't tick entities in chunks queued for unload
|
2013-02-02 22:21:35 +00:00
|
|
|
ChunkProviderServer chunkProviderServer = ((WorldServer) this).chunkProviderServer;
|
|
|
|
|
if (chunkProviderServer.unloadQueue.contains(tileentity.x >> 4, tileentity.z >> 4)) {
|
|
|
|
|
--
|
2013-11-27 11:01:50 +00:00
|
|
|
1.8.3.2
|
2013-02-02 22:21:35 +00:00
|
|
|
|
