2018-03-31 11:34:25 +02:00
|
|
|
From eea42d14eaa0cc5e8b3b4bc3716ccf9197044386 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
|
2018-03-31 11:34:25 +02:00
|
|
|
index 90f6e2e04..054483a73 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
|
2018-03-31 11:34:25 +02:00
|
|
|
@@ -1252,6 +1252,7 @@ public abstract class PlayerList {
|
2017-01-07 21:48:22 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public void savePlayers(Integer interval) {
|
|
|
|
+ MCUtil.ensureMain("Save Players", () -> { // Paper - ensure main
|
|
|
|
long now = MinecraftServer.currentTick;
|
|
|
|
MinecraftTimings.savePlayers.startTiming(); // Paper
|
2018-03-05 02:20:27 +01:00
|
|
|
int numSaved = 0; // Paper
|
2018-03-31 11:34:25 +02:00
|
|
|
@@ -1263,6 +1264,7 @@ public abstract class PlayerList {
|
2017-01-07 21:48:22 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
MinecraftTimings.savePlayers.stopTiming(); // Paper
|
|
|
|
+ return null; }); // Paper - ensure main
|
|
|
|
}
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
--
|
2018-03-31 11:34:25 +02:00
|
|
|
2.16.3
|
2017-01-07 21:48:22 +01:00
|
|
|
|