testserver/Spigot-Server-Patches/0172-Enforce-Sync-Player-Sa...

32 lines
1.1 KiB
Diff
Raw Normal View History

2018-07-17 20:32:05 +00:00
From 2a5803386edd8ea650fe2d1da9363103c4058c1d Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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
2018-07-17 20:32:05 +00:00
index 1f2265231..e41850742 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2018-07-17 20:32:05 +00:00
@@ -1226,6 +1226,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
2018-07-17 20:32:05 +00:00
@@ -1237,6 +1238,7 @@ public abstract class PlayerList {
}
}
MinecraftTimings.savePlayers.stopTiming(); // Paper
+ return null; }); // Paper - ensure main
}
// Paper end
--
2.18.0