Paper/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch

32 lines
1.1 KiB
Diff
Raw Normal View History

2017-04-22 08:16:45 +02:00
From 74cd9a5fe5f7233473c7270ec3ab99c228204628 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
2017-04-22 08:16:45 +02:00
index 185b5929f..91a45a755 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2017-04-22 06:42:59 +02:00
@@ -1213,6 +1213,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
for (int i = 0; i < this.players.size(); ++i) {
2017-04-22 06:42:59 +02:00
@@ -1222,6 +1223,7 @@ public abstract class PlayerList {
}
}
MinecraftTimings.savePlayers.stopTiming(); // Paper
+ return null; }); // Paper - ensure main
}
// Paper end
--
2017-04-22 06:42:59 +02:00
2.12.2