Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
fd28180e #479: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand
ae72ba3a SPIGOT-5591: Allow concurrent potion effects

CraftBukkit Changes:
3d61a853 Fix formatting in CraftLivingEntity
f7ab3055 #633: Add LivingEntity#attack, LivingEntity#swingMainHand, LivingEntity#swingOffHand
d5ef2eab SPIGOT-5591: Allow concurrent potion effects
25a9a9ff SPIGOT-5592: Custom ChunkGenerator can cause bugged dirt
3f6d0de9 Make it clear in error messages that api-version above 1.13 is also supported

Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From fce1924845cf533a2868e51bbd31ad9481d28349 Mon Sep 17 00:00:00 2001
+From ee3d57933edf4cda5071671e3780ad40d12e9157 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 88a93627..7d8f2447 100644
+index 203d135f1..52541e496 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -504,4 +504,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -531,4 +531,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);

Spigot-API-Patches/0065-LivingEntity-setKiller.patch

@@ -1,11 +1,11 @@
-From 4b1878762d153ef4b7560fa69cc81fca1af5f7ff Mon Sep 17 00:00:00 2001
+From c7c6e0f77754ecb3b0a30e5f64b9003bfb66a76c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:43 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index f5969cad..7e8fc5b3 100644
+index 52541e496..ae712e76d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -250,6 +250,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -23,7 +23,7 @@ index f5969cad..7e8fc5b3 100644
 +
      /**
       * Adds the given {@link PotionEffect} to the living entity.
-      * <p>
+      *
 -- 
-2.25.0.windows.1
+2.25.0
 

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

@@ -1,14 +1,14 @@
-From 4f025823575c29539c54a5d3717c8fef62505445 Mon Sep 17 00:00:00 2001
+From 071b34424f1f8e21825f757bfe107f01e49cfb31 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 371d342a..7f1f3dc6 100644
+index ae712e76d..896b1971c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -527,5 +527,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -554,5 +554,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param arrows Number of arrows to stick in this entity
       */
      void setArrowsStuck(int arrows);

Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,4 +1,4 @@
-From fe8992128dc14ba54cd5cbdb4f5fc8ce0ed8cb6d Mon Sep 17 00:00:00 2001
+From 9758dc63e1ec45e75eae717081271ae78b16376c 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 7f1f3dc6..6df0c2cc 100644
+index 896b1971c..4af8e680d 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 7f1f3dc6..6df0c2cc 100644
  import org.bukkit.potion.PotionEffect;
  import org.bukkit.potion.PotionEffectType;
  import org.bukkit.projectiles.ProjectileSource;
-@@ -541,5 +542,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -568,5 +569,32 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @param delay Delay in ticks
       */
      void setShieldBlockingDelay(int delay);

Spigot-API-Patches/0191-Entity-Jump-API.patch

@@ -1,4 +1,4 @@
-From c3a9c52e09a66c5d9afc3f9a48959a7aad908d40 Mon Sep 17 00:00:00 2001
+From 2fc6fd345f199b0d123147ca13d441b86156c121 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Feb 2020 23:26:18 -0600
 Subject: [PATCH] Entity Jump API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity Jump API
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
 new file mode 100644
-index 00000000..f0067c2e
+index 000000000..f0067c2e9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityJumpEvent.java
 @@ -0,0 +1,46 @@
@@ -57,10 +57,10 @@ index 00000000..f0067c2e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9bc026ab..e69702e6 100644
+index deab50525..7f73e4b92 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -684,5 +684,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -711,5 +711,25 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       * @return Whether or not this entity is using or charging an attack (Bow pulled back, drinking potion, eating food)
       */
      boolean isHandRaised();