mirror of https://github.com/PaperMC/Paper.git
35 lines
1.7 KiB
Diff
35 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Sun, 20 Sep 2020 16:10:49 -0700
|
|
Subject: [PATCH] Make sure inlined getChunkAt has inlined logic for loaded
|
|
chunks
|
|
|
|
Tux did some profiling some time ago and showed that the
|
|
previous getChunkAt method which had inlined logic for loaded
|
|
chunks did get inlined, but the standard CPS.getChunkAt
|
|
method was not inlined.
|
|
|
|
Paper recently reverted this optimisation, so it's been reintroduced
|
|
here.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
|
|
index 10f4cbf82cc4a79aacfd1f8e1e53a6c1f4963865..c56de0c388f5902d85b0810c6e105c24d721bcdd 100644
|
|
--- a/src/main/java/net/minecraft/world/level/Level.java
|
|
+++ b/src/main/java/net/minecraft/world/level/Level.java
|
|
@@ -366,6 +366,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
|
|
|
|
@Override
|
|
public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
|
|
+ // Paper start - make sure loaded chunks get the inlined variant of this function
|
|
+ net.minecraft.server.level.ServerChunkCache cps = ((ServerLevel)this).getChunkSource();
|
|
+ if (cps.mainThread == Thread.currentThread()) {
|
|
+ LevelChunk ifLoaded = cps.getChunkAtIfLoadedMainThread(chunkX, chunkZ);
|
|
+ if (ifLoaded != null) {
|
|
+ return ifLoaded;
|
|
+ }
|
|
+ }
|
|
+ // Paper end - make sure loaded chunks get the inlined variant of this function
|
|
return (LevelChunk) this.getChunk(chunkX, chunkZ, ChunkStatus.FULL, true); // Paper - avoid a method jump
|
|
}
|
|
|