1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From a94f5fca9e22f84e1ed553bb53228938c3a7e079 Mon Sep 17 00:00:00 2001
+From 3f28b2263c941869901fd442a8cdf09cc619e7b6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 00:55:52 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java
-index 0c066bdfc..be436f8df 100644
+index 0c066bdf..be436f8d 100644
 --- a/src/main/java/org/bukkit/entity/Tameable.java
 +++ b/src/main/java/org/bukkit/entity/Tameable.java
 @@ -1,5 +1,6 @@
@@ -41,5 +41,5 @@ index 0c066bdfc..be436f8df 100644
       */
      @Nullable
 -- 
-2.21.0
+2.25.0.windows.1