aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch
blob: 78d49f15bcb7c43d9dcbe85d047495ac1727f1e5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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
index 185b5929f..91a45a755 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -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) {
@@ -1222,6 +1223,7 @@ public abstract class PlayerList {
             }
         }
         MinecraftTimings.savePlayers.stopTiming(); // Paper
+        return null; }); // Paper - ensure main
     }
     // Paper end
 
-- 
2.12.2