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

From a8a8f44e6b5ff879b3df33496bb1529836997fc6 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 ca6863adc4..99aedfe8d5 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -930,11 +930,13 @@ public abstract class PlayerList {
     }
 
     public void savePlayers() {
+        MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
         MinecraftTimings.savePlayers.startTiming(); // Paper
         for (int i = 0; i < this.players.size(); ++i) {
             this.savePlayerFile((EntityPlayer) this.players.get(i));
         }
         MinecraftTimings.savePlayers.stopTiming(); // Paper
+        return null; }); // Paper - ensure main
     }
 
     public WhiteList getWhitelist() {
-- 
2.21.0
Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 04:27:40 +02:00			`From a8a8f44e6b5ff879b3df33496bb1529836997fc6 Mon Sep 17 00:00:00 2001`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 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`
Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 04:27:40 +02:00			`index ca6863adc4..99aedfe8d5 100644`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 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`
MC 1.14.1 2019-05-14 04:20:58 +02:00			`@@ -930,11 +930,13 @@ public abstract class PlayerList {`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 2017-01-07 21:48:22 +01:00			`}`

More 1.14 work 2019-04-27 08:26:04 +02:00			`public void savePlayers() {`
			`+ MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 2017-01-07 21:48:22 +01:00			`MinecraftTimings.savePlayers.startTiming(); // Paper`
More 1.14 work 2019-04-27 08:26:04 +02:00			`for (int i = 0; i < this.players.size(); ++i) {`
			`this.savePlayerFile((EntityPlayer) this.players.get(i));`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 2017-01-07 21:48:22 +01:00			`}`
			`MinecraftTimings.savePlayers.stopTiming(); // Paper`
			`+ return null; }); // Paper - ensure main`
			`}`

More 1.14 work 2019-04-27 08:26:04 +02:00			`public WhiteList getWhitelist() {`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 2017-01-07 21:48:22 +01:00			`--`
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da08d022 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 0cef14e4 Remove draft API from selectEntities CraftBukkit Changes: a46fdbc6 Remove outdated build delay. 3697519b SPIGOT-4708: Fix ExactChoice recipes neglecting material 9ead7009 SPIGOT-4677: Add minecraft.admin.command_feedback permission c3749a23 Remove the Damage tag from items when it is 0. f74c7b95 SPIGOT-4706: Can't interact with active item 494eef45 Mention requirement of JIRA ticket for bug fixes 51d62dec SPIGOT-4702: Exception when middle clicking certain slots be557e69 SPIGOT-4700: Add PlayerFishEvent.State.REEL_IN 2019-04-22 23:36:14 +02:00			`2.21.0`
Enforce Sync Player Saves Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. 2017-01-07 21:48:22 +01:00