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/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);