Updated Upstream (Spigot) (#4745)

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

Spigot Changes:
a19903d2 SPIGOT-520: Add option to disable player data saving

Spigot-Server-Patches/Configurable-Alternative-LootPool-Luck-Formula.patch

@@ -40,8 +40,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
-                     "such as inventories, experience points, advancements and the like will not be saved when they log out.");
-         }
+     private static void authenticationServersDownKickMessage() {
+         authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
      }
 +
 +    public static boolean useAlternativeLuckFormula = false;

Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch

@@ -17,9 +17,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        connectionThrottleKickMessage = getString("messages.kick.connection-throttle", connectionThrottleKickMessage);
 +    }
 +
-     public static boolean savePlayerData = true;
-     private static void savePlayerData() {
-         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
+     public static boolean useAlternativeLuckFormula = false;
+     private static void useAlternativeLuckFormula() {
+         useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java

Spigot-Server-Patches/Make-player-data-saving-configurable.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
-Date: Mon, 26 Mar 2018 18:30:53 +0300
-Subject: [PATCH] Make player data saving configurable
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -0,0 +0,0 @@ public class PaperConfig {
-     private static void authenticationServersDownKickMessage() {
-         authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
-     }
-+
-+    public static boolean savePlayerData = true;
-+    private static void savePlayerData() {
-+        savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
-+        if(!savePlayerData) {
-+            Bukkit.getLogger().log(Level.WARNING, "Player Data Saving is currently disabled. Any changes to your players data, " +
-+                    "such as inventories, experience points, advancements and the like will not be saved when they log out.");
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
-+++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-@@ -0,0 +0,0 @@ public class WorldNBTStorage {
-     }
- 
-     public void save(EntityHuman entityhuman) {
-+        if(!com.destroystokyo.paper.PaperConfig.savePlayerData) return; // Paper - Make player data saving configurable
-         try {
-             NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
-             File file = File.createTempFile(entityhuman.getUniqueIDString() + "-", ".dat", this.playerDir);

Spigot-Server-Patches/Make-the-default-permission-message-configurable.patch

@@ -25,9 +25,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        noPermissionMessage = ChatColor.translateAlternateColorCodes('&', getString("messages.no-permission", noPermissionMessage));
 +    }
 +
-     public static boolean savePlayerData = true;
-     private static void savePlayerData() {
-         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
+     public static boolean useAlternativeLuckFormula = false;
+     private static void useAlternativeLuckFormula() {
+         useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

work/Spigot

@@ -1 +1 @@
-Subproject commit 37d799b230195de166af55b0a746310ddcf92bc0
+Subproject commit a19903d24b3189e8769657b9b130f7ed5919b8b8