SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup MCUtils patch for chunk system

Browse Source 
Remove utilities that are unused, as well as replacing
the full chunk map with a concurrentutil implementation.

Additionally, fix the addition/removal of chunks to/from the
full chunk map so that getChunkIfLoaded correctly returns a
non-null chunk when calling the load or unload events.
This commit is contained in:
Spottedleaf
2024-06-19 10:29:03 -07:00
parent 45ae3a360b
commit 3c4ca08b26
4 changed files with 117 additions and 2304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
View File

@@ -17,15 +17,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@Override
public final LevelChunk getChunk(int chunkX, int chunkZ) { // Paper - final to help inline
- return (LevelChunk) this.getChunk(chunkX, chunkZ, ChunkStatus.FULL, true); // Paper - avoid a method jump
+ // Paper start - Perf: 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;
+ }
+ LevelChunk ifLoaded = cps.getChunkAtIfLoadedImmediately(chunkX, chunkZ);
+ if (ifLoaded != null) {
+ return ifLoaded;
+ }
+ return (LevelChunk) cps.getChunk(chunkX, chunkZ, ChunkStatus.FULL, true); // Paper - avoid a method jump
+ // Paper end - Perf: 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
}
// Paper start - if loaded