Paper/Spigot-Server-Patches/0392-ChunkMapDistance-CME.patch

55 lines
2.4 KiB
Diff
Raw Normal View History

2019-07-20 06:01:24 +02:00
From d91280b404da585a708ada87cd172dd832ab2364 Mon Sep 17 00:00:00 2001
2019-05-29 05:25:08 +02:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 29 May 2019 04:01:22 +0100
Subject: [PATCH] ChunkMapDistance CME
diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
2019-07-20 06:01:24 +02:00
index 101eb58ace..63a688725e 100644
2019-05-29 05:25:08 +02:00
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
2019-07-05 04:23:33 +02:00
@@ -36,7 +36,7 @@ public abstract class ChunkMapDistance {
private final ChunkMapDistance.a e = new ChunkMapDistance.a();
private final ChunkMapDistance.b f = new ChunkMapDistance.b(8);
private final ChunkMapDistance.c g = new ChunkMapDistance.c(33);
2019-07-20 06:01:24 +02:00
- private final Set<PlayerChunk> pendingChunkUpdates = Sets.newHashSet();
+ private final java.util.Queue<PlayerChunk> pendingChunkUpdates = new java.util.LinkedList<>(); // PAIL pendingChunkUpdates // Paper - use a queue
private final ChunkTaskQueueSorter i;
private final Mailbox<ChunkTaskQueueSorter.a<Runnable>> j;
private final Mailbox<ChunkTaskQueueSorter.b> k;
2019-07-20 06:01:24 +02:00
@@ -99,26 +99,12 @@ public abstract class ChunkMapDistance {
2019-05-29 05:25:08 +02:00
;
}
+ // Paper start
2019-07-20 06:01:24 +02:00
if (!this.pendingChunkUpdates.isEmpty()) {
- // CraftBukkit start
- // Iterate pending chunk updates with protection against concurrent modification exceptions
2019-07-20 06:01:24 +02:00
- java.util.Iterator<PlayerChunk> iter = this.pendingChunkUpdates.iterator();
- int expectedSize = this.pendingChunkUpdates.size();
- do {
- PlayerChunk playerchunk = iter.next();
- iter.remove();
- expectedSize--;
-
- playerchunk.a(playerchunkmap);
-
- // Reset iterator if set was modified using add()
2019-07-20 06:01:24 +02:00
- if (this.pendingChunkUpdates.size() != expectedSize) {
- expectedSize = this.pendingChunkUpdates.size();
- iter = this.pendingChunkUpdates.iterator();
- }
- } while (iter.hasNext());
- // CraftBukkit end
-
2019-07-20 06:01:24 +02:00
+ while(!this.pendingChunkUpdates.isEmpty()) {
+ this.pendingChunkUpdates.remove().a(playerchunkmap);
+ }
+ // Paper end
return true;
} else {
if (!this.l.isEmpty()) {
2019-05-29 05:25:08 +02:00
--
2.22.0
2019-05-29 05:25:08 +02:00