1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0173-Annotation-Test-changes.patch

@@ -1,11 +1,11 @@
-From 670b58d2d4e773378735e0e2b8cf388a4e941e80 Mon Sep 17 00:00:00 2001
+From 78ebc2fda46badc3e3b4a1e7145758fe80d43609 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 17 Mar 2019 23:04:30 +0000
 Subject: [PATCH] Annotation Test changes
 
 
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index cc6b6e209..328a5a163 100644
+index 0c737724..38be576b 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -40,7 +40,17 @@ public class AnnotationTest {
@@ -28,5 +28,5 @@ index cc6b6e209..328a5a163 100644
  
      @Test
 -- 
-2.21.0
+2.25.0.windows.1