1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch

@@ -1,4 +1,4 @@
-From ed1259f134b0a6143623059aede383ba25b62c4e Mon Sep 17 00:00:00 2001
+From 5cf14e4f082f4a8bd55053a045f5e94640c76436 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:42 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
 new file mode 100644
-index 000000000..9022f697a
+index 00000000..9022f697
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java
 @@ -0,0 +1,31 @@
@@ -42,7 +42,7 @@ index 000000000..9022f697a
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
-index 1a1044edc..ed4d417c2 100644
+index 1a1044ed..ed4d417c 100644
 --- a/src/main/java/org/bukkit/entity/Phantom.java
 +++ b/src/main/java/org/bukkit/entity/Phantom.java
 @@ -1,5 +1,8 @@
@@ -70,5 +70,5 @@ index 1a1044edc..ed4d417c2 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.25.0.windows.1