Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f7e3976 Revert "Legacy data should look for legacy materials (Fixes #6618)" (Fixes #6664)
PaperMC/Paper@ce1e7e8 Fix jline relocation (#6677)
PaperMC/Paper@3e8fb21 Suggest PlayerPostRespawnEvent if changing player state (#6679)
PaperMC/Paper@2b404b0 Fix nullability on Block#breakNaturally (#6651)
PaperMC/Paper@8ee9bdd Fix stacktrace deobf where thrownProxy got initialized before rewriting (#6684)
PaperMC/Paper@fce7905 Option to prevent NBT copy in smithing recipes (#6671)
PaperMC/Paper@3b2b835 Fix click event when vanilla scoreboard name coloring is enabled (#6652)
PaperMC/Paper@425edfa More CommandBlock API (#5746)
PaperMC/Paper@6847f57 Improve ItemStack#editMeta (#6502)
PaperMC/Paper@6703c13 Preserve overstacked loot (#5943)
PaperMC/Paper@0032236 Make Levels Use Correct Spawn Settings (#6419)
PaperMC/Paper@4a27a4a Update head rotation in missing places (#5481)
PaperMC/Paper@ebfd70b Use null for null resource pack prompts (#6572)
PaperMC/Paper@826acaf Fix plugin provides load order (#6687)
PaperMC/Paper@f905057 Prevent unintended light block manipulation (#6601)
PaperMC/Paper@45c4f90 Readd root/admin user detection (#6593)
PaperMC/Paper@e8830b2 Revert "Readd root/admin user detection (#6593)" (#6699)
PaperMC/Paper@cc38c16 Updated Upstream (Bukkit/CraftBukkit) (#6638)
PaperMC/Paper@7dd7c0c [ci skip] update issue template to remove checkboxes and add datapacks (#6702)
PaperMC/Paper@bde7b98 Make legacyRenderer a ViewerUnaware renderer (#6691)
PaperMC/Paper@e391591 Update paperweight to 1.1.12 (#6653)
PaperMC/Paper@e14aff9 Don't count named piglins and hoglins towards mob cap (#6452)
PaperMC/Paper@a978f41 Start console thread after PaperConfig & MinecraftServer.console are initialized (#6716)
PaperMC/Paper@b1f0cbd [ci skip] Remove redundant/broken readme badges (#6715)
PaperMC/Paper@e3ef498 [ci skip] remove markdown from issue template (#6705)
PaperMC/Paper@7ebf08a Handle missing Spawn Egg item meta for 1.17 mobs (#6700)
PaperMC/Paper@90f717f Add missing team sidebar display slots (#6690)

patches/server/0007-Ridables.patch

@@ -22,7 +22,7 @@ index 0cc0242d981586413bcc349df6e6fd3bc09710f1..ae394b3d8b8a157d345e102f5997058d
          super(x, y, z);
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 306b4185fcc86189966f1170547ca1d67102ba1b..aa1c40af600245e0020b85d292a673683caecba7 100644
+index a942fe5cbaf298e9ece59f7e81d7142fbf654e2e..a9a481e137c5a67def8c83b0cddb3a9bc406a036 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1599,6 +1599,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -46,7 +46,7 @@ index 416f579560115caddadf6a400b80a4d1d6ebe04c..93d7860c229f78a214b1e89c7b401eac
          return new Throwable(entity + " Added to world at " + new java.util.Date());
      }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4ee7255c2bd3ebffdce9a7582b1562a1195607f8..6ba8dfbf213bc060eaafe2ea35603a38965d3ff3 100644
+index c1091ab7069fa3dd934409da23d404a7747b1a11..0cd8e3b3af0dc9c8445672ea86cf5113dd51d3e8 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -664,6 +664,15 @@ public class ServerPlayer extends Player {
@@ -86,7 +86,7 @@ index d75bb089ee91bba87aba51ea95fcfe54b8c0a8ab..0f86e3896805e2f6a0e30c421522f031
                          if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
                              ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 518a8b1e165d49350931dfaefa6cef01729c7f92..6e1ec12480207e4cec269ee1a07f920fc1ae67ad 100644
+index a45461bd23d9b85a7675a89517d07def02c694e9..f7ee0eda331c4a9450bce5bd79cdf567583aa067 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -107,7 +107,7 @@ index 518a8b1e165d49350931dfaefa6cef01729c7f92..6e1ec12480207e4cec269ee1a07f920f
      private float eyeHeight;
      public boolean isInPowderSnow;
      public boolean wasInPowderSnow;
-@@ -2632,6 +2632,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2634,6 +2634,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  this.passengers = ImmutableList.copyOf(list);
              }
  
@@ -120,7 +120,7 @@ index 518a8b1e165d49350931dfaefa6cef01729c7f92..6e1ec12480207e4cec269ee1a07f920f
          }
          return true; // CraftBukkit
      }
-@@ -2672,6 +2678,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -2674,6 +2680,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
                  return false;
              }
              // Spigot end
@@ -135,7 +135,7 @@ index 518a8b1e165d49350931dfaefa6cef01729c7f92..6e1ec12480207e4cec269ee1a07f920f
              if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
                  this.passengers = ImmutableList.of();
              } else {
-@@ -4312,4 +4326,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
+@@ -4314,4 +4328,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
          return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
@@ -178,7 +178,7 @@ index 518a8b1e165d49350931dfaefa6cef01729c7f92..6e1ec12480207e4cec269ee1a07f920f
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b31bd21c5 100644
+index 94f7f8238c01d203d28640c56e35deab2bf17bbc..f0c30ab5e32e78850d402aa4bc7d42667610dbf0 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -19,6 +19,18 @@ public class GlowSquid extends Squid {
@@ -201,7 +201,7 @@ index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b
      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 8347b13e515e306253ca2a1f79001e1aced30c2a..6515850e975e8bb303fd6ac1fb4a205dd582237f 100644
+index 5905f02cb695ca619ebcd13cad2fc6dff564f5d9..12ed24bf13079be5dcf5adb95c7cc0f6afc9f332 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -219,9 +219,9 @@ public abstract class LivingEntity extends Entity {
@@ -217,7 +217,7 @@ index 8347b13e515e306253ca2a1f79001e1aced30c2a..6515850e975e8bb303fd6ac1fb4a205d
      protected int lerpSteps;
      protected double lerpX;
      protected double lerpY;
-@@ -2585,7 +2585,7 @@ public abstract class LivingEntity extends Entity {
+@@ -2584,7 +2584,7 @@ public abstract class LivingEntity extends Entity {
          return this.hasEffect(MobEffects.JUMP) ? (double) (0.1F * (float) (this.getEffect(MobEffects.JUMP).getAmplifier() + 1)) : 0.0D;
      }
  
@@ -226,7 +226,7 @@ index 8347b13e515e306253ca2a1f79001e1aced30c2a..6515850e975e8bb303fd6ac1fb4a205d
          double d0 = (double) this.getJumpPower() + this.getJumpBoostPower();
          Vec3 vec3d = this.getDeltaMovement();
  
-@@ -3239,8 +3239,10 @@ public abstract class LivingEntity extends Entity {
+@@ -3238,8 +3238,10 @@ public abstract class LivingEntity extends Entity {
          this.pushEntities();
          this.level.getProfiler().pop();
          // Paper start
@@ -239,7 +239,7 @@ index 8347b13e515e306253ca2a1f79001e1aced30c2a..6515850e975e8bb303fd6ac1fb4a205d
                  Location from = new Location(this.level.getWorld(), this.xo, this.yo, this.zo, this.yRotO, this.xRotO);
                  Location to = new Location (this.level.getWorld(), this.getX(), this.getY(), this.getZ(), this.getYRot(), this.getXRot());
                  io.papermc.paper.event.entity.EntityMoveEvent event = new io.papermc.paper.event.entity.EntityMoveEvent(this.getBukkitLivingEntity(), from, to.clone());
-@@ -3250,6 +3252,21 @@ public abstract class LivingEntity extends Entity {
+@@ -3249,6 +3251,21 @@ public abstract class LivingEntity extends Entity {
                      absMoveTo(event.getTo().getX(), event.getTo().getY(), event.getTo().getZ(), event.getTo().getYaw(), event.getTo().getPitch());
                  }
              }
@@ -488,7 +488,7 @@ index ffc87d14cdc7edc22a7e2ac642d0e37037c52487..f2957d7f4c377a67ee486a9d0f7ae173
          }
  
 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 1d415a91b9c90603e8f738dbafe7a5ea57ef14cc..e0a55fdff847180d08db0bc6bc7e19281c594a0c 100644
+index cda441f5cf64f061dc145fbeba175874c31cebe4..02eb039e4c17d21649610b0d475bbecfc8574809 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -20,6 +20,7 @@ import net.minecraft.world.entity.EntityType;
@@ -635,7 +635,7 @@ index 0701adf77a04a82df4fe1dceee196fee5d820961..d5ae347e33ca354cae36db09dbc4ada7
                  this.fish.setSpeed(Mth.lerp(0.125F, this.fish.getSpeed(), f));
                  double d0 = this.wantedX - this.fish.getX();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
-index 2639f64f1a50faddc0284fb26b73b563b3e9eba9..8632a4047776723088b9b9fa27c6e8093fb17801 100644
+index 083640b7e4aee75db9b884aebd640c9410e669ca..55ab3d403d3b01ea923923ab985c730726754e8a 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -44,6 +44,7 @@ import net.minecraft.world.entity.EntityType;
@@ -752,7 +752,7 @@ index 2639f64f1a50faddc0284fb26b73b563b3e9eba9..8632a4047776723088b9b9fa27c6e809
          }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
-index 15773d61deb357917e2478f0731f0b470669b8f0..14822b20971b63290a7022f8efe65693c41664d2 100644
+index a945ed6867e2f6de5c3aa4355d405bec66f48032..48e85481372d8e6edf0460423ae488fae21ecdbf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -121,6 +121,26 @@ public class Cat extends TamableAnimal {
@@ -807,7 +807,7 @@ index 15773d61deb357917e2478f0731f0b470669b8f0..14822b20971b63290a7022f8efe65693
          Item item = itemstack.getItem();
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Chicken.java b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
-index cece07e000a4355e88aef7848fd264191521484e..7a5119e007d69adc9a77fbd167a8d19a9c71c6ff 100644
+index 9fe34da92c26185af241e6d5be90e695b03cfa99..0b6cbbb6117bcd61081e3b136cc432058e0c5102 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -52,9 +52,22 @@ public class Chicken extends Animal {
@@ -834,7 +834,7 @@ index cece07e000a4355e88aef7848fd264191521484e..7a5119e007d69adc9a77fbd167a8d19a
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(3, new TemptGoal(this, 1.0D, Chicken.FOOD_ITEMS, false));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Cod.java b/src/main/java/net/minecraft/world/entity/animal/Cod.java
-index ec9c235f00cc1b992340dfe0a0b79803361caac5..5275e4ed3d552d1e164ef580caf6c247ec5fd8c2 100644
+index 824e5e4fe7619ae46061c3c978c9a044db8c84ab..ea7227ade90a713242290cadb13692f33effa5c0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
 @@ -13,6 +13,18 @@ public class Cod extends AbstractSchoolingFish {
@@ -857,7 +857,7 @@ index ec9c235f00cc1b992340dfe0a0b79803361caac5..5275e4ed3d552d1e164ef580caf6c247
      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 c9dcbc2dcb2736d0f448496c67121db29b7d4deb..1cb5342d63011605b567a4fe16d07de831f04216 100644
+index a43349c47292154dfc56c72c58ba9f29f6765d83..5939cb25e5ce5fa5c18eb9feddf30816aac6d4c6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -40,9 +40,22 @@ public class Cow extends Animal {
@@ -901,7 +901,7 @@ index c9dcbc2dcb2736d0f448496c67121db29b7d4deb..1cb5342d63011605b567a4fe16d07de8
              // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
-index f3093815066e6881a2bb638ae4643f69374450b3..2300abc4e80449e6b92992f6fb8cfe8e99dea351 100644
+index a2cdc036ee0981495d309eb6b18d0c297ad65eb4..87e128e67a147b1ff772f12317eee1ebfc91d83e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -84,14 +84,82 @@ public class Dolphin extends WaterAnimal {
@@ -1026,7 +1026,7 @@ index f3093815066e6881a2bb638ae4643f69374450b3..2300abc4e80449e6b92992f6fb8cfe8e
              this.setAirSupply(this.getMaxAirSupply());
          } else {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Fox.java b/src/main/java/net/minecraft/world/entity/animal/Fox.java
-index 21274d2c8c78d8454dbfc19076a52e54876bd78d..ee9dfc609cc9e4a94dca7803e51bb456c1e63389 100644
+index bfb042f4828e1cd47124939ca3b9caadc7fe1b39..56395fc555d05a2ff9bf551affa62521bad4893e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -138,6 +138,39 @@ public class Fox extends Animal {
@@ -1126,7 +1126,7 @@ index 21274d2c8c78d8454dbfc19076a52e54876bd78d..ee9dfc609cc9e4a94dca7803e51bb456
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
-index ec00c2dd8f969eb99ec6a014e3bcd09c7484b237..63b739c86d2ea22aa9a610796ad2f208b0db289e 100644
+index bf731a227944875320857e5838d50f15af13b0c1..a5e19967b4488fb662ee2767cef5a1851da96468 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 @@ -70,8 +70,22 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -1218,7 +1218,7 @@ index b2765fba362e5f6d641abcc9ee7ccc177db08eb5..81a393f29643a0cf3478ca8ff640c211
  
                  Pair<MobEffect, Integer> pair = (Pair) optional.get();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
-index 06bf44ceb6f959a99f268fe1e1dca494985fbf4e..2a8f6d920370b4087895e9f0098a0f41d9b1e152 100644
+index 49122e7baa5c0cd3691bcb48176fdefbdb79026b..20797bc9e53d5061396ddb6a89e46b46dd2081ae 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -68,6 +68,18 @@ public class Ocelot extends Animal {
@@ -1256,7 +1256,7 @@ index 06bf44ceb6f959a99f268fe1e1dca494985fbf4e..2a8f6d920370b4087895e9f0098a0f41
          this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
-index 12ed864bedf2201fad68e2aeba249c3c18a12444..fa9dbb22dd13c650ef08af6030d60c5fc8ee8044 100644
+index 8a2c49b7ded2165e383cd9b8744f752754aabdf4..7ab0b39091910c492a4f860237a33996dbb08b97 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -108,6 +108,27 @@ public class Panda extends Animal {
@@ -1352,7 +1352,7 @@ index 12ed864bedf2201fad68e2aeba249c3c18a12444..fa9dbb22dd13c650ef08af6030d60c5f
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Parrot.java b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
-index 345fe87d5d6c3883c28d2c1b34d1020e18864d97..b881f6e948b21ba851913d9f244d74d886f2cc3a 100644
+index ae21d260b2d4673eb4aa56a82e1043d20507adb2..3950dd170edee24f4a2effc1946e17b3b5f0c792 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -121,12 +121,63 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
@@ -1433,7 +1433,7 @@ index 345fe87d5d6c3883c28d2c1b34d1020e18864d97..b881f6e948b21ba851913d9f244d74d8
          this.goalSelector.addGoal(2, new SitWhenOrderedToGoal(this));
          this.goalSelector.addGoal(2, new FollowOwnerGoal(this, 1.0D, 5.0F, 1.0F, true));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pig.java b/src/main/java/net/minecraft/world/entity/animal/Pig.java
-index 2c95b6eddfe46e5d2ad495bfc86ccc24ae75e704..80c8ceda47bf8b3ff370f89a61aa01869d606ee6 100644
+index 53eaafad559cd6413bb1e10d07374da0ab907ec6..2afacf7a5d15f821e42d98f542dae41c025386d3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
 @@ -65,9 +65,22 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -1460,7 +1460,7 @@ index 2c95b6eddfe46e5d2ad495bfc86ccc24ae75e704..80c8ceda47bf8b3ff370f89a61aa0186
          this.goalSelector.addGoal(3, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(4, new TemptGoal(this, 1.2D, Ingredient.of(Items.CARROT_ON_A_STICK), false));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
-index 0694cd0b994ee595adca43c988485e6dc13c7244..dc6bc8f10d147cb1d0e5c69b6f6df63b0e8d4531 100644
+index cc1e4c8f9a44969597610154e05725df9bcc3b8c..d91852b85fc6ca7ea85886db5cad7f8d62de7174 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -61,11 +61,35 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -1535,7 +1535,7 @@ index 0694cd0b994ee595adca43c988485e6dc13c7244..dc6bc8f10d147cb1d0e5c69b6f6df63b
  
      public float getStandingAnimationScale(float tickDelta) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
-index 1b76e267cd36010a57d31852086dec0585d4bce5..42446fd8ba1d78cd5992bc6c2e5259da361eb716 100644
+index f576e602f2fce87cdebc194b474dced64952178b..bc1cf0e63c9a1df534017246687f6a13cf976ff8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -45,6 +45,18 @@ public class Pufferfish extends AbstractFish {
@@ -1558,7 +1558,7 @@ index 1b76e267cd36010a57d31852086dec0585d4bce5..42446fd8ba1d78cd5992bc6c2e5259da
      protected void defineSynchedData() {
          super.defineSynchedData();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
-index 3a9391b512974e812cac0d89119f68ba6728bfc9..29551a3b87f06c5876de5fda80615acf6c1f4764 100644
+index 5f8f8b32e29418f23a2ee526313f53a3d9c61473..49dd8633267f7cd40cfd671ac00e627d305be32d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -81,6 +81,7 @@ public class Rabbit extends Animal {
@@ -1688,7 +1688,7 @@ index 3a9391b512974e812cac0d89119f68ba6728bfc9..29551a3b87f06c5876de5fda80615acf
  
          @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Salmon.java b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
-index 574f91414ecacd18fadef5a56a4142d9cfdb6713..02a9ce0b98bab47d57b51cdfb2194f0e72a9f705 100644
+index 0af79daa357f53a8871e293b57e16c099e5d3f64..cf88c1d95a866853568d4fa5f67850bc54127d11 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 @@ -13,6 +13,18 @@ public class Salmon extends AbstractSchoolingFish {
@@ -1711,7 +1711,7 @@ index 574f91414ecacd18fadef5a56a4142d9cfdb6713..02a9ce0b98bab47d57b51cdfb2194f0e
      public int getMaxSchoolSize() {
          return 5;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
-index 9315c34e61aa0432175385736de51f1bfdafbf85..5890bf8aa714dc219059bca4950a1b5b1882dd3a 100644
+index 1f2f556fce77e25028f9f636d9b0cc7fca931a37..db547922585bc8e2aae2d7dc1bbe45a61e8da12c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -116,10 +116,23 @@ public class Sheep extends Animal implements Shearable {
@@ -1739,7 +1739,7 @@ index 9315c34e61aa0432175385736de51f1bfdafbf85..5890bf8aa714dc219059bca4950a1b5b
          this.goalSelector.addGoal(2, new BreedGoal(this, 1.0D));
          this.goalSelector.addGoal(3, new TemptGoal(this, 1.1D, Ingredient.of(Items.WHEAT), false));
 diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
-index 8c2f447d0d307df35d84b4907000023eb82ac6c2..229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a 100644
+index 4a5c6a6345fba919916c4c61dc9cbb8cb880cbca..02efae0969dadc85cdeeea7bcfbd5dd15c8b7f89 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -53,12 +53,26 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -1796,7 +1796,7 @@ index 8c2f447d0d307df35d84b4907000023eb82ac6c2..229b3cc63d2ec0bc5e5797d45efd9ca4
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Squid.java b/src/main/java/net/minecraft/world/entity/animal/Squid.java
-index 56838c9f214c0f75041e75c45ad1a0c72fcacc66..151bb142c553d733367a92b39b430b536e569480 100644
+index 4da560f6e4da0750bda78b900b2d916d58adfccb..09066b7e46a414b44f051ad8fdb4c734cc556db5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -54,9 +54,32 @@ public class Squid extends WaterAnimal {
@@ -1872,7 +1872,7 @@ index 56838c9f214c0f75041e75c45ad1a0c72fcacc66..151bb142c553d733367a92b39b430b53
  
              if (i > 100) {
 diff --git a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
-index 84015b5bf4b9a11670ad4d984844a431876efb63..5f61fcffebf4d853711a38d1f315f3def25e31a7 100644
+index 642478999b5e6929f4fcaefb09c232e0948c6bc9..0ddc45c8dd098b88f12a5a3af8aaa1f7dd928735 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -43,6 +43,18 @@ public class TropicalFish extends AbstractSchoolingFish {
@@ -1895,7 +1895,7 @@ index 84015b5bf4b9a11670ad4d984844a431876efb63..5f61fcffebf4d853711a38d1f315f3de
          return "entity.minecraft.tropical_fish.predefined." + variant;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
-index 01d8af06f19427354cac95d691e65d31253fef94..631539a752a038926355c23aeb160af64f363a61 100644
+index 7d001f42c448fd328b6384d133dcc4b72aab756c..9395787aa7e406fe9585308d17437bce95f8a5a1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -90,6 +90,18 @@ public class Turtle extends Animal {
@@ -1972,7 +1972,7 @@ index 01d8af06f19427354cac95d691e65d31253fef94..631539a752a038926355c23aeb160af6
                  this.turtle.setSpeed(Mth.lerp(0.125F, this.turtle.getSpeed(), f1));
                  this.turtle.setDeltaMovement(this.turtle.getDeltaMovement().add(0.0D, (double) this.turtle.getSpeed() * d1 * 0.1D, 0.0D));
 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 80caabee4d2100208f117a1c3e35247b65e318ad..bca3300e06d6eb0c6acdfb11d715a1e8447c9198 100644
+index 1050ccdeba51fd33d06c5f46853e42a05c38bd4d..e66c2339633f5230ad992d19bad4f12df970d405 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -93,9 +93,27 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -2012,7 +2012,7 @@ index 80caabee4d2100208f117a1c3e35247b65e318ad..bca3300e06d6eb0c6acdfb11d715a1e8
          this.targetSelector.addGoal(2, new OwnerHurtTargetGoal(this));
          this.targetSelector.addGoal(3, (new HurtByTargetGoal(this, new Class[0])).setAlertOthers(new Class[0])); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
-index b67562ea0ba8dc5c3fb26b3e79b89e0b3fd69631..861f9f58c8ff13edf8f70083e76b854bc6fc2cd9 100644
+index 16adf07774d568852b289ae8507779dd78110fc3..a2e0d4653d1a1905d58c684368edf6cedea0b55f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
 @@ -90,6 +90,23 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -2075,7 +2075,7 @@ index b67562ea0ba8dc5c3fb26b3e79b89e0b3fd69631..861f9f58c8ff13edf8f70083e76b854b
  
          }
 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 0d220ea2d2651c46ba60c68bdd8dad3182c69740..cb3b6c1866a4c5c05bc6c7f0d4ac03cd747271fe 100644
+index 82a363c5141cd00eec9b7e03e7ac6522b9b3c527..86e022ef4e3f198e3d36c24ed7179cfe3d9e79a0 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
 @@ -72,6 +72,18 @@ public class Goat extends Animal {
@@ -2106,7 +2106,7 @@ index 0d220ea2d2651c46ba60c68bdd8dad3182c69740..cb3b6c1866a4c5c05bc6c7f0d4ac03cd
          this.getBrain().tick((ServerLevel) this.level, this); // CraftBukkit - decompile error
          this.level.getProfiler().pop();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index 5c104bf219e5e4acb8acfb160bd92f0a0621d864..fbd96e516ac34f874b0cca2da9076120e29254fb 100644
+index 630b6491ee186e1e3f17489311a91681e52b7ff5..3bf85cb1ffcd0179d0048b1bf46def5dc837b87c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -113,12 +113,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -2141,7 +2141,7 @@ index 5c104bf219e5e4acb8acfb160bd92f0a0621d864..fbd96e516ac34f874b0cca2da9076120
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
-index ab588b990c15ff809a1937321d11a03aab826f61..e5b13558f45966bf70593931922ca73f4a66c66a 100644
+index 4e68ba557e86250b61ce0b20eacb3bcd36a23806..db4d5d5e38a44f85c343b632c914f2252c30a3c3 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Donkey.java
 @@ -15,6 +15,13 @@ public class Donkey extends AbstractChestedHorse {
@@ -2159,7 +2159,7 @@ index ab588b990c15ff809a1937321d11a03aab826f61..e5b13558f45966bf70593931922ca73f
      protected SoundEvent getAmbientSound() {
          super.getAmbientSound();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
-index 6326471fe48133bef94e98fd028e60a951bccf2b..c7b0d6a987644e0b589c143b0b6b68053be04f37 100644
+index 7af7ff4accbcc1b28d96c94e9c3301142541f4f0..a91152df3d443d70b1aa9aff97b3746e0331c0a6 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Horse.java
 @@ -39,6 +39,13 @@ public class Horse extends AbstractHorse {
@@ -2177,7 +2177,7 @@ index 6326471fe48133bef94e98fd028e60a951bccf2b..c7b0d6a987644e0b589c143b0b6b6805
      protected void randomizeAttributes() {
          this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)this.generateRandomMaxHealth());
 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 5c31519193126b715105e1e83bb54f6a1681d19e..d336e2c63b39b22f9f3a7a84ee059c2d9d71239c 100644
+index 1b906d949c0f0233fa55863a36e88d7599256e6d..f5616cfbc9bc39a7d8bac37a92110e58ae82b2a2 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
 @@ -68,7 +68,46 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -2244,7 +2244,7 @@ index 5c31519193126b715105e1e83bb54f6a1681d19e..d336e2c63b39b22f9f3a7a84ee059c2d
          this.targetSelector.addGoal(2, new Llama.LlamaAttackWolfGoal(this));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
-index 6b10aeab9d671327f6e85a31b0c85ef310a1d0b2..40cc7e20913938d6e30e6bca9f4ad70fb5e9435b 100644
+index 51821a71bb0eb9cd22c657a46ef148c84a2355c1..a67061b875468777ee6256c0b28894c62ebb926c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Mule.java
 @@ -14,6 +14,13 @@ public class Mule extends AbstractChestedHorse {
@@ -2262,7 +2262,7 @@ index 6b10aeab9d671327f6e85a31b0c85ef310a1d0b2..40cc7e20913938d6e30e6bca9f4ad70f
      protected SoundEvent getAmbientSound() {
          super.getAmbientSound();
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
-index 1d0a2296bab0140d3209c0749710d5fb952c79b4..d4057c300d39eca4ff2e11791ce5ba7993d9b66e 100644
+index 5f0ccd0181dd1c84580b91fdccdcbce0a619d10d..a693f5ff830662e3a958af28503bd55a52130952 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/SkeletonHorse.java
 @@ -29,6 +29,13 @@ public class SkeletonHorse extends AbstractHorse {
@@ -2325,7 +2325,7 @@ index 885937d7001259d9a8ee8d5bc16629a196a13fe8..ff252d9ca75b90ab7606f63aa5f89b62
      public boolean isTraderLlama() {
          return true;
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
-index c6c7096ec476d91ef91b164e32c5a9cd112f3dd7..d328e36015b6b7d6a9e093fbe232eb5ecda46d96 100644
+index 0b9fc77b86b82cebdaead4f1884182ecfdc98b09..77d05979331af91a1fbe619d1c26fa883146add8 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/ZombieHorse.java
 @@ -22,6 +22,18 @@ public class ZombieHorse extends AbstractHorse {
@@ -2517,7 +2517,7 @@ index 29aa428e019681af8d6b0020c12b18660ff6af6c..5df112f87fba042f13f615a22a5c6f85
                          this.dragonFight.updateDragon(this);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index bb329e9c1a2295e6433d3728692a1e716c89dcc0..fdc9068de403e98e18af11d4d6c5b708d2cc3c52 100644
+index 8c17caf00bd24adca5794774171638f298921ee7..9e9b9996293acd721e183fa752b3742ffc54910f 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -83,6 +83,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -2706,7 +2706,7 @@ index cd75f895b6818fbb7ed4b0ef3df873f264bb2d1b..74f4f8e1c9faef3b50fa817ca3dfbb6b
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, IronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Blaze.java b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
-index a1bbe0c34bd5693f041dca9028a5a52b2ca71bc5..a5294012d432d5d1fce570a1eb1b1716a24522de 100644
+index 523a1389b789d57a545e9c199fb2e681230b1a54..5b3eb1ef97b2c0979e28592e0572231e3d92256d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -32,6 +32,7 @@ public class Blaze extends Monster {
@@ -2808,7 +2808,7 @@ index d980b906d9206560741576fa4153c57212f307a0..dd05c5f35d78d1385f793f4e34333ff2
      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 e8c36e8541f041a0d72a86f49ced2a3ce1549be0..b9d23fb187541d734b56bfa48ccc18ee4f6d7e88 100644
+index bbca035b89c2334e65abc46dd76234c833ac222d..9f3c6d6a33fa59cad7ffa40d63b140014b92deb2 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -60,21 +60,93 @@ public class Creeper extends Monster implements PowerableMob {
@@ -2914,7 +2914,7 @@ index e8c36e8541f041a0d72a86f49ced2a3ce1549be0..b9d23fb187541d734b56bfa48ccc18ee
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Drowned.java b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
-index 50228e59d629e75e97d23bd3ec92088f75480827..ace909fab2334105eabe0593aba47736e3f67451 100644
+index 8a9a9bfa95db08d063a6409f2e4cf2aa26ec3b0b..071c77039371688180a189f7715f3d0b62f2287a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -69,6 +69,18 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -2973,7 +2973,7 @@ index 50228e59d629e75e97d23bd3ec92088f75480827..ace909fab2334105eabe0593aba47736
  
          }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
-index ee2febe92309f277f1607c0ea024d6cd291490bc..5f8233c1be6f92bcf58c5c5db360b2660c9439ad 100644
+index ee9194ffb3cc6d660d4f99a3914ede7e4a3643fe..1f789b1d481234cafaa6e75c36a272bbd064482e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -30,6 +30,18 @@ public class ElderGuardian extends Guardian {
@@ -2996,7 +2996,7 @@ index ee2febe92309f277f1607c0ea024d6cd291490bc..5f8233c1be6f92bcf58c5c5db360b266
          return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index 5d371a3e94720e24058d007474355af6aeb7cbdd..f505cc4fc7945b2b462bc24ee3ecc76995072e14 100644
+index e5068464d66641b4ae96aecee8d1216ae2dc37c1..b9d8e6d0b7e4d139dada63f0014ef90dd7ca85fc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -83,9 +83,22 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -3048,7 +3048,7 @@ index 5d371a3e94720e24058d007474355af6aeb7cbdd..f505cc4fc7945b2b462bc24ee3ecc769
              if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
              for (int i = 0; i < 64; ++i) {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Endermite.java b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
-index 4aecf69a335c2c6b6457f3b15a1420400878b6e6..1f315cc57f6365a782ca4e645b0dcfbe5485138a 100644
+index 56d313c2c4a98eac7f4f594d2c29dcd82a4753ac..a7eb3bdb45cfefbe290fdb26bc1444eb46ee8ae6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -36,13 +36,27 @@ public class Endermite extends Monster {
@@ -3080,7 +3080,7 @@ index 4aecf69a335c2c6b6457f3b15a1420400878b6e6..1f315cc57f6365a782ca4e645b0dcfbe
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Evoker.java b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
-index 4b812fc118126040d773f87ab50047cbbda79d1c..053374baf3ec7730bcddf072ddf98e3176656435 100644
+index 5d2f50991b1d9cec500047846bc07a75d8e3cea9..349670deed65a83e4a09e8f71edbb66bd63ff53c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -46,10 +46,23 @@ public class Evoker extends SpellcasterIllager {
@@ -3116,7 +3116,7 @@ index 4b812fc118126040d773f87ab50047cbbda79d1c..053374baf3ec7730bcddf072ddf98e31
          this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
          this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
-index 886b6eac6c6ae4d97b1b25624504c0f48e20efc4..bb1a6f6847d0e459eb26a029d8a1f5646168a422 100644
+index ee5faf8389882a63e2f6ba5b86523f2b387ab0b5..8f738130b33b49af84a76f89e1a6b9586adfb420 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 @@ -44,11 +44,42 @@ public class Ghast extends FlyingMob implements Enemy {
@@ -3219,7 +3219,7 @@ index 0d578ab12c874bd2daccc4322a3fe1abafa4bc18..d95b110a025d48e7ab18f172e4555937
      protected float getStandingEyeHeight(Pose pose, EntityDimensions dimensions) {
          return 10.440001F;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Guardian.java b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
-index c5441f2784463b35fefbb567bf4eca579b3769bb..20b7104b7fd38b3c6c05a68a1472c6006814cb81 100644
+index 9d40dd4261cbdd40d2e7b12717a0e6b4b3082a41..e825e974c8586928dbc18c5d69071e17ccfe01c5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 @@ -65,15 +65,36 @@ public class Guardian extends Monster {
@@ -3315,7 +3315,7 @@ index c5441f2784463b35fefbb567bf4eca579b3769bb..20b7104b7fd38b3c6c05a68a1472c600
  
                  this.guardian.setSpeed(f2);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Husk.java b/src/main/java/net/minecraft/world/entity/monster/Husk.java
-index 28fb67c0a5992cbd77c5d3c6efa0f0493466d81c..75397a8e1ae8d48bf07f5c0409536acd54851c48 100644
+index 4f683b4d35b5b07fffe344fab6ae15f5ccb6baf2..82a14d717e8f2ee005c2c410625b811cd016cdc3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
 @@ -22,6 +22,18 @@ public class Husk extends Zombie {
@@ -3338,7 +3338,7 @@ index 28fb67c0a5992cbd77c5d3c6efa0f0493466d81c..75397a8e1ae8d48bf07f5c0409536acd
          return checkMonsterSpawnRules(type, world, spawnReason, pos, random) && (spawnReason == MobSpawnType.SPAWNER || world.canSeeSky(pos));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
-index c9fa01b910de7ecb494d3000afebea9a2bd1276a..5f57c14a7ba03af9432a839e6caed47286638b2c 100644
+index e1b8d9c0acfc248b9a24efc21aefc88e3caeb605..c03e5836a313876d856c6318b288946c4ebd1af9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 @@ -59,10 +59,23 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
@@ -3374,7 +3374,7 @@ index c9fa01b910de7ecb494d3000afebea9a2bd1276a..5f57c14a7ba03af9432a839e6caed472
          this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300));
          this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
-index 130205f0d101debaa74c1172fb80863e6fa0ebe1..7d39f25734f2c52b11931e141524acd2c244c2c5 100644
+index 2ffe85ee5565bcae56b8a64567c34eeed71e4e4b..95741b63d68bdf815212d718c3cc0fc689c0e4de 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -27,6 +27,23 @@ public class MagmaCube extends Slime {
@@ -3424,7 +3424,7 @@ index 130205f0d101debaa74c1172fb80863e6fa0ebe1..7d39f25734f2c52b11931e141524acd2
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 39291a0cea465613733a905141b584f05e597b4c..61aff98a7b56eab6a43ddc9f07618cbbedb6b77d 100644
+index 253fce256341d20ee58f9b7afa1ffaa8fb820028..fda285444538ae09cef15ecc0f68836902f3c474 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -61,6 +61,59 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -3562,7 +3562,7 @@ index 39291a0cea465613733a905141b584f05e597b4c..61aff98a7b56eab6a43ddc9f07618cbb
  
      private class PhantomBodyRotationControl extends BodyRotationControl {
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Pillager.java b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
-index c0de613024de7b9b55f96be37e4648e83dea9b8f..84bd5e7df663f315fd099742195e85508ea25adf 100644
+index 91bf8051b85d85e8315691089c3219827145ab77..2137f8133f03467667296f94a26a285288e8c352 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 @@ -66,15 +66,29 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
@@ -3596,7 +3596,7 @@ index c0de613024de7b9b55f96be37e4648e83dea9b8f..84bd5e7df663f315fd099742195e8550
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Ravager.java b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
-index 4f51de49757a912ec84ccf5dab087c9a3e11a60e..32ef769b2b3e3ab42c7a50bf4c8ec7ec548d5e7b 100644
+index 240c4ac718f314505f0b88da3cf1f5c297f4b040..23b0fe96aab0234e17c43423817c4f34c694751a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -70,14 +70,34 @@ public class Ravager extends Raider {
@@ -3644,7 +3644,7 @@ index 4f51de49757a912ec84ccf5dab087c9a3e11a60e..32ef769b2b3e3ab42c7a50bf4c8ec7ec
                  this.getAttribute(Attributes.MOVEMENT_SPEED).setBaseValue(0.0D);
              } else {
 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 ca0d1c059a6ad94590bcbff34b37b9c13ef19474..42635be6183d86978df3f174c74a71691f2bfcdd 100644
+index 1f6693b7d7466bd12b9b137335f0a874d906edcc..ec41c07f2f7d7c4c24b54a2fbf5cd2b73d8d1247 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -92,12 +92,26 @@ public class Shulker extends AbstractGolem implements Enemy {
@@ -3684,7 +3684,7 @@ index ca0d1c059a6ad94590bcbff34b37b9c13ef19474..42635be6183d86978df3f174c74a7169
          public ShulkerLookControl(Mob entity) {
              super(entity);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
-index 2459ae800a5f6b234a4f4bb1cd3738e4e9cac67d..e66cc79dc61721b31ffb743f68f4388cc499a92d 100644
+index aec7dd2df77efeaf65d9fe08adc668030dfe08e2..44d8ef55d47ff63589e6b47210f460a04a146291 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 @@ -39,13 +39,27 @@ public class Silverfish extends Monster {
@@ -3716,7 +3716,7 @@ index 2459ae800a5f6b234a4f4bb1cd3738e4e9cac67d..e66cc79dc61721b31ffb743f68f4388c
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
      }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
-index ccf706acafc20e7ba5408d1648b873d6937a030c..059a62da29b7ec11e2ff9baf18dde788bec4923c 100644
+index 116709ba2b298268ac806e6e45f2e910ca600706..8bfcfbae5046e3089b85194cfb1fe1a57d285647 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -25,6 +25,18 @@ public class Skeleton extends AbstractSkeleton {
@@ -3739,7 +3739,7 @@ index ccf706acafc20e7ba5408d1648b873d6937a030c..059a62da29b7ec11e2ff9baf18dde788
      protected void defineSynchedData() {
          super.defineSynchedData();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
-index bb6cc0e05ebc5d39968fd2b923ba1cb540720a15..342c6158f6fc145a779ed60b48698e14a944726b 100644
+index b9df0e2986afd2b238fabd26d83d2cff923a2401..cf5e780a1708c7d72bb07da2565792fa09a87c77 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -67,18 +67,50 @@ public class Slime extends Mob implements Enemy {
@@ -3863,7 +3863,7 @@ index bb6cc0e05ebc5d39968fd2b923ba1cb540720a15..342c6158f6fc145a779ed60b48698e14
  
              }
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index a8162116eb888106e6f48ee836d0cc5d33b72399..5874d86ca34200e9ce7d41cf7a80eb0f1f13410c 100644
+index 64f0ce2981700532cb0d11fbc086bfbd08f2384d..62760822ef8837d20dfa7ed92a64e14574098c23 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -51,14 +51,28 @@ public class Spider extends Monster {
@@ -3896,7 +3896,7 @@ index a8162116eb888106e6f48ee836d0cc5d33b72399..5874d86ca34200e9ce7d41cf7a80eb0f
          this.targetSelector.addGoal(2, new Spider.SpiderTargetGoal<>(this, Player.class));
          this.targetSelector.addGoal(3, new Spider.SpiderTargetGoal<>(this, IronGolem.class));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Stray.java b/src/main/java/net/minecraft/world/entity/monster/Stray.java
-index 0cfcd9c69213d75b52dc93392da727208c13150d..6a8a0cd09e0bf17c7ecb6e55342b645f111dac22 100644
+index baf614d2dbfb54d25fe06b28709ba2b7176c5213..8480687e452b7cad0d3e434cebe17e15c59bdc40 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -21,6 +21,18 @@ public class Stray extends AbstractSkeleton {
@@ -3919,7 +3919,7 @@ index 0cfcd9c69213d75b52dc93392da727208c13150d..6a8a0cd09e0bf17c7ecb6e55342b645f
          BlockPos blockPos = pos;
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
-index fc772387713d4313ec8f90a8abcaf7b703fd9f21..6c0af80f47c53e4573efb0c50412d289c0bb5540 100644
+index 5681403fa9131c15b8ca0e9d892e36eec3818eb9..dcf31bc288e8371c17574a3dd4b495ea2c7a8dac 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -97,6 +97,18 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -3959,7 +3959,7 @@ index fc772387713d4313ec8f90a8abcaf7b703fd9f21..6c0af80f47c53e4573efb0c50412d289
                  if (flag && !this.isSilent()) {
                      this.level.playSound((Player) null, this.getX(), this.getY(), this.getZ(), SoundEvents.STRIDER_EAT, this.getSoundSource(), 1.0F, 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vex.java b/src/main/java/net/minecraft/world/entity/monster/Vex.java
-index d4ea25f30ff6b914958da0c7a4914ba9a65327a3..c914cfc75cc0426c0333a6bb30aab7b9e4c52971 100644
+index f78f3f2d740f7b4800e17d9bc64b7b4fedda49b9..589a6f8db279c52cc7f19d7c14d08bf46ebffd7c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -57,6 +57,45 @@ public class Vex extends Monster {
@@ -4065,7 +4065,7 @@ index d4ea25f30ff6b914958da0c7a4914ba9a65327a3..c914cfc75cc0426c0333a6bb30aab7b9
                          Vec3 vec3d1 = Vex.this.getDeltaMovement();
  
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
-index 51082fb81477b96c778796e8daf288b366cecf22..a3b1332a92824255b807adc9a5a1d29569e7073b 100644
+index f7bcd6b8e1fb2e97db7da9bf218be0e9c99d245b..cbd170cec638dfcd19c2d597e2b39bbcf38c570d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -57,14 +57,28 @@ public class Vindicator extends AbstractIllager {
@@ -4098,7 +4098,7 @@ index 51082fb81477b96c778796e8daf288b366cecf22..a3b1332a92824255b807adc9a5a1d295
          this.targetSelector.addGoal(2, new NearestAttackableTargetGoal<>(this, Player.class, true));
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractVillager.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Witch.java b/src/main/java/net/minecraft/world/entity/monster/Witch.java
-index 8c3e8c12d7405ad388342e304430834a5fad12a9..e70fb661c62add74cdbe9fc9ef1e3143e96333b2 100644
+index 365354910047631b0a4402f29ad156e6447c2606..0eb8010cc701014d5dd9b6c1ec167e0befcedeb9 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -60,6 +60,18 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -4134,7 +4134,7 @@ index 8c3e8c12d7405ad388342e304430834a5fad12a9..e70fb661c62add74cdbe9fc9ef1e3143
          this.targetSelector.addGoal(2, this.healRaidersGoal);
          this.targetSelector.addGoal(3, this.attackPlayersGoal);
 diff --git a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
-index f9bc07be70fae9aced51a69bccb5eda309187a47..4cea4ba127dc036ce5d585323a25bbcf06bd46a6 100644
+index 6acc46c3a6fe7648d2cc4d0aaef063633c74c20d..570a7f7c63cae90563129dc04aeb76a0d97ffcc3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -34,6 +34,18 @@ public class WitherSkeleton extends AbstractSkeleton {
@@ -4157,7 +4157,7 @@ index f9bc07be70fae9aced51a69bccb5eda309187a47..4cea4ba127dc036ce5d585323a25bbcf
      protected void registerGoals() {
          this.targetSelector.addGoal(3, new NearestAttackableTargetGoal<>(this, AbstractPiglin.class, true));
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
-index 056c0e66d2f90850906c78a25d759f22c20e4d35..8fd4e26ebe0527fd8a69b15095dd4091fcdde206 100644
+index 0ee254552dadd40db7b6427df8b5b34caa90379c..175ff8a67b4ac28efef112bd75508a059d6c1f50 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 @@ -67,6 +67,18 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -4211,7 +4211,7 @@ index 056c0e66d2f90850906c78a25d759f22c20e4d35..8fd4e26ebe0527fd8a69b15095dd4091
          this.level.getProfiler().pop();
          this.updateActivity();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
-index 6408e158745c20ab449c44a28420bc9b28e1efac..6dee348b4e1faec208e5144527ca3df0dab4f96e 100644
+index 0235cf791a3a5b0e5dc515b405c0263438ffaf7e..9d911c5e217207e3030f9dec2daef64ae5d09e7f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -107,11 +107,25 @@ public class Zombie extends Monster {
@@ -4264,7 +4264,7 @@ index 7a2e3d2ec86536c6caa5a0af0013474143566df8..d487b4cb2da18eac12ec3dc71997cdc1
      protected void defineSynchedData() {
          super.defineSynchedData();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
-index 025d53ab0787d596f4c486b15d286b9547838e16..708ba2c64a0736a30e477017b46dc711948cfc3d 100644
+index 6b508fb0850eb29e31ad960458ea2922c5bdd2bf..8e5fb46d3c56a71788d02eb1865b597553c7de8e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -58,6 +58,18 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -4287,7 +4287,7 @@ index 025d53ab0787d596f4c486b15d286b9547838e16..708ba2c64a0736a30e477017b46dc711
      public void setPersistentAngerTarget(@Nullable UUID uuid) {
          this.persistentAngerTarget = uuid;
 diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
-index 3f6697d21cf32b83d3dcd74d810effc28c9efc95..060676e094c425ab11889ee221808e5814d34f43 100644
+index 4c111bc335ab8cafe6674b77dcd7a22cb1c58ae9..aabaf7feef222515bf59a5c3e33ee624168f46a8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
 @@ -67,6 +67,18 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -4318,7 +4318,7 @@ index 3f6697d21cf32b83d3dcd74d810effc28c9efc95..060676e094c425ab11889ee221808e58
          this.getBrain().tick((ServerLevel)this.level, this);
          this.level.getProfiler().pop();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
-index 06c6ed64488bb3685b9de3e05d8a1e74ebc62e37..ace6891fd0e14af5268249b60e14a99c17a2f435 100644
+index 758558c1e312edc730d1f5d7ffdbc5a41356a6e5..34fbe1853742dcbd6d0abd45bebcb3a21422d0b0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
 @@ -97,6 +97,18 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -4349,7 +4349,7 @@ index 06c6ed64488bb3685b9de3e05d8a1e74ebc62e37..ace6891fd0e14af5268249b60e14a99c
          this.getBrain().tick((ServerLevel) this.level, (Piglin) this); // CraftBukkit - decompile error
          this.level.getProfiler().pop();
 diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
-index af579b2b6f6e18da70e67ce74431a57d9a1236dd..d01a8fe6dd5c84ea5b7370a90c0d57130b27e447 100644
+index ea0040a3494709efb4819c7530dbcc37aa62e86a..5025d4571a34fe9e0e58ada6b81b064716b8f672 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
 @@ -40,6 +40,18 @@ public class PiglinBrute extends AbstractPiglin {
@@ -4389,7 +4389,7 @@ index af579b2b6f6e18da70e67ce74431a57d9a1236dd..d01a8fe6dd5c84ea5b7370a90c0d5713
          this.level.getProfiler().pop();
          PiglinBruteAi.updateActivity(this);
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 0f7f7aef78a1f34fe113eeb00a88fd2610351344..8a37e6b42a50da4822389004123e3b72b33f50b4 100644
+index 4904971710acbb2855ed9ed96fead4aed189c494..7d10225fd52c4291f13eb644716aa3949c6037e6 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -157,6 +157,23 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -4437,7 +4437,7 @@ index 0f7f7aef78a1f34fe113eeb00a88fd2610351344..8a37e6b42a50da4822389004123e3b72
                          this.startTrading(player);
                      }
 diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
-index c4f7c94255e4631a3c0355f9260132ba28296f50..d6c31596e21041a124a263054ccb6447829eccdd 100644
+index 642279bb7e15db9f662094ffd6ded2e3c7af3fd6..ab648e7dafd78f414646cef96b422e87da5c1982 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -67,6 +67,18 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
@@ -4471,7 +4471,7 @@ index c4f7c94255e4631a3c0355f9260132ba28296f50..d6c31596e21041a124a263054ccb6447
                      this.setTradingPlayer(player);
                      this.openTradingScreen(player, this.getDisplayName(), 1);
 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 cea92f1dc663bf0648b2bd877d86ca380a517bc9..d7850a9bc7cf78e2b17d9d171302ce07596f9735 100644
+index ce713e1857121ca52467ad561c4fbb30ae054d87..cb626e4427dd54289660cfa01e48091ca530b752 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -193,6 +193,19 @@ public abstract class Player extends LivingEntity {
@@ -5749,10 +5749,10 @@ index 2712aa554383a3b2b742c945e2f0be7ee96eea69..f8811514c155f743f6e93c9a88721903
 +    // 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 4b06275f2939a351a965f51177a01b3124e2513e..f02e7faff60867a64594638d1806d2f03d31fb1e 100644
+index 2b2654ec04e8abca9db09d6257edf11099bb0d9b..950d8351881cd0ede3b32e1d07d3e68e06cd8e83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -541,6 +541,15 @@ public class CraftEventFactory {
+@@ -542,6 +542,15 @@ public class CraftEventFactory {
          }
          craftServer.getPluginManager().callEvent(event);
  
@@ -5768,7 +5768,7 @@ index 4b06275f2939a351a965f51177a01b3124e2513e..f02e7faff60867a64594638d1806d2f0
          return event;
      }
  
-@@ -964,6 +973,7 @@ public class CraftEventFactory {
+@@ -965,6 +974,7 @@ public class CraftEventFactory {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
                  event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -5776,7 +5776,7 @@ index 4b06275f2939a351a965f51177a01b3124e2513e..f02e7faff60867a64594638d1806d2f0
              }
              event.setCancelled(cancelled);
  
-@@ -1049,6 +1059,7 @@ public class CraftEventFactory {
+@@ -1050,6 +1060,7 @@ public class CraftEventFactory {
              if (!event.isCancelled()) {
                  event.getEntity().setLastDamageCause(event);
              }
@@ -5784,7 +5784,7 @@ index 4b06275f2939a351a965f51177a01b3124e2513e..f02e7faff60867a64594638d1806d2f0
              return event;
          }
  
-@@ -1100,6 +1111,7 @@ public class CraftEventFactory {
+@@ -1101,6 +1112,7 @@ public class CraftEventFactory {
          EntityDamageEvent event;
          if (damager != null) {
              event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);