Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7454)

* Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
8085edde SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls
04c7e13c PR-719: Add Player Profile API
71564210 SPIGOT-6910: Add BlockDamageAbortEvent

CraftBukkit Changes:
febaa1c6 SPIGOT-6918: Add SpawnCategory API and configurations for Axolotls
9dafd109 Don't send updates over large distances
bdac46b0 SPIGOT-6782: EntityPortalEvent should not destroy entity when setTo() uses same world as getFrom()
8f361ece PR-1002: Add Player Profile API
911875d4 Increase outdated build delay
e5f8a767 SPIGOT-6917: Use main scoreboard for /trigger
a672a531 Clean up callBlockDamageEvent
8e1bdeef SPIGOT-6910: Add BlockDamageAbortEvent

Spigot Changes:
6edb62f3 Rebuild patches
7fbc6a1e Rebuild patches

* Updated Upstream (CraftBukkit)

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

CraftBukkit Changes:
de951355 SPIGOT-6927: Fix default value of spawn-limits in Worlds

patches/api/Add-setPlayerProfile-API-for-Skulls.patch

@@ -10,14 +10,6 @@ diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukki
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/Skull.java
 +++ b/src/main/java/org/bukkit/block/Skull.java
-@@ -0,0 +0,0 @@ import org.bukkit.block.data.BlockData;
- import org.jetbrains.annotations.Contract;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
-+import com.destroystokyo.paper.profile.PlayerProfile; // Paper
- 
- /**
-  * Represents a captured state of a skull block.
 @@ -0,0 +0,0 @@ public interface Skull extends TileState {
       */
      public void setOwningPlayer(@NotNull OfflinePlayer player);
@@ -27,34 +19,38 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * Sets this skull to use the supplied Player Profile, which can include textures already prefilled.
 +     * @param profile The profile to set this Skull to use, may not be null
 +     */
-+    void setPlayerProfile(@NotNull PlayerProfile profile);
++    void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile);
 +
 +    /**
-+     * If the skull has an owner, per {@link #hasOwner()}, return the owners {@link PlayerProfile}
++     * If the skull has an owner, per {@link #hasOwner()}, return the owners {@link com.destroystokyo.paper.profile.PlayerProfile}
 +     * @return The profile of the owner, if set
 +     */
-+    @Nullable PlayerProfile getPlayerProfile();
++    @Nullable com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile();
 +    // Paper end
 +
      /**
-      * Gets the rotation of the skull in the world (or facing direction if this
-      * is a wall mounted skull).
+      * Gets the profile of the player who owns the skull. This player profile
+      * may appear as the texture depending on skull type.
+@@ -0,0 +0,0 @@ public interface Skull extends TileState {
+      * @return the profile of the owning player
+      */
+     @Nullable
++    @Deprecated // Paper
+     PlayerProfile getOwnerProfile();
+ 
+     /**
+@@ -0,0 +0,0 @@ public interface Skull extends TileState {
+      * @throws IllegalArgumentException if the profile does not contain the
+      * necessary information
+      */
++    @Deprecated // Paper
+     void setOwnerProfile(@Nullable PlayerProfile profile);
+ 
+     /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java
-@@ -0,0 +0,0 @@
- package org.bukkit.inventory.meta;
- 
-+import com.destroystokyo.paper.profile.PlayerProfile;
- import org.bukkit.OfflinePlayer;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
-+
- /**
-  * Represents a skull that can have an owner.
-  */
 @@ -0,0 +0,0 @@ public interface SkullMeta extends ItemMeta {
      @Deprecated
      boolean setOwner(@Nullable String owner);
@@ -64,15 +60,31 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * Sets this skull to use the supplied Player Profile, which can include textures already prefilled.
 +     * @param profile The profile to set this Skull to use, or null to clear owner
 +     */
-+    void setPlayerProfile(@Nullable PlayerProfile profile);
++    void setPlayerProfile(@Nullable com.destroystokyo.paper.profile.PlayerProfile profile);
 +
 +    /**
-+     * If the skull has an owner, per {@link #hasOwner()}, return the owners {@link PlayerProfile}
++     * If the skull has an owner, per {@link #hasOwner()}, return the owners {@link com.destroystokyo.paper.profile.PlayerProfile}
 +     * @return The profile of the owner, if set
 +     */
-+    @Nullable PlayerProfile getPlayerProfile();
++    @Nullable com.destroystokyo.paper.profile.PlayerProfile getPlayerProfile();
 +    // Paper end
 +
      /**
       * Gets the owner of the skull.
       *
+@@ -0,0 +0,0 @@ public interface SkullMeta extends ItemMeta {
+      * @return the profile of the owning player
+      */
+     @Nullable
++    @Deprecated // Paper
+     PlayerProfile getOwnerProfile();
+ 
+     /**
+@@ -0,0 +0,0 @@ public interface SkullMeta extends ItemMeta {
+      * @throws IllegalArgumentException if the profile does not contain the
+      * necessary information
+      */
++    @Deprecated // Paper
+     void setOwnerProfile(@Nullable PlayerProfile profile);
+ 
+     @Override