From 1956e5a5f40e8142ec74bdc0b40bd45e4fa3f76d Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 22 May 2019 05:21:19 +0100
Subject: [PATCH] Actually fix compilation

---
 ...-for-working-with-arrows-stuck-in-living-.patch | 14 +++-----------
 ...8-Make-shield-blocking-delay-configurable.patch |  6 +++---
 ...115-LivingEntity-Hand-Raised-Item-Use-API.patch |  6 +++---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
index e146b24727..91fc2ca6fb 100644
--- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@@ -1,22 +1,14 @@
-From 6eb5b89c602482c737c039e182bca4b0f1031950 Mon Sep 17 00:00:00 2001
+From f133052d9aa3253191db6c03132f36d2a6c5a553 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:47:27 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index e6249c2bf..2a4e4cb39 100644
+index e6249c2bf..5697728ce 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -476,6 +476,7 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      */
-     boolean isCollidable();
- 
-+<<<<<<< HEAD
-     /**
-      * Returns the value of the memory specified.
-      * <p>
-@@ -500,4 +501,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -500,4 +500,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param <T> the type of the passed value
       */
      <T> void setMemory(@NotNull MemoryKey<T> memoryKey, @Nullable T memoryValue);
diff --git a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
index f81eff5f62..08bdb4fa3c 100644
--- a/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
+++ b/Spigot-API-Patches/0108-Make-shield-blocking-delay-configurable.patch
@@ -1,14 +1,14 @@
-From 397522a209a9ca5af469a8c11502d0354df6bed1 Mon Sep 17 00:00:00 2001
+From 71decde1e8308ca10fd40b21d795c443aa04e5ce 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 ba7881a27..a663d7ab1 100644
+index ffbf3d7a8..e08dfe17f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -524,5 +524,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -523,5 +523,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);
diff --git a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
index d7137a4ec2..bf9e2c7186 100644
--- a/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
+++ b/Spigot-API-Patches/0115-LivingEntity-Hand-Raised-Item-Use-API.patch
@@ -1,4 +1,4 @@
-From b4f1678a42edf3bf41e4e2659b68a0c2be2e66e8 Mon Sep 17 00:00:00 2001
+From 17fb95b5f4231afd377f2067961a63c8deeb9c0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a663d7ab1..adae86709 100644
+index e08dfe17f..6e3284b20 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -11,6 +11,7 @@ import org.bukkit.attribute.Attributable;
@@ -17,7 +17,7 @@ index a663d7ab1..adae86709 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -538,5 +539,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -537,5 +538,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);