aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch')
-rw-r--r--patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
new file mode 100644
index 0000000000..3e893aae8c
--- /dev/null
+++ b/patches/server/0341-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+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
+
+diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java
+index 3d46412b307f08968bb9b96c0649e0405813462e..56aa26bb8d0bfbd3c799163fa620259e6455c89b 100644
+--- a/src/main/java/net/minecraft/server/level/DistanceManager.java
++++ b/src/main/java/net/minecraft/server/level/DistanceManager.java
+@@ -270,8 +270,8 @@ public abstract class DistanceManager {
+ ObjectSet<ServerPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
+ if (objectset == null) return; // CraftBukkit - SPIGOT-6208
+
+- 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);