1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0127-Expand-ArmorStand-API.patch

@@ -1,4 +1,4 @@
-From b178b138b10df28838e9e5d73dcb424ae4fbc38f Mon Sep 17 00:00:00 2001
+From 9e96b61f51f46e55188303f9321ac3d6272e5ecd Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:22:44 -0400
 Subject: [PATCH] Expand ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
-index 492df420b..e7f71e65e 100644
+index 492df420..e7f71e65 100644
 --- a/src/main/java/org/bukkit/entity/ArmorStand.java
 +++ b/src/main/java/org/bukkit/entity/ArmorStand.java
 @@ -1,5 +1,6 @@
@@ -118,5 +118,5 @@ index 492df420b..e7f71e65e 100644
      // Paper end
  }
 -- 
-2.21.0
+2.25.0.windows.1