Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ae5e78a4 [ci/skip] Clarify the functionality of AbstractVillager#resetOffers (#13260)
PaperMC/Paper@ea9cd17c Use version fetcher from unsafe values in new version command (#13246)
PaperMC/Paper@c68a55ca Optimise CraftWorld#spawnParticle (#13250)
PaperMC/Paper@6794db4f Make spawning more accurately track vanilla (#12627)
PaperMC/Paper@f55a34fd Properly handle provider plugins in load order (#13242)
PaperMC/Paper@e74d7023 Fix HelpMap topic creation for bootstrap commands (#13231)
PaperMC/Paper@fcb2956a Add debug logging for entities with invalid ids (#13229)
PaperMC/Paper@5fd3c951 Add Entity#teleportAsync(Location, TeleportFlag...) (#13208)
PaperMC/Paper@e8c6ba50 Expose JukeboxSong variables (#13214)

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

@@ -21,7 +21,7 @@
  
          CraftRegistry.setMinecraftRegistry(console.registryAccess());
  
-@@ -993,6 +_,7 @@
+@@ -992,6 +_,7 @@
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -29,7 +29,7 @@
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && world.getGameRules().getBoolean(GameRules.RULE_SPAWN_MONSTERS)); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1008,6 +_,7 @@
+@@ -1007,6 +_,7 @@
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -37,7 +37,7 @@
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1025,6 +_,7 @@
+@@ -1024,6 +_,7 @@
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
@@ -45,7 +45,7 @@
          this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
          this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
  
-@@ -1483,6 +_,60 @@
+@@ -1482,6 +_,60 @@
          return true;
      }
  
@@ -106,7 +106,7 @@
      @Override
      public List<Recipe> getRecipesFor(ItemStack result) {
          Preconditions.checkArgument(result != null, "ItemStack cannot be null");
-@@ -2728,6 +_,18 @@
+@@ -2727,6 +_,18 @@
              return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
          }
  
@@ -125,7 +125,7 @@
          @Override
          public void restart() {
              CraftServer.this.restart();
-@@ -2963,4 +_,18 @@
+@@ -2962,4 +_,18 @@
      public void allowPausing(final Plugin plugin, final boolean value) {
          this.console.addPluginAllowingSleep(plugin.getName(), value);
      }

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1954,6 +_,52 @@
+@@ -1955,6 +_,52 @@
          return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
      }