From 2e3081d45c8d5cba325b7aac3f6b9fec46bf669f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:48:22 -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. --- .../0202-Enforce-Sync-Player-Saves.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch diff --git a/Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch new file mode 100644 index 0000000000..f227d6309d --- /dev/null +++ b/Spigot-Server-Patches/0202-Enforce-Sync-Player-Saves.patch @@ -0,0 +1,31 @@ +From 763bf0aa2f45e7acdaef142a614790cfbaa082c8 Mon Sep 17 00:00:00 2001 +From: Aikar +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 2f527f6ce..6a1e4f0f6 100644 +--- a/src/main/java/net/minecraft/server/PlayerList.java ++++ b/src/main/java/net/minecraft/server/PlayerList.java +@@ -1212,6 +1212,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) { +@@ -1221,6 +1222,7 @@ public abstract class PlayerList { + } + } + MinecraftTimings.savePlayers.stopTiming(); // Paper ++ return null; }); // Paper - ensure main + } + // Paper end + +-- +2.11.0 +