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)

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21.10-R0.1-SNAPSHOT
 
 mcVersion = 1.21.10
-paperCommit = 9934c17322980f2f67e2a47d09b08fb8a8a881c6
+paperCommit = e8c6ba5068287049c890688534963041208c4213
 
 org.gradle.configuration-cache = true
 org.gradle.caching = true

purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4488,6 +_,86 @@
+@@ -4491,6 +_,86 @@
      @Nullable
      public DragonBattle getEnderDragonBattle();
  

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1306,4 +_,59 @@
+@@ -1322,4 +_,59 @@
       */
      void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
      // Paper end - broadcast hurt animation

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/EntityType.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/EntityType.java
 +++ b/net/minecraft/world/entity/EntityType.java
-@@ -1213,6 +_,16 @@
+@@ -1214,6 +_,16 @@
          return register(vanillaEntityId(key), builder);
      }
  
@@ -17,7 +17,7 @@
      public static ResourceLocation getKey(EntityType<?> entityType) {
          return BuiltInRegistries.ENTITY_TYPE.getKey(entityType);
      }
-@@ -1444,6 +_,16 @@
+@@ -1445,6 +_,16 @@
          return this.category;
      }
  
@@ -34,16 +34,11 @@
      public String getDescriptionId() {
          return this.descriptionId;
      }
-@@ -1503,7 +_,11 @@
-                 entity.load(input);
-             },
-             // Paper end - Don't fire sync event during generation
--            () -> LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]"))
-+            // Purpur start - log skipped entity's position
-+            () -> {LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]"));
-+                EntityType.LOGGER.warn("Location: {} {}", level.getWorld().getName(), input.read("Pos", net.minecraft.world.phys.Vec3.CODEC).orElse(net.minecraft.world.phys.Vec3.ZERO));
-+            }
-+            // Purpur end - log skipped entity's position
-         );
-     }
- 
+@@ -1507,6 +_,7 @@
+             // Paper start - Add logging for debugging entity tags with invalid ids
+             () -> {
+                 LOGGER.warn("Skipping Entity with id {}", input.getStringOr("id", "[invalid]"));
++                LOGGER.warn("Location: {} {}", level.getWorld().getName(), input.read("Pos", net.minecraft.world.phys.Vec3.CODEC).orElse(net.minecraft.world.phys.Vec3.ZERO)); // Purpur - log skipped entity's position
+                 if ((DEBUG_ENTITIES_WITH_INVALID_IDS || level.getCraftServer().getServer().isDebugging()) && input instanceof TagValueInput tagInput) {
+                     LOGGER.warn("Skipped entity tag: {}", tagInput.input);
+                 }

purpur-server/paper-patches/features/0002-Ridables.patch

@@ -36,7 +36,7 @@ index bf3674f8984dd0ee441e04f92b747f908d629953..132e045f3885146a9a6510c6ed51fcb8
 +    // Purpur end - Ridables
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 00af7ce338ea49375ce1a5e95d01fb24b1c43de8..691c7e393ff6a0d4b132f25b6de2b346b97f7169 100644
+index d5496e5fbb5fcd65df2933ebc7cb39df7d832923..09ef508247d98645591283d91a9beba90d1df7d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -521,6 +521,15 @@ public class CraftEventFactory {
@@ -55,7 +55,7 @@ index 00af7ce338ea49375ce1a5e95d01fb24b1c43de8..691c7e393ff6a0d4b132f25b6de2b346
          return event;
      }
  
-@@ -1053,6 +1062,7 @@ public class CraftEventFactory {
+@@ -1043,6 +1052,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
              event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);

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());
      }