Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@47650100 Improve error messages when PluginRemapper fails to initialize (#12598)
PaperMC/Paper@6f315356 Add MCUtil#toLocation from Folia
PaperMC/Paper@2ba1675c Replace deprecated Thread#getId usage with Thread#threadId
PaperMC/Paper@4eda045b Backport fix for MC-296337 (Fixes #12617) (#12619)
PaperMC/Paper@7ebc94c2 Add Registry#getTagValues (#12603)
PaperMC/Paper@e87320d5 Fix UOE when using generateTree with pale oak (#12616)
PaperMC/Paper@94f29035 Do not blow up accessing unregistered memories from API (Fixes #12618) (#12639)
PaperMC/Paper@03efecf0 Do not fire PlayerDropItemEvent for /give command
PaperMC/Paper@3527ccdf feat: expose updateDemand and restock on Villager (#12608)
PaperMC/Paper@320f25cb fix sponge-absorb deleting chest content (#12647)
PaperMC/Paper@95565e0f Add missing attribute serialization updater
PaperMC/Paper@519e4224 Fix infinite loop in RegionFile IO
PaperMC/Paper@ba7fb23d Finish moving over to Holderable (#12646)
PaperMC/Paper@39203a65 [ci/skip] Publish PR API and dev bundles (#12672)
PaperMC/Paper@6f139cef 1.21.6 dev
PaperMC/Paper@a0ef7661 tweak mob goal keys, generate missing api
PaperMC/Paper@77834d34 Revert "fix sponge-absorb deleting chest content (#12647)"
PaperMC/Paper@153080f9 Allow cache writes on main and dev branches
PaperMC/Paper@9dcbf0a6 Throw exception for CraftMagicNumbers#getMappingsVersion (#12676)
PaperMC/Paper@16fd59e0 [ci/skip] Fix test results event file

purpur-server/paper-patches/files/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java.patch

@@ -1,13 +1,14 @@
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -27,6 +_,10 @@
-     static {
-         // TODO these kinda should be checked on each release, in case obfuscation changes
-         deobfuscationMap.put("abstract_skeleton_1", "abstract_skeleton_melee");
-+        // Purpur start - Add option to disable zombie aggressiveness towards villagers
-+        deobfuscationMap.put("zombie_1", "zombie_attack_villager");
-+        deobfuscationMap.put("drowned_1", "drowned_attack_villager");
-+        // Purpur end - Add option to disable zombie aggressiveness towards villagers
+@@ -143,6 +_,11 @@
+     private static final Map<String, String> NESTED_CLASS_NAMES = Util.make(new HashMap<>(), map -> {
+         map.put("AbstractSkeleton$1", "AbstractSkeletonMelee");
  
-         ignored.add("goal_selector_1");
-         ignored.add("goal_selector_2");
++        // Purpur start - Add option to disable zombie aggressiveness towards villagers
++        map.put("Zombie$1", "ZombieAttackVillager");
++        map.put("Drowned$1", "DrownedAttackVillager");
++        // Purpur end - Add option to disable zombie aggressiveness towards villagers
++
+         // remove duplicate
+         map.put("TraderLlama$TraderLlamaDefendWanderingTraderGoal", "TraderLlamaDefendWanderingTraderGoal");
+         map.put("AbstractIllager$RaiderOpenDoorGoal", "RaiderOpenDoorGoal");

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -513,7 +_,7 @@
+@@ -514,7 +_,7 @@
          net.minecraft.server.level.ServerPlayer nmsKiller = killer == null ? null : ((CraftPlayer) killer).getHandle();
          this.getHandle().setLastHurtByMob(nmsKiller);
          if (nmsKiller != null) {

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

@@ -1,8 +1,8 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
-@@ -380,4 +_,11 @@
-     public void clearReputations() {
-         getHandle().getGossips().gossips.clear();
+@@ -258,4 +_,11 @@
+     public void restock() {
+         getHandle().restock();
      }
 +
 +    // Purpur start - Lobotomize stuck villagers

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
-@@ -91,6 +_,18 @@
+@@ -90,6 +_,18 @@
          this.getHandle().setSoundVariant(CraftSoundVariant.bukkitToMinecraftHolder(soundVariant));
      }
  
@@ -16,6 +16,6 @@
 +    }
 +    // Purpur end - Configurable chance for wolves to spawn rabid
 +
-     public static class CraftVariant implements Variant, Handleable<WolfVariant> {
+     public static class CraftVariant extends HolderableBase<WolfVariant> implements Variant {
  
          public static Variant minecraftToBukkit(WolfVariant minecraft) {

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

@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -491,7 +_,7 @@
+@@ -481,7 +_,7 @@
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {