aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1038-Incremental-chunk-and-player-saving.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1038-Incremental-chunk-and-player-saving.patch')
-rw-r--r--patches/server/1038-Incremental-chunk-and-player-saving.patch145
1 files changed, 145 insertions, 0 deletions
diff --git a/patches/server/1038-Incremental-chunk-and-player-saving.patch b/patches/server/1038-Incremental-chunk-and-player-saving.patch
new file mode 100644
index 0000000000..a19a5893eb
--- /dev/null
+++ b/patches/server/1038-Incremental-chunk-and-player-saving.patch
@@ -0,0 +1,145 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+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
+index a2875f7cdfb6b43ed59cff41ab4122a08c4cc57f..45695abbeb0a6d47b31b23ba6c464f17e99d7898 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -993,7 +993,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+
+ try {
+ this.isSaving = true;
+- this.getPlayerList().saveAll();
++ this.getPlayerList().saveAll(); // Paper - Incremental chunk and player saving; diff on change
+ flag3 = this.saveAllChunks(suppressLogs, flush, force);
+ } finally {
+ this.isSaving = false;
+@@ -1597,16 +1597,28 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ }
+
+ --this.ticksUntilAutosave;
+- // CraftBukkit start
+- if (this.autosavePeriod > 0 && this.ticksUntilAutosave <= 0) {
+- this.ticksUntilAutosave = this.autosavePeriod;
+- // CraftBukkit end
+- MinecraftServer.LOGGER.debug("Autosave started");
+- this.profiler.push("save");
+- this.saveEverything(true, false, false);
+- this.profiler.pop();
+- MinecraftServer.LOGGER.debug("Autosave finished");
++ // Paper start - Incremental chunk and player saving
++ int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate;
++ if (playerSaveInterval < 0) {
++ playerSaveInterval = autosavePeriod;
++ }
++ 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;
+ }
++ this.profiler.pop();
++ // Paper end - Incremental chunk and player saving
+ // Paper start - move executeAll() into full server tick timing
+ try (co.aikar.timings.Timing ignored = MinecraftTimings.processTasksTimer.startTiming()) {
+ this.runAllTasks();
+diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
+index e50df5a1f3b89b3d0687d6584bdd977f8b71a3f6..2fe9d9b38c01d04416843fdd48d3e33899b7de63 100644
+--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
+@@ -1315,6 +1315,35 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
+ return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
+ }
+
++ // Paper start - Incremental chunk and player saving
++ 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(true);
++ }
++
++ // chunk autosave is already called by the ChunkSystem during unload processing (ChunkMap#processUnloads)
++
++ // 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(this.registryAccess()));
++ this.convertable.saveDataTag(this.server.registryAccess(), this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
++ }
++ // CraftBukkit end
++ }
++ }
++ // Paper end - Incremental chunk and player saving
++
+ public void save(@Nullable ProgressListener progressListener, boolean flush, boolean savingDisabled) {
+ // Paper start - add close param
+ this.save(progressListener, flush, savingDisabled, false);
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index dddd4fcdcd08e0221693071894818c7d3bae531b..5980b70e2d7273239245237189b2debcbccfbac3 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -203,6 +203,7 @@ import org.bukkit.inventory.MainHand;
+ public class ServerPlayer extends net.minecraft.world.entity.player.Player implements ca.spottedleaf.moonrise.patches.chunk_system.player.ChunkSystemServerPlayer { // Paper - rewrite chunk system
+
+ private static final Logger LOGGER = LogUtils.getLogger();
++ public long lastSave = MinecraftServer.currentTick; // Paper - Incremental chunk and player saving
+ private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
+ private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
+ private static final int FLY_STAT_RECORDING_SPEED = 25;
+diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
+index c38c688417f769a6022dd40d6652b00e14c4df94..43eeb8ce4bc350c2b524ade11ca25d8d4d21bea5 100644
+--- a/src/main/java/net/minecraft/server/players/PlayerList.java
++++ b/src/main/java/net/minecraft/server/players/PlayerList.java
+@@ -569,6 +569,7 @@ public abstract class PlayerList {
+
+ protected void save(ServerPlayer player) {
+ if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
++ player.lastSave = MinecraftServer.currentTick; // Paper - Incremental chunk and player saving
+ this.playerIo.save(player);
+ ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
+
+@@ -1183,10 +1184,22 @@ public abstract class PlayerList {
+ }
+
+ public void saveAll() {
++ // Paper start - Incremental chunk and player saving
++ this.saveAll(-1);
++ }
++
++ public void saveAll(int interval) {
+ io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
+ 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);
++ if (interval != -1 && ++numSaved >= io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.maxPerTick()) { break; }
++ }
++ // Paper end - Incremental chunk and player saving
+ }
+ MinecraftTimings.savePlayers.stopTiming(); // Paper
+ return null; }); // Paper - ensure main