1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0037-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From f85769e8ba9c1aa2b67b14ed2c91ad26f639801f Mon Sep 17 00:00:00 2001
+From 8c1752d4801781454495bf4d0eb5554cc270538f Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:34 -0700
 Subject: [PATCH] Add EntityZapEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 new file mode 100644
-index 000000000..3b725a489
+index 00000000..3b725a48
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java
 @@ -0,0 +1,65 @@
@@ -76,7 +76,7 @@ index 000000000..3b725a489
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
-index 0e0ed93b5..d3949edfc 100644
+index 0e0ed93b..d3949edf 100644
 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java
 @@ -2,6 +2,7 @@ package org.bukkit.event.entity;
@@ -122,5 +122,5 @@ index 0e0ed93b5..d3949edfc 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.25.0.windows.1