Updated Upstream (Bukkit/CraftBukkit) (#8740)

Upstream has released updates that appear 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:
d352d965 SPIGOT-7221: Add Enemy (Entity) interface

CraftBukkit Changes:
397c5557c SPIGOT-7221: Add Enemy (Entity) interface
a0d3dfaf2 PR-1129: Fix state corruption while handling explosion damage on EntityComplexPart
d67777f8b SPIGOT-7218: Player's outer layer of skin disappears after respawn

patches/api/0055-Fix-upstream-javadocs.patch

@@ -167,10 +167,10 @@ index 80910fcc46b62ee4974a659713a1a72b5b4c135b..50faa513411cdb611ae228f0c07a7dfe
       * @deprecated use {@link #sendActionBar(Component)}
       */
 diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
-index 1119e26e270bb45f517955b19d95a9ec3d113634..4631647c64c89ffdde2d9b63bdab974acfe6cb3d 100644
+index a5ad3250cebfeb302c58e0bfd6db1295913c927e..bfac874840cf1f36afba16ae4d176c5821a68cfb 100644
 --- a/src/main/java/org/bukkit/entity/Slime.java
 +++ b/src/main/java/org/bukkit/entity/Slime.java
-@@ -11,6 +11,16 @@ public interface Slime extends Mob {
+@@ -11,6 +11,16 @@ public interface Slime extends Mob, Enemy {
      public int getSize();
  
      /**

patches/api/0140-Slime-Pathfinder-Events.patch

@@ -191,10 +191,10 @@ index 0000000000000000000000000000000000000000..4683a7237d2ed527fc85b9b4e5b2eaaf
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java
-index 4631647c64c89ffdde2d9b63bdab974acfe6cb3d..1308dc4ab5779a5cfd9a4e22c43501fc9ceaa7af 100644
+index bfac874840cf1f36afba16ae4d176c5821a68cfb..335b92e7be49ae13b2a1140183650642063a4219 100644
 --- a/src/main/java/org/bukkit/entity/Slime.java
 +++ b/src/main/java/org/bukkit/entity/Slime.java
-@@ -24,4 +24,20 @@ public interface Slime extends Mob {
+@@ -24,4 +24,20 @@ public interface Slime extends Mob, Enemy {
       * @param sz The new size of the slime.
       */
      public void setSize(int sz);

patches/api/0141-Add-PhantomPreSpawnEvent.patch

@@ -42,7 +42,7 @@ index 0000000000000000000000000000000000000000..9022f697ab244df43074e48c9150f39d
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
-index 1a1044edc57078f96c4a95c994d0865da382c152..ed4d417c2deefb78807cb61b01df5afcd334d754 100644
+index 86cfdcf3060876c87066483d122e12f5feb55e02..082601f349ae2cebbffd1012c19c521241696a09 100644
 --- a/src/main/java/org/bukkit/entity/Phantom.java
 +++ b/src/main/java/org/bukkit/entity/Phantom.java
 @@ -1,5 +1,8 @@
@@ -54,7 +54,7 @@ index 1a1044edc57078f96c4a95c994d0865da382c152..ed4d417c2deefb78807cb61b01df5afc
  /**
   * Represents a phantom.
   */
-@@ -14,4 +17,14 @@ public interface Phantom extends Flying {
+@@ -14,4 +17,14 @@ public interface Phantom extends Flying, Enemy {
       * @param sz The new size of the phantom.
       */
      public void setSize(int sz);

patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch

@@ -35,10 +35,10 @@ index 4f4f1e48cdaee0d845f60666569e48731be3fbb9..504fd761e5863c09fe785300a5c3e68e
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
-index ed4d417c2deefb78807cb61b01df5afcd334d754..a40b045f08b85e22e75459b547e7e7c0b95103ed 100644
+index 082601f349ae2cebbffd1012c19c521241696a09..3dafdf14ced991ae1179ef1ca455da62f8c3243e 100644
 --- a/src/main/java/org/bukkit/entity/Phantom.java
 +++ b/src/main/java/org/bukkit/entity/Phantom.java
-@@ -26,5 +26,19 @@ public interface Phantom extends Flying {
+@@ -26,5 +26,19 @@ public interface Phantom extends Flying, Enemy {
       */
      @Nullable
      public java.util.UUID getSpawningEntity();

patches/api/0313-Missing-Entity-Behavior-API.patch

@@ -459,10 +459,10 @@ index c61a473453f33f9d10c330fc46cfa9d52251fe49..473a7e36ad64f866d1d2e09e2ecb2e98
 +    // Paper end - Add more fox behavior API
  }
 diff --git a/src/main/java/org/bukkit/entity/Ghast.java b/src/main/java/org/bukkit/entity/Ghast.java
-index d8eb2b5007091c25a14321cb389f3219d76ce452..0fc8a4fcc3ec2ce60bb095c31eb353337d57be34 100644
+index 6b3c9bef9a8a34ddc6ff42cf358541a2665bf5e3..9c618a27d590f186f29c5d9094fc565efd40ca49 100644
 --- a/src/main/java/org/bukkit/entity/Ghast.java
 +++ b/src/main/java/org/bukkit/entity/Ghast.java
-@@ -18,4 +18,21 @@ public interface Ghast extends Flying {
+@@ -18,4 +18,21 @@ public interface Ghast extends Flying, Enemy {
       * @param flag Whether the Ghast is charging
       */
      void setCharging(boolean flag);
@@ -683,10 +683,10 @@ index 1f027927a1194f4f8e86c1375a2772e6e261c151..57cf24cfd15a541f60aafc8507c18934
  
          NORMAL(false),
 diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java
-index a40b045f08b85e22e75459b547e7e7c0b95103ed..277bebe057439a0c48b0c6e9c003b27565eb4bd2 100644
+index 3dafdf14ced991ae1179ef1ca455da62f8c3243e..2fe8e8868f12bd9e846baf8858cd2c333c00a0d8 100644
 --- a/src/main/java/org/bukkit/entity/Phantom.java
 +++ b/src/main/java/org/bukkit/entity/Phantom.java
-@@ -40,5 +40,21 @@ public interface Phantom extends Flying {
+@@ -40,5 +40,21 @@ public interface Phantom extends Flying, Enemy {
       * @param shouldBurnInDay True to burn in sunlight
       */
      public void setShouldBurnInDay(boolean shouldBurnInDay);

patches/api/0336-Fix-issues-with-mob-conversion.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix issues with mob conversion
 
 
 diff --git a/src/main/java/org/bukkit/entity/Hoglin.java b/src/main/java/org/bukkit/entity/Hoglin.java
-index b49670816d0d42aee08614d9a59a1f785ad8e6bc..c5296265997f405e5e09d37d610a0c2ae58667e9 100644
+index 83a9e06fe91bdfe74e771b170966c70e4c47893c..452a8e73fa084f29f3b96793d642bd8ec0bc8aac 100644
 --- a/src/main/java/org/bukkit/entity/Hoglin.java
 +++ b/src/main/java/org/bukkit/entity/Hoglin.java
-@@ -44,13 +44,17 @@ public interface Hoglin extends Animals {
+@@ -44,13 +44,17 @@ public interface Hoglin extends Animals, Enemy {
      public int getConversionTime();
  
      /**

patches/api/0375-Allow-to-change-the-podium-of-the-EnderDragon.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow to change the podium of the EnderDragon
 
 
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 856015b08bfa3f18b3df11e25efd079d4a4f7eca..23cbaf886e230d38b3023923f74d1a6c34cd9b9d 100644
+index 0449664d7cd0c52ac34d2101110f1ab42070257c..bcf3b6f2d88c3e6170f637943432cc84f69c5065 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
-@@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob {
+@@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy {
       * @return this dragon's death animation ticks
       */
      int getDeathAnimationTicks();