2019-04-22 21:36:14 +00:00
|
|
|
From 6dac784f4401b784add8dd0703128ff13c4ae288 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
|
2019-04-22 21:36:14 +00:00
|
|
|
index fe6649224a..9570a8800b 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
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -1214,6 +1214,7 @@ public abstract class PlayerList {
|
2017-01-07 20:48:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
public void savePlayers(Integer interval) {
|
|
|
|
+ MCUtil.ensureMain("Save Players", () -> { // Paper - ensure main
|
|
|
|
long now = MinecraftServer.currentTick;
|
|
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
2018-03-05 01:20:27 +00:00
|
|
|
int numSaved = 0; // Paper
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -1225,6 +1226,7 @@ public abstract class PlayerList {
|
2017-01-07 20:48:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
|
|
|
+ return null; }); // Paper - ensure main
|
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
--
|
2019-04-22 21:36:14 +00:00
|
|
|
2.21.0
|
2017-01-07 20:48:22 +00:00
|
|
|
|