1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch

@@ -1,4 +1,4 @@
-From 02581e05349fbe72c968c075e13c2ce24f0ea8a0 Mon Sep 17 00:00:00 2001
+From 23517bc468b2b7651e9672d2c6e91bcb6bed2106 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity
@@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 new file mode 100644
-index 000000000..f52644fab
+index 00000000..f52644fa
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java
 @@ -0,0 +1,38 @@
@@ -49,7 +49,7 @@ index 000000000..f52644fab
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9dc0d4ce3..a78f390d7 100644
+index 3110c385..240f276c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -104,5 +104,5 @@ index 9dc0d4ce3..a78f390d7 100644
  
      /**
 -- 
-2.21.0
+2.25.0.windows.1