27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 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/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
index 49f1aed92fd5fa46b74a979f317a2eb0672991e9..f0928684f2bb56b490bea7cd80eb9300d2647f0c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -1047,11 +1047,13 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void savePlayers() {
|
||
|
|
+ MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
|
||
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
||
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
||
|
|
this.savePlayerFile((EntityPlayer) this.players.get(i));
|
||
|
|
}
|
||
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
||
|
|
+ return null; }); // Paper - ensure main
|
||
|
|
}
|
||
|
|
|
||
|
|
public WhiteList getWhitelist() {
|