From 52496b075b8ce94021f93c94da15b8f761c1f465 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sun, 28 Jun 2020 20:06:26 -0400
Subject: [PATCH] Fix Reloadable save players error on stop

Not sure what plugins or panels are doing to have triggered this.
Reloading resource packs appear to have been happening during shutdown

So this will abort the end of the reload process if we are not on the
correct thread and stop saving players as part of this task too.
---
 Spigot-Server-Patches/Improved-Watchdog-Support.patch | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Spigot-Server-Patches/Improved-Watchdog-Support.patch b/Spigot-Server-Patches/Improved-Watchdog-Support.patch
index 9b3c6eb6b4..2e355351b1 100644
--- a/Spigot-Server-Patches/Improved-Watchdog-Support.patch
+++ b/Spigot-Server-Patches/Improved-Watchdog-Support.patch
@@ -260,6 +260,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                      throw new RuntimeException("Error generating crash report", t);
                  }
                  // Spigot End
+@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+             this.resourcePackRepository.a(collection);
+             this.saveData.a(a(this.resourcePackRepository));
+             datapackresources.i();
+-            this.getPlayerList().savePlayers();
++            if (Thread.currentThread() != this.serverThread) return; // Paper
++            //this.getPlayerList().savePlayers(); // Paper - we don't need to do this
+             this.getPlayerList().reload();
+             this.customFunctionData.a(this.dataPackResources.a());
+             this.ak.a(this.dataPackResources.h());
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java