1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-Server-Patches/0314-Turtle-API.patch

@@ -1,11 +1,11 @@
-From 1e24a3a152b551daf1d36c38396162c2298e5190 Mon Sep 17 00:00:00 2001
+From a4255ab47148cc0b59007704a6f4ac1ed48b373b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index 76296119a1..dd02cb3485 100644
+index 76296119a..dd02cb348 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -103,7 +103,7 @@ index 76296119a1..dd02cb3485 100644
  
          @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75ca..8edcf7af65 100644
+index 123a2c75c..8edcf7af6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@
@@ -153,5 +153,5 @@ index 123a2c75ca..8edcf7af65 100644
 +    // Paper end
  }
 -- 
-2.24.1
+2.25.0.windows.1