1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-Server-Patches/0335-Add-more-Zombie-API.patch

@@ -1,11 +1,11 @@
-From b2237c2b5ed734c7b9244b2c8f3b039ad64a4791 Mon Sep 17 00:00:00 2001
+From a1448caf48506b39ea6ca9fc496d42794058cc34 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index cbaed08f52..6bad1687fe 100644
+index e259c868e..5fb3c948d 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1253,6 +1253,8 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -18,7 +18,7 @@ index cbaed08f52..6bad1687fe 100644
          byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b);
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index c8e4dcdaca..1c2c05ae3a 100644
+index 31aba6bfc..2d4f8aac8 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster {
@@ -92,7 +92,7 @@ index c8e4dcdaca..1c2c05ae3a 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index 0429cf020e..c4320dbb67 100644
+index 0429cf020..c4320dbb6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie {
@@ -138,5 +138,5 @@ index 0429cf020e..c4320dbb67 100644
 +    // Paper end
  }
 -- 
-2.24.1
+2.25.0.windows.1