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

Remove cb null check

Browse Source
This commit is contained in:
Nassim Jahnke
2024-12-15 13:05:35 +01:00
parent df778ff55d
commit e99a9b5e4a
2 changed files with 12 additions and 9 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

@@ -78,15 +78,18 @@
}
private SortedArraySet<Ticket<?>> getTickets(long chunkPos) {
@@ -217,8 +_,9 @@
@@ -217,8 +_,12 @@
ChunkPos chunkPos = sectionPos.chunk();
long packedChunkPos = chunkPos.toLong();
ObjectSet<ServerPlayer> set = this.playersPerChunk.get(packedChunkPos);
- set.remove(player);
- if (set.isEmpty()) {
+ if (set == null) return; // CraftBukkit - SPIGOT-6208
+ if (set != null) set.remove(player); // Paper - some state corruption happens here, don't crash, clean up gracefully
+ if (set == null || set.isEmpty()) { // Paper
+ // Paper start - some state corruption happens here, don't crash, clean up gracefully
+ if (set != null) {
+ set.remove(player);
+ }
+ if (set == null || set.isEmpty()) {
+ // Paper end - some state corruption happens here, don't crash, clean up gracefully
this.playersPerChunk.remove(packedChunkPos);
this.naturalSpawnChunkCounter.update(packedChunkPos, Integer.MAX_VALUE, false);
this.playerTicketManager.update(packedChunkPos, Integer.MAX_VALUE, false);