1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 05c90b3a666999ecf6ca0fdb824c8e4ef3f09528 Mon Sep 17 00:00:00 2001
+From 3a712b40988d06d9a8f42119c9eb6fc0968ae18d Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:55:38 +0200
 Subject: [PATCH] Add extended PaperServerListPingEvent
@@ -8,7 +8,7 @@ and allows full control of the response sent to the client.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
 new file mode 100644
-index 000000000..0cc5dd573
+index 00000000..0cc5dd57
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java
 @@ -0,0 +1,323 @@
@@ -337,7 +337,7 @@ index 000000000..0cc5dd573
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 new file mode 100644
-index 000000000..517d15238
+index 00000000..517d1523
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java
 @@ -0,0 +1,13 @@
@@ -355,7 +355,7 @@ index 000000000..517d15238
 +
 +}
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 612958a33..bb4f7702c 100644
+index 612958a3..bb4f7702 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -18,4 +18,9 @@ public interface CachedServerIcon {
@@ -369,5 +369,5 @@ index 612958a33..bb4f7702c 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.25.0.windows.1