Files
CatServer/spigot-patches/CraftBukkit-Patches/0010-Handle-Null-Tile-Entities.patch
T
2023-03-11 14:12:09 +08:00

28 lines
1.1 KiB
Diff

From 93e8e022987f9819f8bc1ff60cced8952f0c1839 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/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index 68eff83ee..d4dd846db 100644
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
@@ -649,6 +649,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
while (iterator.hasNext()) {
TickingBlockEntity tickingblockentity = (TickingBlockEntity) iterator.next();
+ // Spigot start
+ if (tickingblockentity == null) {
+ getCraftServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
+ iterator.remove();
+ continue;
+ }
+ // Spigot end
if (tickingblockentity.isRemoved()) {
iterator.remove();
--
2.25.1