2022-09-26 10:02:51 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
Date: Sun, 9 Jun 2019 03:53:22 +0100
|
|
|
|
Subject: [PATCH] incremental chunk and player saving
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2024-01-21 17:39:05 +01:00
|
|
|
index 229f5c1d651d903e1c641e67661004a4ee010417..08e3f07c4547f8fa7b571ecef7436ba1fbee578a 100644
|
2022-09-26 10:02:51 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
2023-12-06 04:00:14 +01:00
|
|
|
@@ -901,7 +901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2022-09-26 10:02:51 +02:00
|
|
|
|
|
|
|
try {
|
|
|
|
this.isSaving = true;
|
|
|
|
- this.getPlayerList().saveAll();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ this.getPlayerList().saveAll(); // Paper - Incremental chunk and player saving; diff on change
|
2022-09-26 10:02:51 +02:00
|
|
|
flag3 = this.saveAllChunks(suppressLogs, flush, force);
|
|
|
|
} finally {
|
|
|
|
this.isSaving = false;
|
2024-01-14 10:46:04 +01:00
|
|
|
@@ -1427,16 +1427,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
2022-09-26 10:02:51 +02:00
|
|
|
}
|
|
|
|
|
2023-12-06 04:00:14 +01:00
|
|
|
--this.ticksUntilAutosave;
|
|
|
|
- // CraftBukkit start
|
|
|
|
- if (this.autosavePeriod > 0 && this.ticksUntilAutosave <= 0) {
|
|
|
|
- this.ticksUntilAutosave = this.autosavePeriod;
|
|
|
|
- // CraftBukkit end
|
2022-09-26 10:02:51 +02:00
|
|
|
- MinecraftServer.LOGGER.debug("Autosave started");
|
|
|
|
- this.profiler.push("save");
|
|
|
|
- this.saveEverything(true, false, false);
|
|
|
|
- this.profiler.pop();
|
|
|
|
- MinecraftServer.LOGGER.debug("Autosave finished");
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper start - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
+ int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate;
|
|
|
|
+ if (playerSaveInterval < 0) {
|
|
|
|
+ playerSaveInterval = autosavePeriod;
|
2024-01-20 23:13:41 +01:00
|
|
|
+ }
|
2022-09-26 10:02:51 +02:00
|
|
|
+ this.profiler.push("save");
|
|
|
|
+ final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
|
|
|
|
+ try {
|
|
|
|
+ this.isSaving = true;
|
|
|
|
+ if (playerSaveInterval > 0) {
|
|
|
|
+ this.playerList.saveAll(playerSaveInterval);
|
|
|
|
+ }
|
|
|
|
+ for (ServerLevel level : this.getAllLevels()) {
|
|
|
|
+ if (level.paperConfig().chunks.autoSaveInterval.value() > 0) {
|
|
|
|
+ level.saveIncrementally(fullSave);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } finally {
|
|
|
|
+ this.isSaving = false;
|
2024-01-20 23:13:41 +01:00
|
|
|
}
|
2022-09-26 10:02:51 +02:00
|
|
|
+ this.profiler.pop();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper end - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
io.papermc.paper.util.CachedLists.reset(); // Paper
|
|
|
|
// Paper start - move executeAll() into full server tick timing
|
|
|
|
try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
2024-01-21 17:39:05 +01:00
|
|
|
index 56fe3f4edd15239533a1ae9287e86528b3296bdc..a35957eef3f6ab2dcfebc01eaa9bea1b249599e2 100644
|
2022-09-26 10:02:51 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
|
2023-12-06 04:00:14 +01:00
|
|
|
@@ -450,6 +450,15 @@ public class ServerChunkCache extends ChunkSource {
|
2022-09-26 10:02:51 +02:00
|
|
|
} // Paper - Timings
|
|
|
|
}
|
|
|
|
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper start - Incremental chunk and player saving; duplicate save, but call incremental
|
2022-09-26 10:02:51 +02:00
|
|
|
+ public void saveIncrementally() {
|
|
|
|
+ this.runDistanceManagerUpdates();
|
|
|
|
+ try (co.aikar.timings.Timing timed = level.timings.chunkSaveData.startTiming()) { // Paper - Timings
|
|
|
|
+ this.chunkMap.saveIncrementally();
|
|
|
|
+ } // Paper - Timings
|
|
|
|
+ }
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper end - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
+
|
|
|
|
@Override
|
|
|
|
public void close() throws IOException {
|
|
|
|
// CraftBukkit start
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-01-21 19:37:09 +01:00
|
|
|
index 1b92cee2f51b844340d213ccfc78d1524a71c9dc..d9d4a8df764bce67ee13a542e0b21a5ec7fd8ca7 100644
|
2022-09-26 10:02:51 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2024-01-21 17:39:05 +01:00
|
|
|
@@ -1301,6 +1301,37 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2022-09-26 10:02:51 +02:00
|
|
|
return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
|
|
|
|
}
|
|
|
|
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper start - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
+ public void saveIncrementally(boolean doFull) {
|
|
|
|
+ ServerChunkCache chunkproviderserver = this.getChunkSource();
|
|
|
|
+
|
|
|
|
+ if (doFull) {
|
|
|
|
+ org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
|
|
|
|
+ if (doFull) {
|
|
|
|
+ this.saveLevelData();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ this.timings.worldSaveChunks.startTiming(); // Paper
|
|
|
|
+ if (!this.noSave()) chunkproviderserver.saveIncrementally();
|
|
|
|
+ this.timings.worldSaveChunks.stopTiming(); // Paper
|
|
|
|
+
|
|
|
|
+ // Copied from save()
|
|
|
|
+ // CraftBukkit start - moved from MinecraftServer.saveChunks
|
|
|
|
+ if (doFull) { // Paper
|
|
|
|
+ ServerLevel worldserver1 = this;
|
|
|
|
+
|
|
|
|
+ this.serverLevelData.setWorldBorder(worldserver1.getWorldBorder().createSettings());
|
|
|
|
+ this.serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save());
|
2022-12-07 22:05:01 +01:00
|
|
|
+ this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
|
2022-09-26 10:02:51 +02:00
|
|
|
+ }
|
|
|
|
+ // CraftBukkit end
|
|
|
|
+ }
|
|
|
|
+ }
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper end - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
+
|
|
|
|
public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
|
2023-09-22 22:13:57 +02:00
|
|
|
// Paper start - rewrite chunk system - add close param
|
|
|
|
this.save(progressListener, flush, savingDisabled, false);
|
2022-09-26 10:02:51 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2024-01-21 19:37:09 +01:00
|
|
|
index 241c16b8df5128f2c88ed2f9e9c51d7f7b8420b4..9b3425857342f4c75ae23aee922d792977aa8c4e 100644
|
2022-09-26 10:02:51 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
2023-12-06 04:00:14 +01:00
|
|
|
@@ -190,6 +190,7 @@ import org.bukkit.inventory.MainHand;
|
2022-09-26 10:02:51 +02:00
|
|
|
public class ServerPlayer extends Player {
|
|
|
|
|
|
|
|
private static final Logger LOGGER = LogUtils.getLogger();
|
2024-01-20 23:13:41 +01:00
|
|
|
+ public long lastSave = MinecraftServer.currentTick; // Paper - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
|
|
|
|
private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
|
2023-12-06 04:00:14 +01:00
|
|
|
private static final int FLY_STAT_RECORDING_SPEED = 25;
|
2022-09-26 10:02:51 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2024-01-21 19:37:09 +01:00
|
|
|
index 805759ae7d92f690cea4c700c914769d39e3c0b6..ca0e6c8e27f998a078e6f60a3cad67ddda7706c7 100644
|
2022-09-26 10:02:51 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2023-12-06 04:00:14 +01:00
|
|
|
@@ -552,6 +552,7 @@ public abstract class PlayerList {
|
2022-12-19 11:46:55 +01:00
|
|
|
|
2022-09-26 10:02:51 +02:00
|
|
|
protected void save(ServerPlayer player) {
|
|
|
|
if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
|
2024-01-20 23:13:41 +01:00
|
|
|
+ player.lastSave = MinecraftServer.currentTick; // Paper - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
this.playerIo.save(player);
|
|
|
|
ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
|
|
|
|
|
2024-01-16 19:27:39 +01:00
|
|
|
@@ -1153,10 +1154,22 @@ public abstract class PlayerList {
|
2022-09-26 10:02:51 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public void saveAll() {
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper start - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
+ this.saveAll(-1);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void saveAll(int interval) {
|
2022-10-24 21:43:46 +02:00
|
|
|
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
|
2022-09-26 10:02:51 +02:00
|
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
|
|
|
+ int numSaved = 0;
|
|
|
|
+ long now = MinecraftServer.currentTick;
|
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
- this.save(this.players.get(i));
|
|
|
|
+ ServerPlayer entityplayer = this.players.get(i);
|
|
|
|
+ if (interval == -1 || now - entityplayer.lastSave >= interval) {
|
|
|
|
+ this.save(entityplayer);
|
2023-05-27 20:34:33 +02:00
|
|
|
+ if (interval != -1 && ++numSaved >= io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.maxPerTick()) { break; }
|
2022-09-26 10:02:51 +02:00
|
|
|
+ }
|
2024-01-20 23:13:41 +01:00
|
|
|
+ // Paper end - Incremental chunk and player saving
|
2022-09-26 10:02:51 +02:00
|
|
|
}
|
|
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
|
|
|
return null; }); // Paper - ensure main
|