Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@51d28af8 [ci/skip] Typo in CartographyInventory (#12777)
PaperMC/Paper@6ea679eb Allow listening to plugin messages during configuration phase (#12775)
PaperMC/Paper@c3be00f0 Always call plugin message dispatch on PlayerConnection
PaperMC/Paper@3fec37a9 Move the double call into the dispatch method
PaperMC/Paper@108255cb Reduce PlayerLoginEvent alt behavior nag for now (#12782)
PaperMC/Paper@2141ca52 Port plugins command to brigadier (#12632)
PaperMC/Paper@0cadaefc Fix quitmessage nullability issues (#12783)

purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch

@@ -29,10 +29,10 @@ index edc1758f12b36555edb7eaba2ea3bd78118dda93..7a9e20699a8a5e95910ed15eb6cd1192
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index dc3f7eff78c5fd81dfffb48a3b978ffe91902469..7f5eca8f32ae1afe3e6d2544b76cf0bbe131109f 100644
+index 3fb2b52d0d5f4f6f8b86fec999081b961503e91e..218556fdaf4ea4993864e22530b4bad3335a535d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1397,6 +1397,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1384,6 +1384,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
          // Paper start - Teleport passenger API
          // Don't allow teleporting between worlds while keeping passengers
          if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {
@@ -40,7 +40,7 @@ index dc3f7eff78c5fd81dfffb48a3b978ffe91902469..7f5eca8f32ae1afe3e6d2544b76cf0bb
              return false;
          }
  
-@@ -1418,6 +1419,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1405,6 +1406,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
          }
  
          if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API

purpur-server/paper-patches/files/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java.patch

@@ -1,11 +1,11 @@
 --- a/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
 +++ b/src/main/java/io/papermc/paper/command/PaperPluginsCommand.java
-@@ -70,10 +_,10 @@
-         this.setAliases(List.of("pl"));
+@@ -74,10 +_,10 @@
+             .build();
      }
  
 -    private static <T> List<Component> formatProviders(final TreeMap<String, PluginProvider<T>> plugins) {
-+    private static <T> List<Component> formatProviders(final TreeMap<String, PluginProvider<T>> plugins, CommandSender sender) { // Purpur - Improve output of plugins command
++    private static <T> List<Component> formatProviders(final TreeMap<String, PluginProvider<T>> plugins, final CommandSender sender) { // Purpur - Improve output of plugins command
          final List<Component> components = new ArrayList<>(plugins.size());
          for (final PluginProvider<T> entry : plugins.values()) {
 -            components.add(formatProvider(entry));
@@ -13,7 +13,7 @@
          }
  
          boolean isFirst = true;
-@@ -100,15 +_,49 @@
+@@ -104,15 +_,49 @@
          return formattedSubLists;
      }
  
@@ -66,7 +66,7 @@
  
          builder.append(pluginName);
  
-@@ -126,6 +_,23 @@
+@@ -130,6 +_,23 @@
          return componentHeader.append(Component.text(":")).build();
      }
  
@@ -90,7 +90,7 @@
      private static Component asPlainComponents(final String strings) {
          final net.kyori.adventure.text.TextComponent.Builder builder = Component.text();
          for (final String string : strings.split("\n")) {
-@@ -186,25 +_,25 @@
+@@ -188,25 +_,25 @@
          final int sizePaperPlugins = paperPlugins.size();
          final int sizeSpigotPlugins = spigotPlugins.size();
          final int sizePlugins = sizePaperPlugins + sizeSpigotPlugins;

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -575,10 +_,15 @@
+@@ -562,10 +_,15 @@
  
      @Override
      public void setPlayerListName(String name) {
@@ -17,7 +17,7 @@
          if (this.getHandle().connection == null) return; // Paper - Updates are possible before the player has fully joined
          for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
              if (player.getBukkitEntity().canSee(this)) {
-@@ -2676,6 +_,28 @@
+@@ -2655,6 +_,28 @@
          return this.getHandle().getAbilities().walkingSpeed * 2f;
      }
  
@@ -46,7 +46,7 @@
      private void validateSpeed(float value) {
          Preconditions.checkArgument(value <= 1f && value >= -1f, "Speed value (%s) need to be between -1f and 1f", value);
      }
-@@ -3524,4 +_,76 @@
+@@ -3503,4 +_,76 @@
      public PlayerGameConnection getConnection() {
          return this.getHandle().connection.playerGameConnection;
      }
@@ -54,7 +54,7 @@
 +    // Purpur start - Purpur client support
 +    @Override
 +    public boolean usesPurpurClient() {
-+        return getHandle().purpurClient;
++        return getHandle().connection.purpurClient;
 +    }
 +    // Purpur end - Purpur client support
 +