twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-05 22:52:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improve autosave

Browse Source 
- don't trip manual save warning
- respect world#isSavingDisabled
This commit is contained in:
Shane Freeder
2019-06-10 06:39:04 +01:00
parent dd1c73156b
commit b1167a458a
1 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Spigot-Server-Patches/incremental-chunk-saving.patch
View File

@@ -42,7 +42,7 @@ index ef07f665b7..d89ad4e390 100644
private long t; private long t;
@Nullable @Nullable
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 184f1b00f0..13e862aa9f 100644 index 184f1b00f0..3dbe83c7ea 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java --- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas @@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -67,8 +67,14 @@ index 184f1b00f0..13e862aa9f 100644
- this.saveChunks(true, false, false); - this.saveChunks(true, false, false);
+ }// Paper + }// Paper
+ // Paper start + // Paper start
+ for (World world : getWorlds()) { + for (WorldServer world : getWorlds()) {
+ if (world.paperConfig.autoSavePeriod > 0) world.getWorld().save(false); + if (world.paperConfig.autoSavePeriod > 0) {
+ try {
+ world.save(null, false, world.isSavingDisabled());
+ } catch (ExceptionWorldConflict exceptionWorldConflict) {
+ MinecraftServer.LOGGER.warn(exceptionWorldConflict.getMessage());
+ }
+ }
+ } + }
+ // Paper end + // Paper end
+ +
@@ -137,29 +143,4 @@ index 92aad060ef..c650f40b0d 100644
timings.worldSaveChunks.startTiming(); // Paper timings.worldSaveChunks.startTiming(); // Paper
chunkproviderserver.save(flag); chunkproviderserver.save(flag);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0c53795306..4e60931cd8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld implements World {
// Paper end
@Override
+ // Paper start
public void save() {
+ save(true);
+ }
+
+ public void save(boolean forceSave) {
+ // Paper end
this.server.checkSaveState();
try {
boolean oldSave = world.savingDisabled;
world.savingDisabled = false;
- world.save(null, false, false);
+ world.save(null, forceSave, false); // Paper
world.savingDisabled = oldSave;
} catch (ExceptionWorldConflict ex) {
-- --