mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-22 14:35:11 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
60 lines
2.7 KiB
Diff
60 lines
2.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sat, 25 Jan 2020 17:04:35 -0800
|
|
Subject: [PATCH] Optimise getChunkAt calls for loaded chunks
|
|
|
|
bypass the need to get a player chunk, then get the either,
|
|
then unwrap it...
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
index f4fa64ab18573cb9a22a9bfb79a351c388d1aaa5..2bd7f0554bdf668930c990156f65e97e4b64d8bc 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
@@ -194,6 +194,12 @@ public class ServerChunkCache extends ChunkSource {
|
|
return this.getChunk(x, z, leastStatus, create);
|
|
}, this.mainThreadProcessor).join();
|
|
} else {
|
|
+ // Paper start - Perf: Optimise getChunkAt calls for loaded chunks
|
|
+ LevelChunk ifLoaded = this.getChunkAtIfLoadedMainThread(x, z);
|
|
+ if (ifLoaded != null) {
|
|
+ return ifLoaded;
|
|
+ }
|
|
+ // Paper end - Perf: Optimise getChunkAt calls for loaded chunks
|
|
ProfilerFiller gameprofilerfiller = Profiler.get();
|
|
|
|
gameprofilerfiller.incrementCounter("getChunk");
|
|
@@ -233,33 +239,7 @@ public class ServerChunkCache extends ChunkSource {
|
|
if (Thread.currentThread() != this.mainThread) {
|
|
return null;
|
|
} else {
|
|
- Profiler.get().incrementCounter("getChunkNow");
|
|
- long k = ChunkPos.asLong(chunkX, chunkZ);
|
|
-
|
|
- ChunkAccess ichunkaccess;
|
|
-
|
|
- for (int l = 0; l < 4; ++l) {
|
|
- if (k == this.lastChunkPos[l] && this.lastChunkStatus[l] == ChunkStatus.FULL) {
|
|
- ichunkaccess = this.lastChunk[l];
|
|
- return ichunkaccess instanceof LevelChunk ? (LevelChunk) ichunkaccess : null;
|
|
- }
|
|
- }
|
|
-
|
|
- ChunkHolder playerchunk = this.getVisibleChunkIfPresent(k);
|
|
-
|
|
- if (playerchunk == null) {
|
|
- return null;
|
|
- } else {
|
|
- ichunkaccess = playerchunk.getChunkIfPresent(ChunkStatus.FULL);
|
|
- if (ichunkaccess != null) {
|
|
- this.storeInCache(k, ichunkaccess, ChunkStatus.FULL);
|
|
- if (ichunkaccess instanceof LevelChunk) {
|
|
- return (LevelChunk) ichunkaccess;
|
|
- }
|
|
- }
|
|
-
|
|
- return null;
|
|
- }
|
|
+ return this.getChunkAtIfLoadedMainThread(chunkX, chunkZ); // Paper - Perf: Optimise getChunkAt calls for loaded chunks
|
|
}
|
|
}
|
|
|