Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "Optimize Persistent Data loading" (Fixes #2229)

Browse Source
This commit is contained in:
Shane Freeder
2019-06-25 05:14:30 +01:00
parent 56ee5647ab
commit 844eb92abf
32 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Spigot-Server-Patches/0396-ChunkMapDistance-CME.patch Normal file
View File

@@ -0,0 +1,37 @@
From 80ad0034e5f2a575baacc12b988f8beb51a5d4ba Mon Sep 17 00:00:00 2001
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
index ed4e8d69ca..cd18150488 100644
--- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
+++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
@@ -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);
- private final Set<PlayerChunk> h = Sets.newHashSet();
+ private Set<PlayerChunk> h = Sets.newHashSet(); // Paper - -final
private final PlayerChunk.c i;
private final Mailbox<ChunkTaskQueueSorter.a<Runnable>> j;
private final Mailbox<ChunkTaskQueueSorter.b> k;
@@ -98,8 +98,12 @@ public abstract class ChunkMapDistance {
;
}
- if (!this.h.isEmpty()) {
- this.h.forEach((playerchunk) -> {
+ // Paper start
+ Set<PlayerChunk> currentPending = this.h;
+ this.h = Sets.newHashSet();
+ if (!currentPending.isEmpty()) {
+ currentPending.forEach((playerchunk) -> {
+ // Paper end
playerchunk.a(playerchunkmap);
});
this.h.clear();
--
2.22.0