2021-06-11 20:02:28 +08:00
|
|
|
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
|
2021-10-18 00:57:00 +08:00
|
|
|
index 4b21d3d73d76b81377a1d2222f37074c75ac3753..db95a5d89267f5bfc8020fcedf57b31daffc73a5 100644
|
2021-06-11 20:02:28 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
2021-10-18 00:57:00 +08:00
|
|
|
@@ -1036,11 +1036,13 @@ public abstract class PlayerList {
|
2021-06-11 20:02:28 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
public void saveAll() {
|
2021-06-12 17:01:04 +08:00
|
|
|
+ net.minecraft.server.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
|
2021-06-11 20:02:28 +08:00
|
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
|
|
|
for (int i = 0; i < this.players.size(); ++i) {
|
|
|
|
- this.save((ServerPlayer) this.players.get(i));
|
2021-06-12 17:01:04 +08:00
|
|
|
+ this.save(this.players.get(i));
|
2021-06-11 20:02:28 +08:00
|
|
|
}
|
|
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
|
|
|
+ return null; }); // Paper - ensure main
|
|
|
|
}
|
|
|
|
|
|
|
|
public UserWhiteList getWhiteList() {
|