From c8cb88449adba448d0c187dca5d998dd2f22a236 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 12f6812d67..c8b5a610aa 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1220,6 +1220,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 int numSaved = 0; // Paper @@ -1231,6 +1232,7 @@ public abstract class PlayerList { } } MinecraftTimings.savePlayers.stopTiming(); // Paper + return null; }); // Paper - ensure main } // Paper end -- 2.18.0