diff options
Diffstat (limited to 'Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch')
| -rw-r--r-- | Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch new file mode 100644 index 0000000000..068576f0e6 --- /dev/null +++ b/Spigot-Server-Patches/0197-Enforce-Sync-Player-Saves.patch @@ -0,0 +1,31 @@ +From 5c5c9996f55ce482651fc8040a0c2dac74c855fb Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Sat, 7 Jan 2017 15:41:58 -0500 +Subject: [PATCH] Enforce Sync Player Saves + +Saving players async is extremely dangerous. This will force it to main +the same way we handle async chunk loads. + +diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java +index 58f30fb1d..034bdb7cf 100644 +--- a/src/main/java/net/minecraft/server/PlayerList.java ++++ b/src/main/java/net/minecraft/server/PlayerList.java +@@ -1214,6 +1214,7 @@ public abstract class PlayerList { + } + + public void savePlayers(Integer interval) { ++ MCUtil.ensureMain("Save Players", () -> { // Paper - ensure main + long now = MinecraftServer.currentTick; + MinecraftTimings.savePlayers.startTiming(); // Paper + for (int i = 0; i < this.players.size(); ++i) { +@@ -1223,6 +1224,7 @@ public abstract class PlayerList { + } + } + MinecraftTimings.savePlayers.stopTiming(); // Paper ++ return null; }); // Paper - ensure main + } + // Paper end + +-- +2.12.2 + |