28 lines
1.2 KiB
Diff
28 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 59fb19cfebe4f488fd02f02db31029d44b65e408..cebf536e9d16d44c4b2a91b5b4be053cd7f44045 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||
|
|
@@ -1043,11 +1043,13 @@ public abstract class PlayerList {
|
||
|
|
}
|
||
|
|
|
||
|
|
public void saveAll() {
|
||
|
|
+ MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
|
||
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
||
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
||
|
|
- this.save((ServerPlayer) this.players.get(i));
|
||
|
|
+ this.savePlayerFile((EntityPlayer) this.players.get(i));
|
||
|
|
}
|
||
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
||
|
|
+ return null; }); // Paper - ensure main
|
||
|
|
}
|
||
|
|
|
||
|
|
public UserWhiteList getWhiteList() {
|