28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
From 3bccc2c884c6ebf06e146c254577a772188c2025 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
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 fde1939..491d0b0 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1306,6 +1306,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
|
|
// 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)) {
|
|
--
|
|
1.8.3.2
|
|
|