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:
808cb7ca PR-1023: Improve consistency of tag API

patches/api/0175-Fix-Spigot-annotation-mistakes.patch

@@ -62,7 +62,7 @@ index 88b3e0323dbc4f0fce31b147c7aaa08d65745852..23ca89dde7f6ac9082d4b97fce295942
          if (this.world == null) {
              return null;
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f43720d07e80e3d2937f5b271664b5268d7af027..49bcc2edea32ef2b31b9ed5c3a62140bcc81ffc9 100644
+index f43720d07e80e3d2937f5b271664b5268d7af027..4cd7dae2e6f530a402de460f61d57a27f5763b73 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1429,7 +1429,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -73,15 +73,6 @@ index f43720d07e80e3d2937f5b271664b5268d7af027..49bcc2edea32ef2b31b9ed5c3a62140b
 +    @NotNull // Paper
      ScoreboardManager getScoreboardManager();
  
-     /**
-@@ -1699,7 +1699,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-      * @param clazz the class of the tag entries
-      * @return the tag or null
-      */
--    @Nullable
-+    @UndefinedNullability // Paper
-     <T extends Keyed> Tag<T> getTag(@NotNull String registry, @NotNull NamespacedKey tag, @NotNull Class<T> clazz);
- 
      /**
 diff --git a/src/main/java/org/bukkit/entity/LingeringPotion.java b/src/main/java/org/bukkit/entity/LingeringPotion.java
 index f124b35ec76e6cb6a1a0dc464005087043c3efd0..94a2fef0dc9e13c754cd31d5eabc1bde2dbbe6a5 100644

patches/server/0004-Paper-config-files.patch

@@ -629,7 +629,7 @@ index 9e4cca119722c2edc478fdd1a34af4370649aa5c..b49528d8a2c577def4f74ee694ffd53b
          Main.LOGGER.info("Forcing world upgrade! {}", session.getLevelId()); // CraftBukkit
          WorldUpgrader worldupgrader = new WorldUpgrader(session, dataFixer, generatorOptions, eraseCache);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2a7a6a21d22bec6457845ec972f12321f534800f..8754e5899067bc5e8e83a6264c6fcc38846f6baa 100644
+index 9d38f78ba0db10578cfbcce29059e108272d0034..89522ebf7b11801cf8b9893a1bae50a1ee88ff79 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -603,6 +603,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -714,7 +714,7 @@ index 3dce5044332ee4a8f685ab1cde02cd4c72a85b63..6ded806628f2f3fd5b357eed41990abd
          this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d27dac2620a1b0700db76a1498ed8267c5b5828c..eac877cda0cd37d8717c770b86b590213ee0567e 100644
+index 05364e743e5000f1eff292b17bbd19dae58e3dac..e71bc0315f9e4559e2df6a83a3c11f1024d17de9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -865,6 +865,7 @@ public final class CraftServer implements Server {
@@ -740,7 +740,7 @@ index d27dac2620a1b0700db76a1498ed8267c5b5828c..eac877cda0cd37d8717c770b86b59021
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -2308,4 +2311,35 @@ public final class CraftServer implements Server {
+@@ -2325,4 +2328,35 @@ public final class CraftServer implements Server {
          return this.spigot;
      }
      // Spigot end

patches/server/0008-Adventure.patch

@@ -1635,7 +1635,7 @@ index 595b56b2ab9a813ba71399d306117294fa90dc65..3527d40102d512d0e276edc969ea3c18
                  }
                  collection = icons;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 93b70a144bca1e567b0d3f3eafc1dd4b3ac2d2ba..5410f0fe131af48d5c46a0fe6028c2b16eb2de16 100644
+index e71bc0315f9e4559e2df6a83a3c11f1024d17de9..586bfdc39840170b6bb43ef99a1e1f72ec84b062 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -585,8 +585,10 @@ public final class CraftServer implements Server {
@@ -1760,7 +1760,7 @@ index 93b70a144bca1e567b0d3f3eafc1dd4b3ac2d2ba..5410f0fe131af48d5c46a0fe6028c2b1
      @Override
      public String getMotd() {
          return this.console.getMotd();
-@@ -2341,5 +2393,15 @@ public final class CraftServer implements Server {
+@@ -2358,5 +2410,15 @@ public final class CraftServer implements Server {
              return null;
          }
      }

patches/server/0012-Timings-v2.patch

@@ -1700,10 +1700,10 @@ index 95abf42577725383a2b49242c28b81beef487ee5..4e5cfc508e356691a9a249013553f97e
          };
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5410f0fe131af48d5c46a0fe6028c2b16eb2de16..0f1784e2cdde46f2213e540f1959a9c42d5db0c0 100644
+index 586bfdc39840170b6bb43ef99a1e1f72ec84b062..fe5454f9e2507824c78cab3e31428608bf229ce1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2332,12 +2332,31 @@ public final class CraftServer implements Server {
+@@ -2349,12 +2349,31 @@ public final class CraftServer implements Server {
      private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
      {
  

patches/server/0026-Further-improve-server-tick-loop.patch

@@ -144,10 +144,10 @@ index 8bacbb2289a9e5203766d71be6ba0a31f48b626e..18f03367174651b93682d5e5f4350d8c
                      this.startMetricsRecordingTick();
                      this.profiler.push("tick");
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index ad70bb6419bdfa75ffc8ce4f42150097ef0ead0f..8f1d3ac7c59963feb54cba60f749880fd9e8fcd9 100644
+index bb304601b3795349dd45d94c53f082a3bcc17273..3636921da74f5271a15d79d431c8a33a2c83cd96 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2362,6 +2362,17 @@ public final class CraftServer implements Server {
+@@ -2379,6 +2379,17 @@ public final class CraftServer implements Server {
          return CraftMagicNumbers.INSTANCE;
      }
  

patches/server/0064-Allow-Reloading-of-Custom-Permissions.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index c30eb1c910147ddd6237078367ce29f9e015af9e..39c847d68b9195d082d324485fee83332e07f59a 100644
+index b89ca165b7103b8a0d6a8e49e62657c70329890a..17fe7e47d9e11ca7c82bde34dc478c590328fb00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2492,5 +2492,23 @@ public final class CraftServer implements Server {
+@@ -2509,5 +2509,23 @@ public final class CraftServer implements Server {
          }
          return this.adventure$audiences;
      }

patches/server/0113-Allow-Reloading-of-Command-Aliases.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2b6df52d586acf28aaf531c39073cf9448c589f9..eacf4e00d7ce0c1458428237e6c67aaddb45b77a 100644
+index 630ff9daa7bbe55e0e52f6127c496fdd10876c6e..5ce9ce7169e346d0156559295ee1bae5c8d45870 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2518,5 +2518,24 @@ public final class CraftServer implements Server {
+@@ -2535,5 +2535,24 @@ public final class CraftServer implements Server {
          DefaultPermissions.registerCorePermissions();
          CraftDefaultPermissions.registerCorePermissions();
      }

patches/server/0137-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7612ee9bb6877dea0ff83d03f393180048ff960c..352cec8559923189dcea5c97066ef2f90cc4023b 100644
+index 785660014a4a489decdf5e9febd3f6e4f82735fa..90b1803c111b26f299953eec15745bc4f180d4bd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,10 +20,10 @@ index 7612ee9bb6877dea0ff83d03f393180048ff960c..352cec8559923189dcea5c97066ef2f9
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index eacf4e00d7ce0c1458428237e6c67aaddb45b77a..ef55ae870e341af0087bc99341a77c5d1b851328 100644
+index 5ce9ce7169e346d0156559295ee1bae5c8d45870..57999f25a820cc9b395f6c3037e0fcce9bc4a80c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2537,5 +2537,10 @@ public final class CraftServer implements Server {
+@@ -2554,5 +2554,10 @@ public final class CraftServer implements Server {
          commandMap.registerServerAliases();
          return true;
      }

patches/server/0144-Basic-PlayerProfile-API.patch

@@ -617,7 +617,7 @@ index c3e3a9950ee05dc97f15ab128e40854901f38a2f..95974d78196397136179f8d6acf1597c
          String s1 = name.toLowerCase(Locale.ROOT);
          GameProfileCache.GameProfileInfo usercache_usercacheentry = (GameProfileCache.GameProfileInfo) this.profilesByName.get(s1);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 40d9766bbf53f858a3debd83319152cbd11ef7ed..a380f59ea01cec492f2d2bef6bb6509a07998d07 100644
+index 179ba5ae2406d8babfdec386fc8125960043d586..24f361820f195e948f617cd134352e098b298b5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -243,6 +243,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -638,7 +638,7 @@ index 40d9766bbf53f858a3debd83319152cbd11ef7ed..a380f59ea01cec492f2d2bef6bb6509a
          CraftItemFactory.instance();
      }
  
-@@ -2551,5 +2555,24 @@ public final class CraftServer implements Server {
+@@ -2568,5 +2572,24 @@ public final class CraftServer implements Server {
      public boolean suggestPlayerNamesWhenNullTabCompletions() {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }

patches/server/0291-Make-the-default-permission-message-configurable.patch

@@ -18,7 +18,7 @@ index 1fa190e098079522e0fe3593fa261c1b7ad4e24b..1eb45df9dca5d0c31ac46709e706136a
      }
  
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index c63b7b01094abaf41bc58c123d6ddeb68bc32195..0b0cdbea6693c18519212604a391e8100afbcc70 100644
+index d728c42ba986c5c354a205b1eb4c4d93b0b2d128..f938bd401c384d8e03c8ff90af08efc70629c77e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -20,6 +20,7 @@ import java.util.regex.Pattern;
@@ -42,10 +42,10 @@ index c63b7b01094abaf41bc58c123d6ddeb68bc32195..0b0cdbea6693c18519212604a391e810
          Object val = config.get("settings.save-player-data");
          if (val instanceof Boolean) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 532185882420c04c1a996a7d269af554ee106ed1..1373f00a5a93fbb34cc7cb47683a1eef48e88c8c 100644
+index 39389c3389eb6b118b662cb77552d198b0b21c05..ba0b22c45e0bdcda7087a262a82405a9efe8cc61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2577,6 +2577,11 @@ public final class CraftServer implements Server {
+@@ -2594,6 +2594,11 @@ public final class CraftServer implements Server {
          return com.destroystokyo.paper.PaperConfig.suggestPlayersWhenNullTabCompletions;
      }
  

patches/server/0332-Expose-the-internal-current-tick.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 699d0c6361465bc799a6a135dcf75e2ba3a4a0f1..2cd64494b43a591c6471221bba649c7d74cfb64b 100644
+index 36b20b697850dff10910d7f4cd9543ba11e60568..8bf2f50e314061a2493d0ce89b9d6104994fe6b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2600,5 +2600,10 @@ public final class CraftServer implements Server {
+@@ -2617,5 +2617,10 @@ public final class CraftServer implements Server {
          }
          return new com.destroystokyo.paper.profile.CraftPlayerProfile(uuid, name);
      }

patches/server/0381-Add-tick-times-API-and-mspt-command.patch

@@ -75,7 +75,7 @@ index 0000000000000000000000000000000000000000..d0211d4f39f9d6af1d751ac66342b42c
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a3c3656ba4e8bb85bfb3186d6284f02f09975b13..6cfaef1886b517c56ed9a96347be6e51efa84d9f 100644
+index f173e3e7d8ba8ffe1780e04dea41d8dbfe923917..483946af2d530bd5f311c0d76404a19deb69b7c2 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -69,6 +69,7 @@ public class PaperConfig {
@@ -146,10 +146,10 @@ index e621d683df00a7d095cc72f74357224208b0dbca..1ab4e3a1d2e3a576ea5f05c2d92a1aae
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3fb07f047e24e3b2b68bcdc55e941f06c1fb0d9c..770fd30d47df8c2123b125ada615934a28f15efa 100644
+index a523e50d0542e8aeca961ed57346c3d7ecf01979..d4442ba4f0fc9e062fd321dccd0f49c3d10fd28b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2438,6 +2438,16 @@ public final class CraftServer implements Server {
+@@ -2455,6 +2455,16 @@ public final class CraftServer implements Server {
                  net.minecraft.server.MinecraftServer.getServer().tps15.getAverage()
          };
      }

patches/server/0382-Expose-MinecraftServer-isRunning.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 78ab3c61c2bc9f94835241c801f065f2ffd58482..b65a28d96f9d5a4e6272890ce0ac04b68925d502 100644
+index d4442ba4f0fc9e062fd321dccd0f49c3d10fd28b..6535d59e4fd04cce072de4d939b84e423b5ce52d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2615,5 +2615,10 @@ public final class CraftServer implements Server {
+@@ -2632,5 +2632,10 @@ public final class CraftServer implements Server {
      public int getCurrentTick() {
          return net.minecraft.server.MinecraftServer.currentTick;
      }

patches/server/0419-Implement-Mob-Goal-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index ce5d9bb9bc4dc724af7dac263c61bbb64bf81be3..5ec76300234f29d9a153eb60cd60dccb849e5dc9 100644
+index cf6c265714d8241f52e83de59094d7ae2cd56884..f83bed210b97508affd6523065b53f2876f964f0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -45,6 +45,7 @@ dependencies {
@@ -785,10 +785,10 @@ index 4379b9948f1eecfe6fd7dea98e298ad5f761019a..3f081183521603824430709886a9cc31
          LOOK,
          JUMP,
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6ae8627d0c80b7b32fe7d26b54fba99b17daf7ef..6826b89ebabe6fd54d1d7c751defa2413c72844d 100644
+index c48d2e560cd19fd7ac58844ed7e3c98597f09562..7f41a66e51c91fca6c6069f8072d215e6eaee7e3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -2628,5 +2628,11 @@ public final class CraftServer implements Server {
+@@ -2645,5 +2645,11 @@ public final class CraftServer implements Server {
      public boolean isStopping() {
          return net.minecraft.server.MinecraftServer.getServer().hasStopped();
      }

patches/server/0654-Add-basic-Datapack-API.patch

@@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..cf4374493c11057451a62a655514415c
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 153c2551544dffe36e836fa62f2752160e2cd64a..cca74c494c089e8668750eead58b508e61689515 100644
+index 48e2d5e2b53e32af53387f2e63c67ff9e0a7c5bb..486fe0d067dc11b42263b26592039e210acce06b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -280,6 +280,7 @@ public final class CraftServer implements Server {
@@ -111,7 +111,7 @@ index 153c2551544dffe36e836fa62f2752160e2cd64a..cca74c494c089e8668750eead58b508e
      }
  
      public boolean getCommandBlockOverride(String command) {
-@@ -2701,5 +2703,11 @@ public final class CraftServer implements Server {
+@@ -2718,5 +2720,11 @@ public final class CraftServer implements Server {
      public com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return mobGoals;
      }

patches/server/0864-Add-GameEvent-tags.patch

@@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..d5d3c66afb408026513ac436eb1f4fdd
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 3b7b4a578346a162afbeb5781633c163d0c46177..197668e1b8487ed5463d457c8738ba70813cace1 100644
+index 1e7d817479c58c7fc070322328fbff7d0cdc419b..4b86fb9ace58533c5d85aa05cc8a4af7644c66de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -97,6 +97,7 @@ import net.minecraft.world.level.biome.BiomeSource;
@@ -52,30 +52,33 @@ index 3b7b4a578346a162afbeb5781633c163d0c46177..197668e1b8487ed5463d457c8738ba70
  import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
  import net.minecraft.world.level.levelgen.PatrolSpawner;
  import net.minecraft.world.level.levelgen.PhantomSpawner;
-@@ -2536,6 +2537,12 @@ public final class CraftServer implements Server {
+@@ -2551,6 +2552,15 @@ public final class CraftServer implements Server {
-                 Preconditions.checkArgument(clazz == org.bukkit.entity.EntityType.class, "Entity type namespace must have entity type");
+                     return (org.bukkit.Tag<T>) new CraftEntityTag(Registry.ENTITY_TYPE, entityTagKey);
- 
+                 }
-                 return (org.bukkit.Tag<T>) new CraftEntityTag(Registry.ENTITY_TYPE, TagKey.create(Registry.ENTITY_TYPE_REGISTRY, key));
+             }
 +            // Paper start
-+            case org.bukkit.Tag.REGISTRY_GAME_EVENTS:
++            case org.bukkit.Tag.REGISTRY_GAME_EVENTS -> {
 +                Preconditions.checkArgument(clazz == org.bukkit.GameEvent.class, "Game Event namespace must have GameEvent type");
-+
++                TagKey<GameEvent> gameEventTagKey = TagKey.create(Registry.GAME_EVENT_REGISTRY, key);
-+                return (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(Registry.GAME_EVENT, TagKey.create(Registry.GAME_EVENT_REGISTRY, key));
++                if (Registry.GAME_EVENT.isKnownTagName(gameEventTagKey)) {
++                    return (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(Registry.GAME_EVENT, gameEventTagKey);
++                }
++            }
 +            // Paper end
-             default:
+             default -> throw new IllegalArgumentException();
-                 throw new IllegalArgumentException();
          }
-@@ -2565,6 +2572,13 @@ public final class CraftServer implements Server {
  
+@@ -2583,6 +2593,13 @@ public final class CraftServer implements Server {
                  Registry<EntityType<?>> entityTags = Registry.ENTITY_TYPE;
                  return entityTags.getTags().map(pair -> (org.bukkit.Tag<T>) new CraftEntityTag(entityTags, pair.getFirst())).collect(ImmutableList.toImmutableList());
+             }
 +            // Paper start
-+            case org.bukkit.Tag.REGISTRY_GAME_EVENTS:
++            case org.bukkit.Tag.REGISTRY_GAME_EVENTS -> {
 +                Preconditions.checkArgument(clazz == org.bukkit.GameEvent.class);
-+
 +                Registry<GameEvent> gameEvents = Registry.GAME_EVENT;
 +                return gameEvents.getTags().map(pair -> (org.bukkit.Tag<T>) new io.papermc.paper.CraftGameEventTag(gameEvents, pair.getFirst())).collect(ImmutableList.toImmutableList());
 +            // Paper end
-             default:
++            }
-                 throw new IllegalArgumentException();
+             default -> throw new IllegalArgumentException();
          }
+     }

patches/server/0874-Custom-Potion-Mixes.patch

@@ -164,7 +164,7 @@ index 287205bce7f655f9a6b815f40d349c3db4c1e788..5c0f1488c8a8100cd39a03adeccded99
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5c6f70250339c83cd4f4af4d3ae4801000eab3a3..7343bd96a4a15f4abc081e565175db8df930a470 100644
+index 278a025f141b2011dc2b4e35e70a8013b918a33e..55c981f2c8070fc1bd9ecd4f4df140d9d0c68319 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -284,6 +284,7 @@ public final class CraftServer implements Server {
@@ -184,7 +184,7 @@ index 5c6f70250339c83cd4f4af4d3ae4801000eab3a3..7343bd96a4a15f4abc081e565175db8d
          MobEffects.BLINDNESS.getClass();
          PotionEffectType.stopAcceptingRegistrations();
          // Ugly hack :(
-@@ -2826,5 +2827,10 @@ public final class CraftServer implements Server {
+@@ -2846,5 +2847,10 @@ public final class CraftServer implements Server {
          return datapackManager;
      }
  

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 4ed5af5e63dea4884c9466901b4bfb0996455f7e
+Subproject commit 808cb7ca5c135e65e2d23e8ab59ee891b5bc53dc