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

28 lines
1.1 KiB
Diff
Raw Normal View History

2020-11-03 07:00:00 +11:00
From 6a28dc5b4815f904892dfc66479c2683b1ef926e 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
2020-11-03 07:00:00 +11:00
index 073287fa3..d41d45f27 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2020-08-12 07:00:00 +10:00
@@ -601,6 +601,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
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
2019-04-23 12:00:00 +10:00
if (!tileentity.isRemoved() && tileentity.hasWorld()) {
BlockPosition blockposition = tileentity.getPosition();
--
2.25.1