diff options
author | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
---|---|---|
committer | Nassim Jahnke <[email protected]> | 2023-09-23 09:38:10 +1000 |
commit | b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb (patch) | |
tree | 429b9bd9ef2cc19e42b8656ef25ca1548f5efe88 /patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch | |
parent | 81c5901c674e6ee89dbfed4848c9eb645bfb0f16 (diff) | |
download | Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.tar.gz Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.zip |
Revert "re-add distance map patch"
This reverts commit 81c5901c674e6ee89dbfed4848c9eb645bfb0f16.
Diffstat (limited to 'patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch')
-rw-r--r-- | patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch deleted file mode 100644 index f5667e4d21..0000000000 --- a/patches/server/0681-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Spottedleaf <[email protected]> -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 cab4dd0f87bd6e497416b67835b62b4f40539153..4cdf476a1f3c5b255b7b4ff4793b6015387879d2 100644 ---- a/src/main/java/net/minecraft/world/level/Level.java -+++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -453,6 +453,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 - } - |