2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2017-01-07 20:48:22 +00:00
|
|
|
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
|
2020-07-22 23:35:44 +00:00
|
|
|
index 12b1ef7fb02e1c4c265f24a090fea10e59a02f67..8bc8c20f0cbf909bd11f360d14926ba29637f779 100644
|
2017-01-07 20:48:22 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/PlayerList.java
|
2020-06-27 05:12:11 +00:00
|
|
|
@@ -961,11 +961,13 @@ public abstract class PlayerList {
|
2017-01-07 20:48:22 +00:00
|
|
|
}
|
|
|
|
|
2019-04-27 06:26:04 +00:00
|
|
|
public void savePlayers() {
|
|
|
|
+ MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
|
2017-01-07 20:48:22 +00:00
|
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
2019-04-27 06:26:04 +00:00
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
this.savePlayerFile((EntityPlayer) this.players.get(i));
|
2017-01-07 20:48:22 +00:00
|
|
|
}
|
|
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
|
|
|
+ return null; }); // Paper - ensure main
|
|
|
|
}
|
|
|
|
|
2019-04-27 06:26:04 +00:00
|
|
|
public WhiteList getWhitelist() {
|