Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@73d218c1 Improve command permission lookups
PaperMC/Paper@7c2ffd5e Prune the api version suffix
PaperMC/Paper@c609d6dc Remove SERVER_ONLY command flag functionality
PaperMC/Paper@3594d24a Properly send over SADDLE and BODY equipment items to PlayerInventory
PaperMC/Paper@720e63ff Remove craft flying
PaperMC/Paper@1e441025 Removed inlined art api
PaperMC/Paper@adb5aefc Add api for shear equippable logic
PaperMC/Paper@4604c5f2 Change ordering on YamlSanitizationTest
PaperMC/Paper@c986ce54 Fix V4307 ordering issues
PaperMC/Paper@48e94e8c fix sponge absorb resetting block entity data of waterlogged blocks
PaperMC/Paper@c5fc0dc8 support block state mutation of already placed block entity in BlockStateListPopulator

Author: granny

.idea/runConfigurations/Run_Purpur_Paperclip_Jar.xml

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.6-R0.1-SNAPSHOT
 
 mcVersion = 1.21.6-pre3
-paperCommit = 94fefb88e6af6e7699d16d949dc4cee88e0c4a1b
+paperCommit = c5fc0dc84b2e9f875b7dc03ed75cf6744abc4902
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

gradle.properties

@@ -1,6 +1,6 @@
 --- a/net/minecraft/commands/CommandSourceStack.java
 +++ b/net/minecraft/commands/CommandSourceStack.java
-@@ -457,6 +_,19 @@
+@@ -447,6 +_,19 @@
      }
      // CraftBukkit end
 
@@ -20,7 +20,7 @@
      public Vec3 getPosition() {
          return this.worldPosition;
      }
-@@ -541,6 +_,30 @@
+@@ -531,6 +_,30 @@
              }
          }
      }

purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch

@@ -24,15 +24,15 @@
          }
 
          if (selection.includeIntegrated) {
-@@ -535,6 +_,7 @@
+@@ -537,6 +_,7 @@
      private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<CommandSourceStack> rootCommandNode) {
          // Paper end - Perf: Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
 +        if (org.bukkit.event.player.PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - Skip events if there's no listeners
          org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
 
-@@ -545,6 +_,8 @@
+@@ -547,6 +_,8 @@
              }
          }
          // CraftBukkit end

purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

@@ -65,7 +65,7 @@
          this.generator = generator;
          this.world = new CraftWorld((ServerLevel) this, generator, biomeProvider, environment);
 
-@@ -2131,4 +_,14 @@
+@@ -2124,4 +_,14 @@
              return this.id;
          }
      }