spigot/CraftBukkit-Patches/0011-Handle-Null-Tile-Entities.patch

28 lines
1.1 KiB
Diff
Raw Normal View History

2018-08-06 10:32:15 +10:00
From 7dda52996cab32f849cce2c2a0678e1d7598f063 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
2018-08-06 10:32:15 +10:00
index cceab7750..4770beefb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2018-08-06 10:32:15 +10:00
@@ -1136,6 +1136,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
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
2014-06-22 19:25:10 +10:00
2018-07-15 10:00:00 +10:00
if (!tileentity.x() && tileentity.u()) {
BlockPosition blockposition = tileentity.getPosition();
--
2018-07-15 10:00:00 +10:00
2.17.1