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