1.15.2 update (#2887)

Functional GUI fix added by billygalbreath

Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch

@@ -1,11 +1,11 @@
-From c5e393bd5a58aeaf2cb0010f5eda86725b843094 Mon Sep 17 00:00:00 2001
+From ec42ead9c4a6ccdeacfa79e586ab6193fa601137 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:17:39 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index ffbf3d7a8..e08dfe17f 100644
+index 7e8fc5b3..3e6da797 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -29,5 +29,5 @@ index ffbf3d7a8..e08dfe17f 100644
      // Paper end
  }
 -- 
-2.21.0
+2.25.0.windows.1