Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@84f6e6e Fix max temper API for llama (#10823)
PaperMC/Paper@672c077 handle BODY slot for non-mobs (#10822)
PaperMC/Paper@716b868 Use RegistryOps for loadAdvancement (#10799)
PaperMC/Paper@d9e659a Allow firework effects with no colors (#10814)
PaperMC/Paper@7e2b682 Fix skipping custom block entity tag (#10812)
PaperMC/Paper@ed85aac Flatten namespaced vanilla command alias redirects (#10821)
PaperMC/Paper@a31dc90 Several fixes and new api for experience merging/stacking (#9242)
PaperMC/Paper@efd91e5 Add registry-related argument types (#10770)
PaperMC/Paper@27d2ed8 Extend fishing API (#10634)
PaperMC/Paper@0fcf3e3 Deprecate InvAction#HOTBAR_MOVE_AND_READD (#10784)

gradle.properties

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.6-R0.1-SNAPSHOT
 
 mcVersion = 1.20.6
-paperCommit = 9d6f2cced75c1a433c508ab531a61872bce73854
+paperCommit = 0fcf3e347f671ce6bdc9699cbe4c34567562dd2b
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0001-Rebrand.patch

@@ -252,10 +252,10 @@ index e85b9bb3f9c225d289a4959921970b9963881199..c1e2d3a75b9d4710ab6d8b5c62af4bc1
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index e46714f38df931350d81c30907560c381c8d2725..777f1d11d9fb5af29ec895383902daf348eb528e 100644
+index 4788a591f40f506d81b10fd9f6ab68f308a68e23..de3f413dc60ee501e540b68a7b3c1118c750ca0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -502,7 +502,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -503,7 +503,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
  
      @Override
      public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

patches/server/0006-Ridables.patch

@@ -66,7 +66,7 @@ index 8a183fc9d0a79dd9a952bc1759c53da286908188..5dd8c9f53ba50f160198a09dd2069edb
  
      private void updatePlayerAttributes() {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index c450447585af4c8cdc87abe871c229ff895c3e53..a33a724de4c408fcf23b8ec9206311fc25936f1c 100644
+index 4ae88bfcead40cd05f9514a48a922a37767cb3cf..ac11226ca4b8d730871851d99491d598e41a0de6 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -2772,6 +2772,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2438,13 +2438,13 @@ index 6e299770fca78699f7e1988db4cdef37b99d74c1..816c698a81a77f217a606468aa157bda
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 1dd4290287725898ace29e46b439b55df8fdd1af..3943ca63aaeecfb98c34ceef9b0c40e71de4e832 100644
+index 36d654073ab4058db54830d9447d7d959a0b25f1..1564d1327e4b735461e41a7a876f63a9943d2675 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -78,7 +78,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -79,7 +79,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
- 
      public Llama(EntityType<? extends Llama> type, Level world) {
          super(type, world);
+         this.maxDomestication = 30; // Paper - Missing entity API; configure max temper instead of a hardcoded value
 +        // Purpur start
 +        this.moveControl = new org.purpurmc.purpur.controller.MoveControllerWASD(this) {
 +            @Override
@@ -2493,7 +2493,7 @@ index 1dd4290287725898ace29e46b439b55df8fdd1af..3943ca63aaeecfb98c34ceef9b0c40e7
  
      public boolean isTraderLlama() {
          return false;
-@@ -120,6 +164,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -121,6 +165,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      @Override
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
@@ -2501,7 +2501,7 @@ index 1dd4290287725898ace29e46b439b55df8fdd1af..3943ca63aaeecfb98c34ceef9b0c40e7
          this.goalSelector.addGoal(1, new RunAroundLikeCrazyGoal(this, 1.2D));
          this.goalSelector.addGoal(2, new LlamaFollowCaravanGoal(this, 2.0999999046325684D));
          this.goalSelector.addGoal(3, new RangedAttackGoal(this, 1.25D, 40, 20.0F));
-@@ -132,6 +177,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -133,6 +178,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          this.goalSelector.addGoal(7, new WaterAvoidingRandomStrollGoal(this, 0.7D));
          this.goalSelector.addGoal(8, new LookAtPlayerGoal(this, Player.class, 6.0F));
          this.goalSelector.addGoal(9, new RandomLookAroundGoal(this));
@@ -5095,7 +5095,7 @@ index a2d336ceb52b63db5c03432ee7bc94dc6a742b82..a6268b3df9691278606501284b5504da
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 34b91eff3190848bae38b20e1d956ece497b1473..b4fba33f2e2d15d35ac3e884026572a696082160 100644
+index 1a737167757891794b40575a5db48b0667e23a6b..78b3dde824622ea89ab4446ebb5a965b825ab7de 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -592,6 +592,15 @@ public class CraftEventFactory {

patches/server/0007-Configurable-entity-base-attributes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable entity base attributes
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9c99a3df80c5f0a0d81e1f6a6516d088438a0b1e..e49dda27dd609ebf377f679c4f60c13a5f610c8e 100644
+index b976ea5d919f73c406adea90603f4a78b761fd25..28c8860d145eb34911e1a54a15597d8c873df872 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -163,7 +163,7 @@ import org.bukkit.plugin.PluginManager;
@@ -34,7 +34,7 @@ index aa76a24421cdb3908a3544d92eb3d1e3c2ebedc4..8211c152e6f4232e82e452b08047e457
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 72bd60f691a639a0e7b6b5a98e5a3816305cfdaf..a3ee2af337acef86a15b12c9e6d8cd8452980a87 100644
+index f790211062a14b5d70dac178c31bfc7033779222..9ddc0cf7107cff08ac3ae75c51b3119161304820 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -301,6 +301,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -55,7 +55,7 @@ index 72bd60f691a639a0e7b6b5a98e5a3816305cfdaf..a3ee2af337acef86a15b12c9e6d8cd84
          return this.brain;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index f8a649b0fee040bbf53084ca7094583ab4ffd900..cea588d68c7e23ad8831bc611f1030d63354d91c 100644
+index c4a09778ca6bf5c15b588234bcadec3496017e3d..49adf3f230fa34289a2ce09a9d829f5dbf952fc8 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -265,6 +265,18 @@ public class Bat extends AmbientCreature {
@@ -144,7 +144,7 @@ index e2a98b45e56a368de19bb65e304370a5998c7cb9..3d61c2d5da103de68242c16d85c70381
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 41b6c79c31414378d433500a35e434e546738e42..bee1a275f242866206dc461461b7962e04289ddc 100644
+index 8c6bda1ed0408fa1c7cc772097159410443b7fae..478663c16a5763dda9a6c3edbafc843b8dfe06f2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -61,6 +61,11 @@ public class Cow extends Animal {
@@ -445,7 +445,7 @@ index 4742d90ca38c1d8034b0cfcf7f336e225fade197..b8dcf3d632c79585ec7e9f50fa040fa9
          this.entityData.set(Turtle.HOME_POS, pos.immutable()); // Paper - called with mutablepos...
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
-index 731909acd1e18dcfbd25becb0ddff30fb2a6a0f5..8aaac4e86ec6d9c40999f6198cda7d367ece54e3 100644
+index 92cc8a9b033052d5f510792d916c60cb2b90f07c..3235ed40d502722e888656776ba1a218f198f53e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -146,6 +146,11 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -615,10 +615,10 @@ index 816c698a81a77f217a606468aa157bdaed779479..9ad0d3972d1970b11687da174a83e3a0
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 3943ca63aaeecfb98c34ceef9b0c40e71de4e832..697895661826e4a1ecbdfd2c3a195b9d0ee7e00a 100644
+index 1564d1327e4b735461e41a7a876f63a9943d2675..df4943e0a75d084a1c0ae6c12ade533b3c4206fc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -124,6 +124,21 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -125,6 +125,21 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
      // Purpur end
  
@@ -761,7 +761,7 @@ index c6b6b47e8c268604ab0d1f3bb59c0b0b3a7a1d25..d63913cca12a008ceb4bffc97ba08b8d
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 170038f2bfdfd01003b6661672a9f8ed266343e2..0a7f87ac09f9ef6ad69974090f0d6f437d232b11 100644
+index 14ac30d43eaa550eef1b0c339de2034c51e28d9d..ba4c479b68c9b23e2d4f2cffa0cc8dfb12fd8c9e 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -185,6 +185,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -834,7 +834,7 @@ index 504996c8309fcd11de1dd166dee12d7e7db8db56..562f73dd5e617c10382c50be86ce88f4
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 6e812033323b1d1ace9023d57f0405e0d546c337..624ae0e10ef9f51d484e45ec9a15e4a120bf2af2 100644
+index cd4da06183fa84e3aa7567866b28ad915eadafe6..c64a544bd267204d963cfa213d832e7cea45a7f3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -252,6 +252,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -1126,7 +1126,7 @@ index 1248a48c0146258d14efcaa805a82ce1a79c623d..32d547a4430a8f524a7fc0bd1aa063bb
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 78433d0b7624019018012c55e8dd6fec029f8cd1..1793c5f4e33fbab9d64d81bb1767b0e9b248106f 100644
+index 803a5c71f7712ac004990419131757d17ad685bf..277ec293cfd8f50e9e8ce6a0380a007d7ef786a1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -114,6 +114,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye

patches/server/0009-Llama-API.patch

@@ -25,7 +25,7 @@ index df695b444fa2a993d381e2f197182c3e91a68502..eb0faf58fa1a408f294fc62120b140de
              double d = this.llama.distanceToSqr(this.llama.getCaravanHead());
              if (d > 676.0) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e827365a4cefcf 100644
+index df4943e0a75d084a1c0ae6c12ade533b3c4206fc..9ed11bf6420e4ea8ea78cec641a7e37327301ae1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 @@ -75,6 +75,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
@@ -36,7 +36,7 @@ index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e82736
  
      public Llama(EntityType<? extends Llama> type, Level world) {
          super(type, world);
-@@ -167,6 +168,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -168,6 +169,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          super.addAdditionalSaveData(nbt);
          nbt.putInt("Variant", this.getVariant().id);
          nbt.putInt("Strength", this.getStrength());
@@ -44,7 +44,7 @@ index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e82736
      }
  
      @Override
-@@ -174,6 +176,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -175,6 +177,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          this.setStrength(nbt.getInt("Strength"));
          super.readAdditionalSaveData(nbt);
          this.setVariant(Llama.Variant.byId(nbt.getInt("Variant")));
@@ -52,7 +52,7 @@ index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e82736
      }
  
      @Override
-@@ -460,6 +463,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -461,6 +464,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
  
      public void leaveCaravan() {
          if (this.caravanHead != null) {
@@ -60,7 +60,7 @@ index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e82736
              this.caravanHead.caravanTail = null;
          }
  
-@@ -467,6 +471,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -468,6 +472,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
  
      public void joinCaravan(Llama llama) {
@@ -69,7 +69,7 @@ index 697895661826e4a1ecbdfd2c3a195b9d0ee7e00a..05614fb50a5509331ac15bb819e82736
          this.caravanHead.caravanTail = this;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
-index 0ad16ee7b33582d214dab41eeee378d52c8e38ed..16bd1294c219f15ada653ef810bc2d748222d0da 100644
+index 351f42842b780d053cd2e5bad9ae299449141b10..4860574e7fad7a9527dda599703c573c5b4b234b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
 @@ -90,4 +90,16 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys

patches/server/0041-Skip-events-if-there-s-no-listeners.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Skip events if there's no listeners
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 24086a82e1687cb1925398218b18c2384fa8f6e3..6b95a810c2fa17f18bd911dba2c5544caa39173d 100644
+index 0126906e2afc8dd525f27a0c5e82116075c9d352..758fe6a1d197cf9ea1f1c959eb6bf8091fe2cccf 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -514,6 +514,7 @@ public class Commands {
+@@ -520,6 +520,7 @@ public class Commands {
      private void runSync(ServerPlayer player, Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootcommandnode) {
          // Paper end - Perf: Async command map building
          new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootcommandnode, false).callEvent(); // Paper - Brigadier API
@@ -16,7 +16,7 @@ index 24086a82e1687cb1925398218b18c2384fa8f6e3..6b95a810c2fa17f18bd911dba2c5544c
          PlayerCommandSendEvent event = new PlayerCommandSendEvent(player.getBukkitEntity(), new LinkedHashSet<>(bukkit));
          event.getPlayer().getServer().getPluginManager().callEvent(event);
  
-@@ -524,6 +525,7 @@ public class Commands {
+@@ -530,6 +531,7 @@ public class Commands {
              }
          }
          // CraftBukkit end

patches/server/0055-Mending-mends-most-damages-equipment-first.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Mending mends most damages equipment first
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index a207a31d80a302dbdfe80f8727222542d3a78da2..7ca70e9ddda24e2fe661c7b13fa439a6c19726dd 100644
+index 46d8bcad1545953757659870901cbbdf3340bc15..45fda4c03c6fe586d26638f0a2a1d26db807e52c 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -338,7 +338,7 @@ public class ExperienceOrb extends Entity {
+@@ -344,7 +344,7 @@ public class ExperienceOrb extends Entity {
      }
  
      private int repairPlayerItems(Player player, int amount) {

patches/server/0099-Make-entity-breeding-times-configurable.patch

@@ -95,7 +95,7 @@ index 14210dac8a4fa8caaf69ec830f83d15525bb1bea..a440e9cc8973d6116652a0871251c421
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index bda0d933ccbee613aa7fb31534351a0d2dbab0a7..64866ca220f4c0b6350e92473cd013658a7de974 100644
+index 5710f77389f4dc4c56475d36ac592633486f2ba7..8cb0d645e7d2f477874d4d55dbf7a3bc75fe15dc 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -68,6 +68,11 @@ public class Cow extends Animal {
@@ -362,7 +362,7 @@ index b6a4b4e66ca67e4dcb4b14a13ab6586a94e1b020..b0f8115b328eda1e3571051870b5310c
      protected Brain.Provider<Frog> brainProvider() {
          return Brain.provider(MEMORY_TYPES, SENSOR_TYPES);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 9cd8220a1e5e43c141ad27df4969e66ef3746ecd..84c04603d50e190430e4e6cf2a7b613537a0c341 100644
+index 691f5020df77b01523d1e292be40552089e2f538..1de70d3faddb58df1180b500195b9167b6c9d644 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -108,6 +108,11 @@ public class Goat extends Animal {
@@ -410,10 +410,10 @@ index 9ad0d3972d1970b11687da174a83e3a0a4180c0e..16d4278d49dad84f72c968ca36914e93
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 05614fb50a5509331ac15bb819e827365a4cefcf..81d614cf14512464b376575fd2d7e7fbf93d9e03 100644
+index 9ed11bf6420e4ea8ea78cec641a7e37327301ae1..326d94eabe0a469bfebed4517960be0042517249 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -140,6 +140,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -141,6 +141,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          return generateSpeed(this.level().purpurConfig.llamaMovementSpeedMin, this.level().purpurConfig.llamaMovementSpeedMax);
      }
  

patches/server/0124-Toggle-for-water-sensitive-mob-damage.patch

@@ -110,7 +110,7 @@ index 3d61c2d5da103de68242c16d85c703813979d179..2343325fa9a771de7b9445cda24a2bcd
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 64866ca220f4c0b6350e92473cd013658a7de974..8c908891c6c683332d8877ab3fa084a0849b17a9 100644
+index 8cb0d645e7d2f477874d4d55dbf7a3bc75fe15dc..3950ee673a8fc4aa1edb8e462cfa72fe40dd0062 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -73,6 +73,11 @@ public class Cow extends Animal {
@@ -427,7 +427,7 @@ index 97ba327398d84db09c81cee860b40642b428ea48..ab3727c336cc7e268a2f7b2c04dac3e5
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 84c04603d50e190430e4e6cf2a7b613537a0c341..412b44ea2d33ef68721b91da9f550738c6c780ba 100644
+index 1de70d3faddb58df1180b500195b9167b6c9d644..9fba034ed863d1dc1ee5fb7cf09650382481dbc7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -113,6 +113,11 @@ public class Goat extends Animal {
@@ -475,10 +475,10 @@ index 16d4278d49dad84f72c968ca36914e93d46dc5f6..e623284b353831d1a540af40e139ac16
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 81d614cf14512464b376575fd2d7e7fbf93d9e03..87ec5bd632353ce364de29c5d56460551b6a4139 100644
+index 326d94eabe0a469bfebed4517960be0042517249..876b06fd6a371caa6cc71026a3b2f7a111c89dc8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -145,6 +145,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -146,6 +146,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          return this.level().purpurConfig.llamaBreedingTicks;
      }
  
@@ -555,7 +555,7 @@ index fbad3b11223ee5dac4af15584e5dfd808a149545..343632a030eb423367387750fabbdae5
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index 0478469343c30d2b8d79bda78aef9ff1348de19b..bf657ed6a27ce5da5621a3e14b0bf41ea0c4c8c9 100644
+index ca26c926a014c985f83cfa376a9e859d0c8b2d6b..cf8d41f85bbd89c3fb4613372fd550bda004504b 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -190,6 +190,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -625,7 +625,7 @@ index 562f73dd5e617c10382c50be86ce88f4de1a4fe1..0604b7c68373ed071ac22cabd7a96116
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 98c93c46694f1e67be803a7ca0c0f55532df2e95..a9523b156eb88646ef82ee857d5f68360b12a753 100644
+index bb40ce4aa53e3ba16354fc829af9c649479635d9..1d5fe70f910afa3a21cc0f53327c83fd27d94e0e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -265,6 +265,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -871,7 +871,7 @@ index cebe89b0868043b819fb3e9987f899926961be52..e592b5ee3a0bfce987557defed825068
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 1793c5f4e33fbab9d64d81bb1767b0e9b248106f..5b4ad4f64488ca5a21312caa3d13318f429401ea 100644
+index 277ec293cfd8f50e9e8ce6a0380a007d7ef786a1..836cd735f343312c020f6498e078cf3bf420d3cb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -119,6 +119,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1199,7 +1199,7 @@ index 9d5eaaf1869a3ecb61947ab0c09af558fa1cd283..c192f4cc5fd9cb0cf40083c4297f649a
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 780a13db057456e49690d90c368284752bafde3f..7e520532aec1dc38da84dce2dc8679d977a030ea 100644
+index 2c4cd5bdc6815d03a5063a38ad913090a2cb5327..56bc524e760de6fa18eab40d1c590f518d42e914 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -569,11 +569,13 @@ public class PurpurWorldConfig {

patches/server/0136-Config-to-disable-Llama-caravans.patch

@@ -19,10 +19,10 @@ index eb0faf58fa1a408f294fc62120b140def97f998d..0f4f546cd0eda4bd82b47446ae23ac32
              List<Entity> list = this.llama.level().getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0, 4.0, 9.0), entity -> {
                  EntityType<?> entityType = entity.getType();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 87ec5bd632353ce364de29c5d56460551b6a4139..12ff4091674f7efb3e324df0df2d798dcbc46027 100644
+index 876b06fd6a371caa6cc71026a3b2f7a111c89dc8..6f744c07d01d5e01dda5aa5cdcf9a29f883ad28a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -481,7 +481,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -482,7 +482,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
      }
  
      public void joinCaravan(Llama llama) {
@@ -32,7 +32,7 @@ index 87ec5bd632353ce364de29c5d56460551b6a4139..12ff4091674f7efb3e324df0df2d798d
          this.caravanHead.caravanTail = this;
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6756564f9b03bc822485b4199bf46c50069eea65..3045fff19b9f9c35ed1b2e14894f6b5aa8442817 100644
+index da536052d5ed82e143081efa954a1ed501ce989b..76d0e6d1982167723e13a6621750730e59a86831 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1332,6 +1332,7 @@ public class PurpurWorldConfig {

patches/server/0219-Mobs-always-drop-experience.patch

@@ -101,7 +101,7 @@ index 2343325fa9a771de7b9445cda24a2bcd7a7c1761..f0b6118a9995bb41836685bbf94d2e7f
      public ItemStack getBucketItemStack() {
          return new ItemStack(Items.COD_BUCKET);
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cow.java b/src/main/java/net/minecraft/world/entity/animal/Cow.java
-index 541cc6c70178a430ac8e3ab8f6a2250b8ea1d964..1691a98caabf27ea092a9b422649ac84bc0a7235 100644
+index 541242018890b688033159a72204fa0bd9db5387..4541e72bc93b19df6aecc781b4e381a7224aa4a7 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -86,6 +86,11 @@ public class Cow extends Animal {
@@ -421,7 +421,7 @@ index ab3727c336cc7e268a2f7b2c04dac3e5d259b454..ea1515f189bf3bc4cfef4524fb40f0d8
      public Map<String, Vector3f> getModelRotationValues() {
          return this.modelRotationValues;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
-index 412b44ea2d33ef68721b91da9f550738c6c780ba..79c27b5717fec000ea94138ebc76dbabf5b2eeaf 100644
+index 9fba034ed863d1dc1ee5fb7cf09650382481dbc7..fab01a3e779e39962ef04305540e2fe3043072a2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
 @@ -118,6 +118,11 @@ public class Goat extends Animal {
@@ -469,10 +469,10 @@ index e623284b353831d1a540af40e139ac16091dcbf6..fdf9ec418b0fc567e286ac79dbdbedda
      protected void randomizeAttributes(RandomSource random) {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-index 12ff4091674f7efb3e324df0df2d798dcbc46027..7d2a5c806fd0f1228c45b8a8b56d7ba13b899a2d 100644
+index 6f744c07d01d5e01dda5aa5cdcf9a29f883ad28a..f452e18829e2b05cf742a4239cba293263b3a88a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
-@@ -150,6 +150,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
+@@ -151,6 +151,11 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
          return this.level().purpurConfig.llamaTakeDamageFromWater;
      }
  
@@ -597,7 +597,7 @@ index 0604b7c68373ed071ac22cabd7a961161ad228f8..43b5a0e7993ae9daef1c1ea67722347f
      public boolean doHurtTarget(Entity target) {
          if (super.doHurtTarget(target)) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
-index 039ae2b694800e0bcd9844be85ad29a001ce52c0..1829bedfa8084c4932a0e67c36f48f19993e22b6 100644
+index b029cff4f64c8cb146b2a23fa5d497c8d27134db..76a0bc9bd6033f1c66e940392f5bed360e7db43c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -279,6 +279,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -837,7 +837,7 @@ index ea9714b561d2cccad3ce012a118d200100ccd1e8..9551bd7c9bed37cf17910e7f71b82ed2
      protected void registerGoals() {
          super.registerGoals();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
-index 687fadf1ef64c5ae7e00c5da15b82245e07d3a39..1afa6dc4f2a6437cd4cc3e49694e79641fcc13ad 100644
+index 53fd94915d8447f562b2b2b2168b6a3765bf873e..5e2a47d910f4bd2cd28008fcf5063cb3dd41da90 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -141,6 +141,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1157,7 +1157,7 @@ index 0d11200ab580cc306602c29c61f7619565d8261d..62f5e5cfe5745deced2811d14d0c7ebb
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6fce1773a4b5008f3234e06b556bf12e140eb1c1..fd8c8c6e563662926002fb1c72aaea0ba2999cdb 100644
+index 7c46618ae3934646a2badb94872ad12ad7b020d8..5aa5d792d1084db4141a0b372ea8699c69d5a31f 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -1108,12 +1108,14 @@ public class PurpurWorldConfig {

patches/server/0229-Configurable-player-pickup-exp-delay.patch

@@ -9,10 +9,10 @@ players still only pick up one orb every tick. However, setting this
 to any negative number will pick up all orbs instantly.
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index 7ca70e9ddda24e2fe661c7b13fa439a6c19726dd..ce608784e0e35b67dde377436aaf42c956ce0644 100644
+index 45fda4c03c6fe586d26638f0a2a1d26db807e52c..7130d483ccdce26526e715bd7e68d2e896e6215f 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -320,7 +320,7 @@ public class ExperienceOrb extends Entity {
+@@ -326,7 +326,7 @@ public class ExperienceOrb extends Entity {
      public void playerTouch(Player player) {
          if (!this.level().isClientSide) {
              if (player.takeXpDelay == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((net.minecraft.server.level.ServerPlayer) player).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper - PlayerPickupExperienceEvent
@@ -22,7 +22,7 @@ index 7ca70e9ddda24e2fe661c7b13fa439a6c19726dd..ce608784e0e35b67dde377436aaf42c9
                  int i = this.repairPlayerItems(player, this.value);
  
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 0460bdb52ce6b29cf57ef8f2d7f430e761c82d85..845c4af5d5d38d54de4a1b20fe32bf5dd4776a29 100644
+index 9d8a9dfb2f9f5a34f19073643ea05bde851aa2e3..28ced14143e1c6bd4e8490a98619165357e644dc 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -632,7 +632,7 @@ public abstract class Player extends LivingEntity {
@@ -35,7 +35,7 @@ index 0460bdb52ce6b29cf57ef8f2d7f430e761c82d85..845c4af5d5d38d54de4a1b20fe32bf5d
                  } else if (!entity.isRemoved()) {
                      this.touch(entity);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index ed600eacc335f9468db65e0ebde622451ab7a6a8..ae3e4547a7bd00432d51ead5bdef5703499c297f 100644
+index e6aa67479c8c0459408056c54bed3ea950c80693..903b36d986a52db8fa8e0ea638a348b7536677a5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -428,6 +428,7 @@ public class PurpurWorldConfig {

patches/server/0255-Remove-Mojang-Profiler.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
 
 
 diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 157a8cd3599a196f1c12f56ad4c5aa68898a1960..5e846fe5b1b13abf10d3d36c2a78472dc2bd0e42 100644
+index 8f6dffe2a163f65e94547c734e718b3a349241e3..110c63296844376f10b57b51dc5da75d704c78ed 100644
 --- a/src/main/java/net/minecraft/commands/Commands.java
 +++ b/src/main/java/net/minecraft/commands/Commands.java
 @@ -166,7 +166,7 @@ public class Commands {
@@ -17,7 +17,7 @@ index 157a8cd3599a196f1c12f56ad4c5aa68898a1960..5e846fe5b1b13abf10d3d36c2a78472d
          DefaultGameModeCommands.register(this.dispatcher);
          DifficultyCommand.register(this.dispatcher);
          EffectCommands.register(this.dispatcher, commandRegistryAccess);
-@@ -345,9 +345,9 @@ public class Commands {
+@@ -351,9 +351,9 @@ public class Commands {
          // Paper end
          CommandSourceStack commandlistenerwrapper = (CommandSourceStack) parseresults.getContext().getSource();
  
@@ -29,7 +29,7 @@ index 157a8cd3599a196f1c12f56ad4c5aa68898a1960..5e846fe5b1b13abf10d3d36c2a78472d
          ContextChain contextchain = this.finishParsing(parseresults, s, commandlistenerwrapper, label); // CraftBukkit // Paper - Add UnknownCommandEvent
  
          try {
-@@ -377,7 +377,7 @@ public class Commands {
+@@ -383,7 +383,7 @@ public class Commands {
                  Commands.LOGGER.error("'/{}' threw an exception", s, exception);
              }
          } finally {

patches/server/0282-Add-mending-multiplier.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add mending multiplier
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-index ce608784e0e35b67dde377436aaf42c956ce0644..f5debc8ddc496cd3e2d8b253511ee5cc9a723b38 100644
+index 7130d483ccdce26526e715bd7e68d2e896e6215f..40d168d225932717b8ac8bdd27dfe2a202bc2808 100644
 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
-@@ -366,13 +366,15 @@ public class ExperienceOrb extends Entity {
+@@ -372,13 +372,15 @@ public class ExperienceOrb extends Entity {
          }
      }
  
@@ -27,7 +27,7 @@ index ce608784e0e35b67dde377436aaf42c956ce0644..f5debc8ddc496cd3e2d8b253511ee5cc
      public int getValue() {
          return this.value;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 8c7508fc6163a73740aedbe9c4dee2d21c4fa0fa..03819b5d991d91c2e7f5e2eae50e1a7e4197336b 100644
+index 02b8333222668c3419296ec5513c1c4e8e8d1a79..3c614b8f62c0d3839ebc4e948c952d52c4f66819 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -119,6 +119,7 @@ public class PurpurWorldConfig {