twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash if player is attempted to be removed from untracked chunk.

Browse Source 
I suspect it deals with teleporting as it uses players current x/y/z
This commit is contained in:
Aikar
2020-04-18 15:59:41 -04:00
parent 57802a490d
commit b7898433d0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/patches/sources/net/minecraft/server/level/DistanceManager.java.patch
View File

@@ -100,14 +100,19 @@
} }
private SortedArraySet<Ticket<?>> getTickets(long position) { private SortedArraySet<Ticket<?>> getTickets(long position) {
@@ -253,6 +279,7 @@ @@ -253,9 +279,10 @@
ChunkPos chunkcoordintpair = pos.chunk(); ChunkPos chunkcoordintpair = pos.chunk();
long i = chunkcoordintpair.toLong(); long i = chunkcoordintpair.toLong();
ObjectSet<ServerPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i); ObjectSet<ServerPlayer> objectset = (ObjectSet) this.playersPerChunk.get(i);
+ if (objectset == null) return; // CraftBukkit - SPIGOT-6208 + if (objectset == null) return; // CraftBukkit - SPIGOT-6208
objectset.remove(player); - objectset.remove(player);
if (objectset.isEmpty()) { - 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 @@ @@ -358,7 +385,7 @@
} }