diff --git a/Spigot-Server-Patches/0548-Brand-support.patch b/Spigot-Server-Patches/0549-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0548-Brand-support.patch
rename to Spigot-Server-Patches/0549-Brand-support.patch
diff --git a/Spigot-Server-Patches/0558-Brand-support.patch b/Spigot-Server-Patches/0559-Brand-support.patch
similarity index 100%
rename from Spigot-Server-Patches/0558-Brand-support.patch
rename to Spigot-Server-Patches/0559-Brand-support.patch
diff --git a/Spigot-Server-Patches/Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/Configurable-Alternative-LootPool-Luck-Formula.patch
index b72788c6f7..b30d7488df 100644
--- a/Spigot-Server-Patches/Configurable-Alternative-LootPool-Luck-Formula.patch
+++ b/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 {
-     private static void authenticationServersDownKickMessage() {
-         authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
+                     "such as inventories, experience points, advancements and the like will not be saved when they log out.");
+         }
      }
 +
 +    public static boolean useAlternativeLuckFormula = false;
diff --git a/Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch
index a52498f0d9..0b5c3c023f 100644
--- a/Spigot-Server-Patches/Configurable-connection-throttle-kick-message.patch
+++ b/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 useAlternativeLuckFormula = false;
-     private static void useAlternativeLuckFormula() {
-         useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
+     public static boolean savePlayerData = true;
+     private static void savePlayerData() {
+         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 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
diff --git a/Spigot-Server-Patches/Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/Make-player-data-saving-configurable.patch
new file mode 100644
index 0000000000..2db25b2cc5
--- /dev/null
+++ b/Spigot-Server-Patches/Make-player-data-saving-configurable.patch
@@ -0,0 +1,36 @@
+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);
diff --git a/Spigot-Server-Patches/Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/Make-the-default-permission-message-configurable.patch
index 6d1bb051a8..2b34660d3a 100644
--- a/Spigot-Server-Patches/Make-the-default-permission-message-configurable.patch
+++ b/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 useAlternativeLuckFormula = false;
-     private static void useAlternativeLuckFormula() {
-         useAlternativeLuckFormula = getBoolean("settings.use-alternative-luck-formula", false);
+     public static boolean savePlayerData = true;
+     private static void savePlayerData() {
+         savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 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
diff --git a/work/Spigot b/work/Spigot
index a19903d24b..37d799b230 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit a19903d24b3189e8769657b9b130f7ed5919b8b8
+Subproject commit 37d799b230195de166af55b0a746310ddcf92bc0