Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
96 Zeilen
5.5 KiB
Diff
96 Zeilen
5.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Aikar <aikar@aikar.co>
|
||
|
Date: Sun, 9 Aug 2020 08:59:25 +0300
|
||
|
Subject: [PATCH] Incremental player saving
|
||
|
|
||
|
|
||
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
index b67ba8f75e4a3358d7c2462918b85b0bf9b5a922..fdbd8b89bb8bf3b61f60b812b90483c98a3d5ccb 100644
|
||
|
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
|
||
|
@@ -440,4 +440,15 @@ public class PaperConfig {
|
||
|
allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
|
||
|
set("settings.unsupported-settings.allow-tnt-duplication", null);
|
||
|
}
|
||
|
+
|
||
|
+ public static int playerAutoSaveRate = -1;
|
||
|
+ public static int maxPlayerAutoSavePerTick = 10;
|
||
|
+ private static void playerAutoSaveRate() {
|
||
|
+ playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1);
|
||
|
+ maxPlayerAutoSavePerTick = getInt("settings.max-player-auto-save-per-tick", -1);
|
||
|
+ if (maxPlayerAutoSavePerTick == -1) { // -1 Automatic / "Recommended"
|
||
|
+ // 10 should be safe for everyone unless you mass spamming player auto save
|
||
|
+ maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
|
||
|
+ }
|
||
|
+ }
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
index 19544b794b5a46c129016172798ff7294fcfed33..735c3c983e96e4e6f36de0975909fc48cb042081 100644
|
||
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||
|
@@ -1347,9 +1347,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||
|
//if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit // Paper - move down
|
||
|
//MinecraftServer.LOGGER.debug("Autosave started"); // Paper
|
||
|
serverAutoSave = (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0); // Paper
|
||
|
+ // Paper start
|
||
|
+ int playerSaveInterval = com.destroystokyo.paper.PaperConfig.playerAutoSaveRate;
|
||
|
+ if (playerSaveInterval < 0) {
|
||
|
+ playerSaveInterval = autosavePeriod;
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
this.profiler.push("save");
|
||
|
- if (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0) { // Paper
|
||
|
- this.playerList.saveAll();
|
||
|
+ if (playerSaveInterval > 0) { // Paper
|
||
|
+ this.playerList.savePlayers(playerSaveInterval); // Paper
|
||
|
}// Paper
|
||
|
// Paper start
|
||
|
for (ServerLevel world : getAllLevels()) {
|
||
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
index c5717f45a0110492aad41f21cc06fb8cbeb1f791..bd4d4ace35e966e819aa461d3962fe06ff402be7 100644
|
||
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
@@ -173,6 +173,7 @@ import org.bukkit.inventory.MainHand;
|
||
|
public class ServerPlayer extends Player implements ContainerListener {
|
||
|
|
||
|
private static final Logger LOGGER = LogManager.getLogger();
|
||
|
+ public long lastSave = MinecraftServer.currentTick; // Paper
|
||
|
public ServerGamePacketListenerImpl connection;
|
||
|
public Connection networkManager; // Paper
|
||
|
public final MinecraftServer server;
|
||
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
index 882cd25c9610f0b995c27291aa62846922ab531f..b76735531ef96f9d4c870a5107feea01524a7670 100644
|
||
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
@@ -559,6 +559,7 @@ public abstract class PlayerList {
|
||
|
protected void save(ServerPlayer player) {
|
||
|
if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
|
||
|
if (!player.didPlayerJoinEvent) return; // Paper - If we never fired PJE, we disconnected during login. Data has not changed, and additionally, our saved vehicle is not loaded! If we save now, we will lose our vehicle (CraftBukkit bug)
|
||
|
+ player.lastSave = MinecraftServer.currentTick; // Paper
|
||
|
this.playerIo.save(player);
|
||
|
ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
|
||
|
|
||
|
@@ -1218,10 +1219,21 @@ public abstract class PlayerList {
|
||
|
}
|
||
|
|
||
|
public void saveAll() {
|
||
|
+ // Paper start - incremental player saving
|
||
|
+ savePlayers(null);
|
||
|
+ }
|
||
|
+ public void savePlayers(Integer interval) {
|
||
|
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((ServerPlayer) this.players.get(i));
|
||
|
+ ServerPlayer entityplayer = this.players.get(i);
|
||
|
+ if (interval == null || now - entityplayer.lastSave >= interval) {
|
||
|
+ this.save(entityplayer);
|
||
|
+ if (interval != null && ++numSaved <= com.destroystokyo.paper.PaperConfig.maxPlayerAutoSavePerTick) { break; }
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
}
|
||
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
||
|
return null; }); // Paper - ensure main
|