From b7898433d06f4a2bf060fa9d6012bf04d300d016 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Apr 2020 15:59:41 -0400 Subject: [PATCH] Don't crash if player is attempted to be removed from untracked chunk. I suspect it deals with teleporting as it uses players current x/y/z --- .../minecraft/server/level/DistanceManager.java.patch | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/paper-server/patches/sources/net/minecraft/server/level/DistanceManager.java.patch b/paper-server/patches/sources/net/minecraft/server/level/DistanceManager.java.patch index 3128843e0..60e143787 100644 --- a/paper-server/patches/sources/net/minecraft/server/level/DistanceManager.java.patch +++ b/paper-server/patches/sources/net/minecraft/server/level/DistanceManager.java.patch @@ -100,14 +100,19 @@ } private SortedArraySet> getTickets(long position) { -@@ -253,6 +279,7 @@ +@@ -253,9 +279,10 @@ ChunkPos chunkcoordintpair = pos.chunk(); long i = chunkcoordintpair.toLong(); ObjectSet objectset = (ObjectSet) this.playersPerChunk.get(i); + if (objectset == null) return; // CraftBukkit - SPIGOT-6208 - objectset.remove(player); - if (objectset.isEmpty()) { +- objectset.remove(player); +- if (objectset.isEmpty()) { ++ if (objectset != null) objectset.remove(player); // Paper - some state corruption happens here, don't crash, clean up gracefully ++ if (objectset == null || objectset.isEmpty()) { // Paper + this.playersPerChunk.remove(i); + this.naturalSpawnChunkCounter.update(i, Integer.MAX_VALUE, false); + this.playerTicketManager.update(i, Integer.MAX_VALUE, false); @@ -358,7 +385,7 @@ }