Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2033dba Updated Upstream (CraftBukkit)
PaperMC/Paper@a3ad720 Remove ChatColor usages (#7543)
PaperMC/Paper@8fc0999 Fix some nullability things (#7275)
PaperMC/Paper@fd069dd Remove incorrect throws javadoc in Team (#7869)
PaperMC/Paper@bed5cb2 Limit resolved selectors when enabled
PaperMC/Paper@4d83ed0 [ci skip] Changing the order of the rebase with autosquash command in the contributing.md (#6974)
PaperMC/Paper@071a4a2 throw exception if worlds are created while being ticked (#7653)
PaperMC/Paper@5b6397a Make leave messages for kicks the same as for quitting (#7874)
PaperMC/Paper@5befb55 Updated Upstream (Bukkit/CraftBukkit) (#7875)
PaperMC/Paper@b3deb25 Move some methods to RegionAccessor (#7635)
PaperMC/Paper@d8ef841 [DataConverter] Fix generator options parsing
PaperMC/Paper@4b27254 Fix treasure maps discovered settings (#7627)
PaperMC/Paper@276d830 Fix campfire walker in V1920

Pufferfish Changes:
pufferfish-gg/Pufferfish@671d68b Add Entity TTLs
pufferfish-gg/Pufferfish@aaca13d Updated Upstream (Paper)

patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index e7bca7fc74a6a2914c966183c9f83340dd510bf0..9189ada0644a226038eeb7967d45c72ddfc89085 100644
+index cd7e04aa1de8f051ff4bb23f36912830ab573987..9ff99a1ea5183042d7eea89bb310386c6630663a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -415,7 +415,7 @@ public final class Bukkit {
@@ -432,7 +432,7 @@ index 4af1d064fcb57773dfa8f6ad40d6482973f8e1a8..c9fe267660f9ec04f78b30182df28180
          this.joinMessage = joinMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null; // Paper
      }
 diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-index 45235379b7b54f1ca36dff3bf02c496cef2f3254..3f9df5dd40accc4cf8043348b03fb661a8bc0fe7 100644
+index b76966953753dabcb31293846d39a4b4d5ef472a..7a0b59e8b60f75f95ce62871bf5f26ec5f478426 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
 @@ -85,7 +85,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
@@ -684,7 +684,7 @@ index 36bcbb3f3acedf7ebecbf6f6b358cf64af0edfb2..8046b61a62f3cfecb6cd7cb7126b8cbc
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 67c9347c09c8fe8932ad95762aa5f6c527550cdc..3b23fe19ed92291182a1dab08321404810fe97a0 100644
+index f1e9a7626c4efb99be78f1056dc04b06bbe13c87..885625c1d54d81de47ed0bc42ee3250c4a54b492 100644
 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
 @@ -59,7 +59,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
@@ -790,10 +790,10 @@ index fc3456bb79f2fe1504359455b937c162780110c2..c39ca39190c8eacff9e68ef2edd54d81
  
      /**
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c264c3da2 100644
+index 06a5d3177ca7ab90c3fd9d2053b2ec5e887c7c62..50d991df5680a1ee1eb2eb38d10adbdea7107dae 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -117,7 +117,7 @@ public interface Team {
+@@ -115,7 +115,7 @@ public interface Team {
       * @deprecated in favour of {@link #displayName()}
       */
      @NotNull
@@ -802,7 +802,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      String getDisplayName() throws IllegalStateException;
  
      /**
-@@ -129,7 +129,7 @@ public interface Team {
+@@ -127,7 +127,7 @@ public interface Team {
       * @throws IllegalStateException if this team has been unregistered
       * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
       */
@@ -811,7 +811,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException;
  
      /**
-@@ -140,7 +140,7 @@ public interface Team {
+@@ -138,7 +138,7 @@ public interface Team {
       * @deprecated in favour of {@link #prefix()}
       */
      @NotNull
@@ -820,7 +820,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      String getPrefix() throws IllegalStateException;
  
      /**
-@@ -153,7 +153,7 @@ public interface Team {
+@@ -151,7 +151,7 @@ public interface Team {
       * @throws IllegalStateException if this team has been unregistered
       * @deprecated in favour of {@link #prefix(net.kyori.adventure.text.Component)}
       */
@@ -829,7 +829,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      void setPrefix(@NotNull String prefix) throws IllegalStateException, IllegalArgumentException;
  
      /**
-@@ -164,7 +164,7 @@ public interface Team {
+@@ -162,7 +162,7 @@ public interface Team {
       * @deprecated in favour of {@link #suffix()}
       */
      @NotNull
@@ -838,7 +838,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      String getSuffix() throws IllegalStateException;
  
      /**
-@@ -177,7 +177,7 @@ public interface Team {
+@@ -175,7 +175,7 @@ public interface Team {
       * @throws IllegalStateException if this team has been unregistered
       * @deprecated in favour of {@link #suffix(net.kyori.adventure.text.Component)}
       */
@@ -847,7 +847,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      void setSuffix(@NotNull String suffix) throws IllegalStateException, IllegalArgumentException;
  
      /**
-@@ -191,7 +191,7 @@ public interface Team {
+@@ -189,7 +189,7 @@ public interface Team {
       * @deprecated in favour of {@link #color()}
       */
      @NotNull
@@ -856,7 +856,7 @@ index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c
      ChatColor getColor() throws IllegalStateException;
  
      /**
-@@ -204,7 +204,7 @@ public interface Team {
+@@ -202,7 +202,7 @@ public interface Team {
       * no color
       * @deprecated in favour of {@link #color(net.kyori.adventure.text.format.NamedTextColor)}
       */