2021-06-11 14:02:28 +02:00
|
|
|
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
|
2024-07-17 19:24:53 +02:00
|
|
|
index a939bad7da9c852827a2d67d9ace5d0df4911a31..1049452baaf0381ffbf15b30da956c2a1994da35 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
2024-07-17 19:24:53 +02:00
|
|
|
@@ -179,6 +179,12 @@ public class ServerChunkCache extends ChunkSource {
|
2021-06-11 14:02:28 +02:00
|
|
|
return this.getChunk(x, z, leastStatus, create);
|
|
|
|
}, this.mainThreadProcessor).join();
|
|
|
|
} else {
|
2024-01-21 12:53:04 +01:00
|
|
|
+ // Paper start - Perf: Optimise getChunkAt calls for loaded chunks
|
2021-06-11 14:02:28 +02:00
|
|
|
+ LevelChunk ifLoaded = this.getChunkAtIfLoadedMainThread(x, z);
|
|
|
|
+ if (ifLoaded != null) {
|
|
|
|
+ return ifLoaded;
|
|
|
|
+ }
|
2024-01-21 12:53:04 +01:00
|
|
|
+ // Paper end - Perf: Optimise getChunkAt calls for loaded chunks
|
2021-06-11 14:02:28 +02:00
|
|
|
ProfilerFiller gameprofilerfiller = this.level.getProfiler();
|
|
|
|
|
|
|
|
gameprofilerfiller.incrementCounter("getChunk");
|
2024-07-17 19:24:53 +02:00
|
|
|
@@ -222,33 +228,7 @@ public class ServerChunkCache extends ChunkSource {
|
2024-01-24 13:07:40 +01:00
|
|
|
if (Thread.currentThread() != this.mainThread) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return null;
|
|
|
|
} else {
|
|
|
|
- this.level.getProfiler().incrementCounter("getChunkNow");
|
|
|
|
- long k = ChunkPos.asLong(chunkX, chunkZ);
|
|
|
|
-
|
2024-06-13 22:14:13 +02:00
|
|
|
- ChunkAccess ichunkaccess;
|
|
|
|
-
|
2021-06-11 14:02:28 +02:00
|
|
|
- for (int l = 0; l < 4; ++l) {
|
|
|
|
- if (k == this.lastChunkPos[l] && this.lastChunkStatus[l] == ChunkStatus.FULL) {
|
2024-06-13 22:14:13 +02:00
|
|
|
- ichunkaccess = this.lastChunk[l];
|
2021-06-11 14:02:28 +02:00
|
|
|
- return ichunkaccess instanceof LevelChunk ? (LevelChunk) ichunkaccess : null;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- ChunkHolder playerchunk = this.getVisibleChunkIfPresent(k);
|
|
|
|
-
|
|
|
|
- if (playerchunk == null) {
|
|
|
|
- return null;
|
|
|
|
- } else {
|
2024-06-13 22:14:13 +02:00
|
|
|
- ichunkaccess = playerchunk.getChunkIfPresent(ChunkStatus.FULL);
|
|
|
|
- if (ichunkaccess != null) {
|
|
|
|
- this.storeInCache(k, ichunkaccess, ChunkStatus.FULL);
|
|
|
|
- if (ichunkaccess instanceof LevelChunk) {
|
|
|
|
- return (LevelChunk) ichunkaccess;
|
2021-06-11 14:02:28 +02:00
|
|
|
- }
|
|
|
|
- }
|
2024-06-13 22:14:13 +02:00
|
|
|
-
|
|
|
|
- return null;
|
2021-06-11 14:02:28 +02:00
|
|
|
- }
|
2024-01-21 12:53:04 +01:00
|
|
|
+ return this.getChunkAtIfLoadedMainThread(chunkX, chunkZ); // Paper - Perf: Optimise getChunkAt calls for loaded chunks
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|