1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0006-Add-getTPS-method.patch

@@ -1,11 +1,11 @@
-From bc6a70d6bdab8d4b350e6321f315edc5c3f932b6 Mon Sep 17 00:00:00 2001
+From 510b3804346327935a0f02423c54a46b68649235 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:24:57 -0600
 Subject: [PATCH] Add getTPS method
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 940c643df..9f87f333e 100644
+index 940c643d..9f87f333 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1311,6 +1311,17 @@ public final class Bukkit {
@@ -27,7 +27,7 @@ index 940c643df..9f87f333e 100644
       * Get the advancement specified by this key.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index c197e3811..e1dfa92a9 100644
+index c197e381..e1dfa92a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1096,6 +1096,16 @@ public interface Server extends PluginMessageRecipient {
@@ -48,5 +48,5 @@ index c197e3811..e1dfa92a9 100644
       * Get the advancement specified by this key.
       *
 -- 
-2.21.0
+2.25.0.windows.1