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

29 lines
1.4 KiB
Diff
Raw Normal View History

Implement optional per player mobspawning (#2171)
2019-08-21 01:02:51 +00:00
From 7e3412b5e8d6b3c6bad18965ec3b4f9159e70433 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
Implement optional per player mobspawning (#2171)
2019-08-21 01:02:51 +00:00
index bdadbd436..fbbd4d5dd 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
Seperate out incremental saving This fixes multiple issues, mainly cleaning up the patch as well as making save-all actually save all. (Worth noting, that you should probably be using save-all flush if you're relying on this for backups)
2019-07-28 00:38:29 +00:00
@@ -768,8 +768,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;
}
--
Implement optional per player mobspawning (#2171)
2019-08-21 01:02:51 +00:00
2.23.0
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