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

28 lines
1.1 KiB
Diff
Raw Normal View History

From 68d6ccce5188665408f63fd5d9f4fe32dfed982d 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
2021-03-16 09:00:00 +11:00
diff --git a/src/main/java/net/minecraft/world/level/World.java b/src/main/java/net/minecraft/world/level/World.java
index 2702eeecf..0493e322d 100644
2021-03-16 09:00:00 +11:00
--- a/src/main/java/net/minecraft/world/level/World.java
+++ b/src/main/java/net/minecraft/world/level/World.java
2023-03-15 03:30:00 +11:00
@@ -642,6 +642,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
while (iterator.hasNext()) {
2021-06-11 15:00:00 +10:00
TickingBlockEntity tickingblockentity = (TickingBlockEntity) iterator.next();
+ // Spigot start
2021-06-11 15:00:00 +10:00
+ if (tickingblockentity == null) {
2021-06-11 21:39:23 +10:00
+ getCraftServer().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
2021-11-22 09:00:00 +11:00
if (tickingblockentity.isRemoved()) {
2021-06-11 15:00:00 +10:00
iterator.remove();
--
2.40.0