1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

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

@@ -1,11 +1,11 @@
-From cbdc8be63d8cc41da8d4d75ad99e066d9132fd04 Mon Sep 17 00:00:00 2001
+From 9e844af5534869173b64d8cc780ceb637c59467f 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 5884b04f7e..ba341e0174 100644
+index 5884b04f7..ba341e017 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -270,4 +270,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 5884b04f7e..ba341e0174 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e51..e60e10c57d 100644
+index a0254d8e5..e60e10c57 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -35,5 +35,5 @@ index a0254d8e51..e60e10c57d 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp");
 -- 
-2.24.1
+2.25.0.windows.1