core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-...

29 lines
1.4 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
2020-04-02 21:07:06 +00:00
From 5e741da63b4734810a9c9bfbd5828965cee2de0d Mon Sep 17 00:00:00 2001
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status.
2019-06-22 20:17:40 +00:00
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 22 Jun 2019 04:20:47 -0700
Subject: [PATCH] Use ChunkStatus cache when saving protochunks
The cache should contain the chunk status when saving. If not it
will load it.
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
Fix many issues with dupe uuid resolve patch This was not applied correctly, and would completely blow up chunk entity registration if this feature was turned off.... Additionally, change how the entities are removed to be more consistent with other code. Surface some of the logs indicating there is a problem as we are having so many issues with entities that we don't need to be surpressing logs like that.
2020-03-31 06:52:12 +00:00
index ef8418ffa7..02ed8c6c4c 100644
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status.
2019-06-22 20:17:40 +00:00
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
Fix many issues with dupe uuid resolve patch This was not applied correctly, and would completely blow up chunk entity registration if this feature was turned off.... Additionally, change how the entities are removed to be more consistent with other code. Surface some of the logs indicating there is a problem as we are having so many issues with entities that we don't need to be surpressing logs like that.
2020-03-31 06:52:12 +00:00
@@ -844,8 +844,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status.
2019-06-22 20:17:40 +00:00
NBTTagCompound nbttagcompound;
if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) {
- nbttagcompound = this.readChunkData(chunkcoordintpair);
- if (nbttagcompound != null && ChunkRegionLoader.a(nbttagcompound) == ChunkStatus.Type.LEVELCHUNK) {
+ // Paper start - Optimize save by using status cache
Fix loadChunk(x, z, false) I was not correctly checking if the status was even cached. Actually fix it this time Do not forget about the async chunk placeholder Actually fix it this time I hope No plugin tickets for getChunkAtGen(x, z, boolean) Change ChunkStatus ABI This is required for asynchronous IO. async io will require calls to getChunkStatusIfCached to return the chunk status for a chunk currently queued to save - this cannot be reasonably done with current ABI
2019-07-08 06:52:08 +00:00
+ ChunkStatus statusOnDisk = this.getChunkStatusOnDisk(chunkcoordintpair);
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status.
2019-06-22 20:17:40 +00:00
+ if (statusOnDisk != null && statusOnDisk.getType() == ChunkStatus.Type.LEVELCHUNK) {
+ // Paper end
return false;
}
--
Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch This patch appears to be no longer relevant, and is seemingly a leading cause of datapack performance being horrific
2020-03-15 20:03:36 +00:00
2.25.1
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status.
2019-06-22 20:17:40 +00:00