testserver/Spigot-Server-Patches/0190-Enforce-Sync-Player-Sa...

32 lines
1.1 KiB
Diff
Raw Normal View History

2018-03-31 09:34:25 +00:00
From eea42d14eaa0cc5e8b3b4bc3716ccf9197044386 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/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2018-03-31 09:34:25 +00:00
index 90f6e2e04..054483a73 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2018-03-31 09:34:25 +00:00
@@ -1252,6 +1252,7 @@ public abstract class PlayerList {
}
public void savePlayers(Integer interval) {
+ MCUtil.ensureMain("Save Players", () -> { // Paper - ensure main
long now = MinecraftServer.currentTick;
MinecraftTimings.savePlayers.startTiming(); // Paper
int numSaved = 0; // Paper
2018-03-31 09:34:25 +00:00
@@ -1263,6 +1264,7 @@ public abstract class PlayerList {
}
}
MinecraftTimings.savePlayers.stopTiming(); // Paper
+ return null; }); // Paper - ensure main
}
// Paper end
--
2018-03-31 09:34:25 +00:00
2.16.3