Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c7d4c01 Ignore invalid jars inside of the updates folder (Fixes #7751)
PaperMC/Paper@4ecc338 WorldCreator#keepSpawnLoaded (#7673)
PaperMC/Paper@873bfa6 Remove World#refreshChunk deprecation (#7684)
PaperMC/Paper@76ed156 Grant temporary immunity from EAR to moving entities (Fixes #7637) (#7644)
PaperMC/Paper@567fce6 Don't apply previous potion when item is potion (fixes #7756) (#7757)
PaperMC/Paper@c449f6a Build updates
PaperMC/Paper@ef6a1a5 Revert to old createProfile(UUID, String) logic (#7723)
PaperMC/Paper@0f8aa4e Fix NPE for BlockDataMeta#getBlockData (#7670)
PaperMC/Paper@16f224a Trigger bee_nest_destroyed trigger in the correct place (#7436)
PaperMC/Paper@caf4a6f Remove or replace a few dumb deprecations (#7760)
PaperMC/Paper@47f43da Add missing javadoc deprecation msgs for PlayerProfile (#7688)
PaperMC/Paper@fbbc03a Add EntityDyeEvent and CollarColorable interface (#7625)
PaperMC/Paper@5b85ee3 Fire CauldronLevelChange on initial fill (#7678)
PaperMC/Paper@4dc78ae Fix some team color docs and added hasColor (#7602)
PaperMC/Paper@0bf7c95 Fix opening inv in PlayerRecipeBookClickEvent handler (#7552)
PaperMC/Paper@d70ac03 fix powder snow cauldrons not turning to water (#7229)
PaperMC/Paper@ce059b4 Fix V1451 dataconverter stat types

Pufferfish Changes:
pufferfish-gg/Pufferfish@52e42d7 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@7b760fe Fix method profiler config
pufferfish-gg/Pufferfish@65a83aa Updated Upstream (Paper)

gradle.properties

@@ -1,7 +1,7 @@
 group = org.purpurmc.purpur
 version = 1.18.2-R0.1-SNAPSHOT
 
-paperCommit = c642d25f6373ab1c65273d8a607ebd5c140a6b04
+paperCommit = ce059b4f993faf1327f5acb6745e469215009808
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Pufferfish-API-Changes.patch

@@ -409,10 +409,10 @@ index b937441d2fb46b108644c49fcf073859765aa02e..d95b01bfd0657cf089c0f5412453cca0
      }
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index bea2e464861771383f8fcf143fa817340cb8ab1d..cbda2ba8cb80d4f24cf4b4cd74c1fea6669273df 100644
+index bab8bb3a52cdeef5f7052d4e3f404c42f37d117d..dba9041784e7d3051b5248cbc24e4879e60103c1 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -616,7 +616,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -622,7 +622,9 @@ public final class SimplePluginManager implements PluginManager {
 
      // Paper start
      private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -422,7 +422,7 @@ index bea2e464861771383f8fcf143fa817340cb8ab1d..cbda2ba8cb80d4f24cf4b4cd74c1fea6
          callEvent(new ServerExceptionEvent(new ServerPluginEnableDisableException(msg, ex, plugin)));
      }
      // Paper end
-@@ -675,9 +677,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -681,9 +683,11 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {

patches/api/0004-Purpur-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 7a3a2ff605e06e42ba2a0263e2c50eed5c24f8e9..187d610fbd9707256d0af2f343bee95829e4efc6 100644
+index 0eda17c8642aa49c2f57c409c3bd3234948feae9..3fe569f79ee2f408553bfda0340b1d96a47dd770 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1899,6 +1899,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1902,6 +1902,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 

patches/api/0005-Purpur-client-support.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 8ca135d2e3682581855399e7c6d07a2d13244600..efe1db718cbdbd15167b98a30b5987bf66a35e74 100644
+index e65dc831974ca501f69d2cc43858b838e8866676..65424451fb7fd05d37beb70cb7023b0a5f27dc8b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2696,4 +2696,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2693,4 +2693,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end

patches/api/0010-AFK-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index efe1db718cbdbd15167b98a30b5987bf66a35e74..d14c86066b61f28d1078fb426643fdfc0de4ab0e 100644
+index 65424451fb7fd05d37beb70cb7023b0a5f27dc8b..24eb17f307c8c6523cd804e8b330c7ae7dfc6404 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2704,5 +2704,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2701,5 +2701,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @return True if Player uses Purpur Client
       */
      public boolean usesPurpurClient();

patches/api/0011-Bring-back-server-name.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index dcfd22862c79ae01ca7707d9abf0a71cc0d4ad9d..02eda647b3edce330251c97483d861a080238e37 100644
+index 5dc245bfbc1d466ab96294bbc10ead1fcec4f841..010f9d3a42dd998c7f7837157ef18699ba445ec1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2334,4 +2334,15 @@ public final class Bukkit {
+@@ -2370,4 +2370,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -25,10 +25,10 @@ index dcfd22862c79ae01ca7707d9abf0a71cc0d4ad9d..02eda647b3edce330251c97483d861a0
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 187d610fbd9707256d0af2f343bee95829e4efc6..ef034c77723ffff8eb70326d4952f8f169cb1932 100644
+index 3fe569f79ee2f408553bfda0340b1d96a47dd770..8357f802f60f146cbc08ea7991a3b3a24d8bc233 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2038,4 +2038,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2072,4 +2072,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end

patches/api/0014-Lagging-threshold.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 02eda647b3edce330251c97483d861a080238e37..3f173ab53030057aed17462c1e6345b8f1780167 100644
+index 010f9d3a42dd998c7f7837157ef18699ba445ec1..a5eb36738e6cbb55dc3a28467b062f014395e013 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2344,5 +2344,14 @@ public final class Bukkit {
+@@ -2380,5 +2380,14 @@ public final class Bukkit {
      public static String getServerName() {
          return server.getServerName();
      }
@@ -24,10 +24,10 @@ index 02eda647b3edce330251c97483d861a080238e37..3f173ab53030057aed17462c1e6345b8
      // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ef034c77723ffff8eb70326d4952f8f169cb1932..519067033f702620e9ccda7d3474d3acc3e14876 100644
+index 8357f802f60f146cbc08ea7991a3b3a24d8bc233..dbca73bfab240b5d207e9904b69be1481096f874 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2046,5 +2046,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2080,5 +2080,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      String getServerName();

patches/api/0017-Player-invulnerabilities.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index d14c86066b61f28d1078fb426643fdfc0de4ab0e..9a3dc0fc7f68f109ff9d6511a733bcfc72cd2a96 100644
+index 24eb17f307c8c6523cd804e8b330c7ae7dfc6404..7913e9440a1068374a7129dac7cc2a6bc4fb2527 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2723,5 +2723,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2720,5 +2720,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * Reset the idle timer back to 0
       */
      void resetIdleTimer();

patches/api/0028-Rabid-Wolf-API.patch

@@ -17,10 +17,10 @@ index 2a8c6da0f9ffa1f94cfd37d1068511c8941d27ce..aa0a081819672c14d9f04c07f4685768
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
-index 490395f38c4d9977d30a6f48585a4ea0e7faff0f..c944a5a0e60469d42ac435878bda186f2b57b0df 100644
+index 297b65a6cf7d25f02bbd824ea507c5c083e0abec..f5f751678f3d14d2dcb8727c7e9d9db1ab1a44a7 100644
 --- a/src/main/java/org/bukkit/entity/Wolf.java
 +++ b/src/main/java/org/bukkit/entity/Wolf.java
-@@ -57,4 +57,20 @@ public interface Wolf extends Tameable, Sittable {
+@@ -59,4 +59,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
       */
      boolean isInterested();
      // Paper end

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 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce20defe7c 100644
+index a5eb36738e6cbb55dc3a28467b062f014395e013..791a6f13f7048e2c42f945f752f88fddd6825078 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 {
@@ -26,7 +26,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      public static int broadcast(@NotNull String message, @NotNull String permission) {
          return server.broadcast(message, permission);
      }
-@@ -1529,7 +1529,7 @@ public final class Bukkit {
+@@ -1532,7 +1532,7 @@ public final class Bukkit {
       *
       * @see InventoryType#isCreatable()
       */
@@ -35,7 +35,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      @NotNull
      public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
          return server.createInventory(owner, type, title);
-@@ -1579,7 +1579,7 @@ public final class Bukkit {
+@@ -1582,7 +1582,7 @@ public final class Bukkit {
       * @throws IllegalArgumentException if the size is not a multiple of 9
       * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
       */
@@ -44,7 +44,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      @NotNull
      public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
          return server.createInventory(owner, size, title);
-@@ -1606,7 +1606,7 @@ public final class Bukkit {
+@@ -1609,7 +1609,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
       */
      @NotNull
@@ -53,7 +53,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      public static Merchant createMerchant(@Nullable String title) {
          return server.createMerchant(title);
      }
-@@ -1730,7 +1730,7 @@ public final class Bukkit {
+@@ -1733,7 +1733,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #motd()}
       */
      @NotNull
@@ -62,7 +62,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
      public static String getMotd() {
          return server.getMotd();
      }
-@@ -1752,7 +1752,7 @@ public final class Bukkit {
+@@ -1755,7 +1755,7 @@ public final class Bukkit {
       * @deprecated in favour of {@link #shutdownMessage()}
       */
      @Nullable
@@ -72,7 +72,7 @@ index 3f173ab53030057aed17462c1e6345b8f1780167..47c455b7ce0a08d9cd1732a326f7bdce
          return server.getShutdownMessage();
      }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f0cf51396 100644
+index dbca73bfab240b5d207e9904b69be1481096f874..9f602f664cc468012a86971b6cbab9549771e723 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -327,7 +327,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,7 +93,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      public int broadcast(@NotNull String message, @NotNull String permission);
      // Paper start
      /**
-@@ -1288,7 +1288,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1291,7 +1291,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       *
       * @see InventoryType#isCreatable()
       */
@@ -102,7 +102,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
 
-@@ -1332,7 +1332,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1335,7 +1335,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @throws IllegalArgumentException if the size is not a multiple of 9
       * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
       */
@@ -111,7 +111,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      @NotNull
      Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
 
-@@ -1355,7 +1355,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1358,7 +1358,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
       */
      @NotNull
@@ -120,7 +120,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      Merchant createMerchant(@Nullable String title);
 
      /**
-@@ -1458,7 +1458,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1461,7 +1461,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #motd()}
       */
      @NotNull
@@ -129,7 +129,7 @@ index 519067033f702620e9ccda7d3474d3acc3e14876..ca1295dfbd1ca547ebf2a0315a45914f
      String getMotd();
 
      // Paper start
-@@ -1476,7 +1476,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1479,7 +1479,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @deprecated in favour of {@link #shutdownMessage()}
       */
      @Nullable
@@ -170,7 +170,7 @@ index c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9a3dc0fc7f68f109ff9d6511a733bcfc72cd2a96..85bce5517a775af872a0e5d0a847e5137bbf8a34 100644
+index 7913e9440a1068374a7129dac7cc2a6bc4fb2527..bb2ffe33a285f2e453ffe195cc7217a047ae9c7a 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -73,7 +73,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -281,7 +281,7 @@ index 9a3dc0fc7f68f109ff9d6511a733bcfc72cd2a96..85bce5517a775af872a0e5d0a847e513
      public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
 
      /**
-@@ -2236,7 +2236,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2233,7 +2233,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @deprecated in favour of {@link #locale()}
       */
      @NotNull
@@ -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 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9c43898d4 100644
+index 0f5c49d41c9460da0ba913b4ca8bef375f2c23df..7056cbce8405a4849694f2a8a7bef88c264c3da2 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -108,7 +108,7 @@ public interface Team {
+@@ -117,7 +117,7 @@ public interface Team {
       * @deprecated in favour of {@link #displayName()}
       */
      @NotNull
@@ -802,7 +802,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      String getDisplayName() throws IllegalStateException;
 
      /**
-@@ -120,7 +120,7 @@ public interface Team {
+@@ -129,7 +129,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 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException;
 
      /**
-@@ -131,7 +131,7 @@ public interface Team {
+@@ -140,7 +140,7 @@ public interface Team {
       * @deprecated in favour of {@link #prefix()}
       */
      @NotNull
@@ -820,7 +820,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      String getPrefix() throws IllegalStateException;
 
      /**
-@@ -144,7 +144,7 @@ public interface Team {
+@@ -153,7 +153,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 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      void setPrefix(@NotNull String prefix) throws IllegalStateException, IllegalArgumentException;
 
      /**
-@@ -155,7 +155,7 @@ public interface Team {
+@@ -164,7 +164,7 @@ public interface Team {
       * @deprecated in favour of {@link #suffix()}
       */
      @NotNull
@@ -838,7 +838,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      String getSuffix() throws IllegalStateException;
 
      /**
-@@ -168,7 +168,7 @@ public interface Team {
+@@ -177,7 +177,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 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      void setSuffix(@NotNull String suffix) throws IllegalStateException, IllegalArgumentException;
 
      /**
-@@ -182,7 +182,7 @@ public interface Team {
+@@ -191,7 +191,7 @@ public interface Team {
       * @deprecated in favour of {@link #color()}
       */
      @NotNull
@@ -856,7 +856,7 @@ index 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9
      ChatColor getColor() throws IllegalStateException;
 
      /**
-@@ -195,7 +195,7 @@ public interface Team {
+@@ -204,7 +204,7 @@ public interface Team {
       * no color
       * @deprecated in favour of {@link #color(net.kyori.adventure.text.format.NamedTextColor)}
       */

patches/api/0036-Flying-Fall-Damage-API.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 85bce5517a775af872a0e5d0a847e5137bbf8a34..f2d260146f8ca9297d8ef257ffa1fdb3652a00e2 100644
+index bb2ffe33a285f2e453ffe195cc7217a047ae9c7a..094b3622db6d5744eb6831f070eaff603be30d8d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2744,5 +2744,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2741,5 +2741,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param invulnerableTicks Invulnerable ticks remaining
       */
      void setSpawnInvulnerableTicks(int invulnerableTicks);