1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0089-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From aeee26dcf880c0670381073a9ff2baf808ed7739 Mon Sep 17 00:00:00 2001
+From 3e7b82aceada63cd39219c5a3fdda878a4be6399 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:39:28 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 161a714e5..0c519c412 100644
+index 161a714e..0c519c41 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -423,6 +423,20 @@ public final class Bukkit {
@@ -34,7 +34,7 @@ index 161a714e5..0c519c412 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 463724e40..8a76df524 100644
+index 463724e4..8a76df52 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -356,6 +356,18 @@ public interface Server extends PluginMessageRecipient {
@@ -57,5 +57,5 @@ index 463724e40..8a76df524 100644
       * Gets the plugin manager for interfacing with plugins.
       *
 -- 
-2.21.0
+2.25.0.windows.1