Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
26c37d99d5 create random seeds for features using SecureRandom
589bf2f1bf Upgrade gson to 2.8.8 (Closes #6370)
0a6103597b Get entity default attributes (#6449)
40057019e0 Correctly inflate villager activation bounding box (#6798)
e5f9241d15 Left handed API (#6775)
40ee63496c Add advancement display API (#6175)
9d570042ed Add ItemFactory#getMonsterEgg API (#6772)
55ca459515 rename method to getSpawnEgg
bb397ba74c Add critical damage API (#6275)
f47aeafe00 Add Horse Animation API (#5599)
7a0886180f AT & Mapping fixes (#6809)
5553432644 docs: Update gradle instructions for Java 16 (#6811) [ci skip]
a1f49e4c60 Fix command suggestion leak (#6592)
9472d38f3c Fix method name for Critical damage (#6813)

patches/server/0008-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 33edd0863374b4a7f2b0812879b23533515da447..efcba8ea0ab1f25f6480fe0a3bbe1537764438aa 100644
+index 643f0c878352fd205f928aaa083cde59c911f926..1ab4456b67b1b439b3b0e96f85de0fe104a5b2f8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -150,7 +150,7 @@ import org.bukkit.plugin.PluginManager;
@@ -18,7 +18,7 @@ index 33edd0863374b4a7f2b0812879b23533515da447..efcba8ea0ab1f25f6480fe0a3bbe1537
      private static final int CURRENT_LEVEL = 2;
      public boolean preserveMotion = true; // Paper - keep initial motion on first setPositionRotation
 diff --git a/src/main/java/net/minecraft/world/entity/GlowSquid.java b/src/main/java/net/minecraft/world/entity/GlowSquid.java
-index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a791660ed 100644
+index f0c30ab5e32e78850d402aa4bc7d42667610dbf0..8c76074289954aae933dd41184f1f0d346bc6c8b 100644
 --- a/src/main/java/net/minecraft/world/entity/GlowSquid.java
 +++ b/src/main/java/net/minecraft/world/entity/GlowSquid.java
 @@ -29,6 +29,11 @@ public class GlowSquid extends Squid {
@@ -34,7 +34,7 @@ index 8f8bc29d847801938e251904b8334b4b31bd21c5..87d01bebbb179eec53323e9e23db011a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 69acb18fb715c751e3c3c412dae151fb6a8239b6..a7e0126d1fed75bfa810f405a4dd5b70668bf08e 100644
+index 15421740e66f61a818348f57f0d68db69d3577ce..633d8d5cdbd757e56fe5e40937887a027280b08f 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -287,6 +287,7 @@ public abstract class LivingEntity extends Entity {
@@ -55,7 +55,7 @@ index 69acb18fb715c751e3c3c412dae151fb6a8239b6..a7e0126d1fed75bfa810f405a4dd5b70
          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 e0a55fdff847180d08db0bc6bc7e19281c594a0c..e749f0f3a35783cada224e4b0c12f294c3245210 100644
+index 02eb039e4c17d21649610b0d475bbecfc8574809..1894b630673d399b0f5b65d534fb4ac0bd72b751 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -83,6 +83,18 @@ public class Bat extends AmbientCreature {
@@ -78,7 +78,7 @@ index e0a55fdff847180d08db0bc6bc7e19281c594a0c..e749f0f3a35783cada224e4b0c12f294
  
      @Override
 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 8632a4047776723088b9b9fa27c6e8093fb17801..56f55c4520bec4b4baaa606e47ecf6c0288a104f 100644
+index 55ab3d403d3b01ea923923ab985c730726754e8a..a52c34dd52198d1d1af991596f84b0b9aa5f1e64 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -209,6 +209,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -94,7 +94,7 @@ index 8632a4047776723088b9b9fa27c6e8093fb17801..56f55c4520bec4b4baaa606e47ecf6c0
  
      @Override
 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 14822b20971b63290a7022f8efe65693c41664d2..1cbbc29ef19c8f1b8f96882213b662cfcb193033 100644
+index 48e85481372d8e6edf0460423ae488fae21ecdbf..fa2099c98ae60102ad4e555af78ab26aca587dbf 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -139,6 +139,11 @@ public class Cat extends TamableAnimal {
@@ -110,7 +110,7 @@ index 14822b20971b63290a7022f8efe65693c41664d2..1cbbc29ef19c8f1b8f96882213b662cf
  
      public ResourceLocation getResourceLocation() {
 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 7a5119e007d69adc9a77fbd167a8d19a9c71c6ff..9fe68301b9a6efd703fb9d2215a9cd3b2f017a4e 100644
+index 0b6cbbb6117bcd61081e3b136cc432058e0c5102..63790e717f11f8cc28f734f81998542164461ee2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -62,6 +62,11 @@ public class Chicken extends Animal {
@@ -126,7 +126,7 @@ index 7a5119e007d69adc9a77fbd167a8d19a9c71c6ff..9fe68301b9a6efd703fb9d2215a9cd3b
  
      @Override
 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 5275e4ed3d552d1e164ef580caf6c247ec5fd8c2..b84aa3aa391aab6c7bcb804ec3cad67264a1e3d5 100644
+index ea7227ade90a713242290cadb13692f33effa5c0..f772c60ab5b4ac5468483d9765386b9b72ad8d0f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cod.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cod.java
 @@ -23,6 +23,11 @@ public class Cod extends AbstractSchoolingFish {
@@ -142,7 +142,7 @@ index 5275e4ed3d552d1e164ef580caf6c247ec5fd8c2..b84aa3aa391aab6c7bcb804ec3cad672
  
      @Override
 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 1cb5342d63011605b567a4fe16d07de831f04216..bee82d5bf600cbeacfcede600e5606529af1435e 100644
+index 5939cb25e5ce5fa5c18eb9feddf30816aac6d4c6..205b740eeb3ad2c63a3524948bdfb43a3a7c373e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -50,6 +50,11 @@ public class Cow extends Animal {
@@ -158,7 +158,7 @@ index 1cb5342d63011605b567a4fe16d07de831f04216..bee82d5bf600cbeacfcede600e560652
  
      @Override
 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 2300abc4e80449e6b92992f6fb8cfe8e99dea351..c372d47a929e06c8cfb0df86cf4e9bfee4d4b300 100644
+index 87e128e67a147b1ff772f12317eee1ebfc91d83e..855ab63797baf825eeaddb4892cbe8430d47da0f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Dolphin.java
 @@ -158,6 +158,11 @@ public class Dolphin extends WaterAnimal {
@@ -174,7 +174,7 @@ index 2300abc4e80449e6b92992f6fb8cfe8e99dea351..c372d47a929e06c8cfb0df86cf4e9bfe
  
      @Nullable
 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 ee9dfc609cc9e4a94dca7803e51bb456c1e63389..80749df5d00df415a1b9e7c0e8586625b6453ffb 100644
+index 56395fc555d05a2ff9bf551affa62521bad4893e..c8198d49ca0e159a2d87e21cf73fc901ea79310c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -169,6 +169,11 @@ public class Fox extends Animal {
@@ -190,7 +190,7 @@ index ee9dfc609cc9e4a94dca7803e51bb456c1e63389..80749df5d00df415a1b9e7c0e8586625
  
      @Override
 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 63b739c86d2ea22aa9a610796ad2f208b0db289e..f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb 100644
+index a5e19967b4488fb662ee2767cef5a1851da96468..8026f2a7bb5fab1762c2fb473bb8a33079df2f87 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 @@ -80,6 +80,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -222,7 +222,7 @@ index 81a393f29643a0cf3478ca8ff640c21153d1514b..b9aeb196f61582801416dab21c12d50e
  
      @Override
 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 2a8f6d920370b4087895e9f0098a0f41d9b1e152..de0247899f0bf785a94e39e170c8e2fc8a58b590 100644
+index 20797bc9e53d5061396ddb6a89e46b46dd2081ae..708b6fb7982dc39ee090ae9a652d48046b833323 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -78,6 +78,11 @@ public class Ocelot extends Animal {
@@ -238,7 +238,7 @@ index 2a8f6d920370b4087895e9f0098a0f41d9b1e152..de0247899f0bf785a94e39e170c8e2fc
  
      public boolean isTrusting() {
 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 fa9dbb22dd13c650ef08af6030d60c5fc8ee8044..d0c10a6d465e2ac9a1bec04080a23dfb081e9f3e 100644
+index 7ab0b39091910c492a4f860237a33996dbb08b97..68039d84c62005c7b2decde410c0578c6327b043 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -127,6 +127,12 @@ public class Panda extends Animal {
@@ -267,7 +267,7 @@ index fa9dbb22dd13c650ef08af6030d60c5fc8ee8044..d0c10a6d465e2ac9a1bec04080a23dfb
  
          if (this.isLazy()) {
 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 b881f6e948b21ba851913d9f244d74d886f2cc3a..1e38578a9a1531433866e2de7aa0ce5237da3b6b 100644
+index 3950dd170edee24f4a2effc1946e17b3b5f0c792..19caa59e11879b1269196fb0997b899e9e67b586 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -176,6 +176,11 @@ public class Parrot extends ShoulderRidingEntity implements FlyingAnimal {
@@ -283,7 +283,7 @@ index b881f6e948b21ba851913d9f244d74d886f2cc3a..1e38578a9a1531433866e2de7aa0ce52
  
      @Nullable
 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 80c8ceda47bf8b3ff370f89a61aa01869d606ee6..f4a099e691dce3c57069e76d67859161b459098e 100644
+index 2afacf7a5d15f821e42d98f542dae41c025386d3..ebfeeab7b8aceeb7f0de09200c13647eae5bc32f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
 @@ -75,6 +75,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -299,7 +299,7 @@ index 80c8ceda47bf8b3ff370f89a61aa01869d606ee6..f4a099e691dce3c57069e76d67859161
  
      @Override
 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 dc6bc8f10d147cb1d0e5c69b6f6df63b0e8d4531..18780fb268cabb47bb0deb84c44520831c1a762b 100644
+index d91852b85fc6ca7ea85886db5cad7f8d62de7174..62c76aace42a948a117aee3d209fbaac72661740 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -88,6 +88,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -315,7 +315,7 @@ index dc6bc8f10d147cb1d0e5c69b6f6df63b0e8d4531..18780fb268cabb47bb0deb84c4452083
  
      @Override
 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 42446fd8ba1d78cd5992bc6c2e5259da361eb716..bb1a2d79e0034ca3d8b18cb578049deecd234a05 100644
+index bc1cf0e63c9a1df534017246687f6a13cf976ff8..654ad8cd11bc11432811ed7408c0ce9b473a3245 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pufferfish.java
 @@ -55,6 +55,11 @@ public class Pufferfish extends AbstractFish {
@@ -331,7 +331,7 @@ index 42446fd8ba1d78cd5992bc6c2e5259da361eb716..bb1a2d79e0034ca3d8b18cb578049dee
  
      @Override
 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 29551a3b87f06c5876de5fda80615acf6c1f4764..587feda351efae19407cb9f23c6c1d42d5ed0cc9 100644
+index 49dd8633267f7cd40cfd671ac00e627d305be32d..fd81c6ad5b7e36e013fd36d72f8db716ad9cae20 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -128,6 +128,11 @@ public class Rabbit extends Animal {
@@ -347,7 +347,7 @@ index 29551a3b87f06c5876de5fda80615acf6c1f4764..587feda351efae19407cb9f23c6c1d42
  
      // CraftBukkit start - code from constructor
 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 02a9ce0b98bab47d57b51cdfb2194f0e72a9f705..002564221cc53b872001bdb8a76d9ca059212401 100644
+index cf88c1d95a866853568d4fa5f67850bc54127d11..e42bdde7947e532a3a5517c874411a39132bb73e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Salmon.java
 @@ -23,6 +23,11 @@ public class Salmon extends AbstractSchoolingFish {
@@ -363,7 +363,7 @@ index 02a9ce0b98bab47d57b51cdfb2194f0e72a9f705..002564221cc53b872001bdb8a76d9ca0
  
      @Override
 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 5890bf8aa714dc219059bca4950a1b5b1882dd3a..497be3182c72b5a0f3bc42088c4168702119b527 100644
+index db547922585bc8e2aae2d7dc1bbe45a61e8da12c..e142d90d62c80c5e8b888521e4654e2b64b80990 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -126,6 +126,11 @@ public class Sheep extends Animal implements Shearable {
@@ -379,7 +379,7 @@ index 5890bf8aa714dc219059bca4950a1b5b1882dd3a..497be3182c72b5a0f3bc42088c416870
  
      @Override
 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 229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a..fcf3092ef1863f62d9e76a77c0299ce1495ca1b7 100644
+index 02efae0969dadc85cdeeea7bcfbd5dd15c8b7f89..dac6b75f6b489c880fa2093594102778b675d8ac 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -63,6 +63,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -395,7 +395,7 @@ index 229b3cc63d2ec0bc5e5797d45efd9ca45f3ea82a..fcf3092ef1863f62d9e76a77c0299ce1
  
      @Override
 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 151bb142c553d733367a92b39b430b536e569480..f96def2ebdf114823c322c2d4318d039e20eab97 100644
+index 09066b7e46a414b44f051ad8fdb4c734cc556db5..8f0583a32156b5dcfe0eb6351ce6a0ce341d1e13 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Squid.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Squid.java
 @@ -74,6 +74,11 @@ public class Squid extends WaterAnimal {
@@ -411,7 +411,7 @@ index 151bb142c553d733367a92b39b430b536e569480..f96def2ebdf114823c322c2d4318d039
  
      @Override
 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 5f61fcffebf4d853711a38d1f315f3def25e31a7..fcd3166a7c818ef089ccf2a687596bef51ad14a6 100644
+index 0ddc45c8dd098b88f12a5a3af8aaa1f7dd928735..2cb3d5d7dc31ff1f23dc2ac5c189172b900c7bf1 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/TropicalFish.java
 @@ -53,6 +53,11 @@ public class TropicalFish extends AbstractSchoolingFish {
@@ -427,7 +427,7 @@ index 5f61fcffebf4d853711a38d1f315f3def25e31a7..fcd3166a7c818ef089ccf2a687596bef
  
      public static String getPredefinedName(int 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 631539a752a038926355c23aeb160af64f363a61..66c01b8300bc09ace27e4d1a30ee9274c69fcc9a 100644
+index 9395787aa7e406fe9585308d17437bce95f8a5a1..f2b55ebd460fbb95d3d7774cb5ea5bf2d38443b5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -100,6 +100,11 @@ public class Turtle extends Animal {
@@ -443,7 +443,7 @@ index 631539a752a038926355c23aeb160af64f363a61..66c01b8300bc09ace27e4d1a30ee9274
  
      public void setHomePos(BlockPos pos) {
 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 bca3300e06d6eb0c6acdfb11d715a1e8447c9198..ae416b70109c959980b3115da6e97df1610996ca 100644
+index e66c2339633f5230ad992d19bad4f12df970d405..2c5fe1e2f4eab38e26ca8ef198f2e6bb2ab20e3c 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -108,6 +108,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -459,7 +459,7 @@ index bca3300e06d6eb0c6acdfb11d715a1e8447c9198..ae416b70109c959980b3115da6e97df1
  
      @Override
 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 f0f1a286011bded016897cc8a0783a8a49a43b33..2542ed327e03c37a3225fac10d4a6659c35512ca 100644
+index a2e0d4653d1a1905d58c684368edf6cedea0b55f..f1c8005c39ead1e61f7d8542711d6ac22be96682 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
 @@ -105,6 +105,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -475,7 +475,7 @@ index f0f1a286011bded016897cc8a0783a8a49a43b33..2542ed327e03c37a3225fac10d4a6659
  
      @Override
 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 cb3b6c1866a4c5c05bc6c7f0d4ac03cd747271fe..0ee42f45a9877ffd6df80e602c3cb5affd43d285 100644
+index 86e022ef4e3f198e3d36c24ed7179cfe3d9e79a0..f006b5c508b9ad2b0bc6d489323bab0322f96241 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
 @@ -82,6 +82,11 @@ public class Goat extends Animal {
@@ -491,7 +491,7 @@ index cb3b6c1866a4c5c05bc6c7f0d4ac03cd747271fe..0ee42f45a9877ffd6df80e602c3cb5af
  
      @Override
 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 fbd96e516ac34f874b0cca2da9076120e29254fb..54401524a2be27e18d5e616e9bb8481007c7af88 100644
+index 63875471d3c4455955028594dded33293bcf8b81..44d5f629da36a88e5245e9a2cff39dd946be4ea1 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
 @@ -124,6 +124,32 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -527,7 +527,7 @@ index fbd96e516ac34f874b0cca2da9076120e29254fb..54401524a2be27e18d5e616e9bb84810
      // Purpur end
  
      @Override
-@@ -1134,7 +1160,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
+@@ -1147,7 +1173,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
              entityData = new AgeableMob.AgeableMobGroupData(0.2F);
          }
  
@@ -537,7 +537,7 @@ index fbd96e516ac34f874b0cca2da9076120e29254fb..54401524a2be27e18d5e616e9bb84810
      }
  
 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 e5b13558f45966bf70593931922ca73f4a66c66a..b4944ab2191241dc604ad21670360e5204bc111b 100644
+index db4d5d5e38a44f85c343b632c914f2252c30a3c3..f0da5d107ddb2987ccc89f880ddba5e79fadf0c5 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
 @@ -20,6 +20,21 @@ public class Donkey extends AbstractChestedHorse {
@@ -563,7 +563,7 @@ index e5b13558f45966bf70593931922ca73f4a66c66a..b4944ab2191241dc604ad21670360e52
  
      @Override
 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 c7b0d6a987644e0b589c143b0b6b68053be04f37..6c6d2ac7551ae24dec88bd9e6bce7aeafd900e8c 100644
+index a91152df3d443d70b1aa9aff97b3746e0331c0a6..9f7203608e15fdce1bfbaf419838768763d61378 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
 @@ -44,6 +44,21 @@ public class Horse extends AbstractHorse {
@@ -589,7 +589,7 @@ index c7b0d6a987644e0b589c143b0b6b68053be04f37..6c6d2ac7551ae24dec88bd9e6bce7aea
  
      @Override
 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 d336e2c63b39b22f9f3a7a84ee059c2d9d71239c..d664be25c2c2c527a44fa939e68e84d60effc144 100644
+index f5616cfbc9bc39a7d8bac37a92110e58ae82b2a2..6ee84f21e5dc64cbd5bdf51acd69fff09494f056 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
 @@ -107,6 +107,21 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -615,7 +615,7 @@ index d336e2c63b39b22f9f3a7a84ee059c2d9d71239c..d664be25c2c2c527a44fa939e68e84d6
  
      public boolean isTraderLlama() {
 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 40cc7e20913938d6e30e6bca9f4ad70fb5e9435b..da3d0b431c14f1a0794b9445236af1f548139013 100644
+index a67061b875468777ee6256c0b28894c62ebb926c..1ba32a3ba56974425762026026d1e5ba21540b3b 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
 @@ -19,6 +19,21 @@ public class Mule extends AbstractChestedHorse {
@@ -641,7 +641,7 @@ index 40cc7e20913938d6e30e6bca9f4ad70fb5e9435b..da3d0b431c14f1a0794b9445236af1f5
  
      @Override
 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 d4057c300d39eca4ff2e11791ce5ba7993d9b66e..ffc36728e0fc90c4e37051adc643a2b8af8077ff 100644
+index a693f5ff830662e3a958af28503bd55a52130952..8bc2c6a3ee0eec08900b96eea3d0d545616bc513 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
 @@ -34,6 +34,21 @@ public class SkeletonHorse extends AbstractHorse {
@@ -693,7 +693,7 @@ index ff252d9ca75b90ab7606f63aa5f89b6230e33a36..c4eb99466c00c6cf1d60c7fa387f8b65
  
      @Override
 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 d328e36015b6b7d6a9e093fbe232eb5ecda46d96..6ca7b168a1ea26102922d9377e52662f16c1e725 100644
+index 77d05979331af91a1fbe619d1c26fa883146add8..48b72eb4051d612648a1978b38299c0c37a3a289 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
 @@ -32,6 +32,21 @@ public class ZombieHorse extends AbstractHorse {
@@ -735,7 +735,7 @@ index 5df112f87fba042f13f615a22a5c6f850b779bf7..d3caa18f5de2d96eae691655dd13e83f
  
      public static AttributeSupplier.Builder createAttributes() {
 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 fdc9068de403e98e18af11d4d6c5b708d2cc3c52..f52420f27f51d9dbf214f96a0530c0f17f2bc5fc 100644
+index 9e9b9996293acd721e183fa752b3742ffc54910f..8a4440f766ea39857c1f1ededeed18313e0f38cb 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
 @@ -196,6 +196,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -760,7 +760,7 @@ index fdc9068de403e98e18af11d4d6c5b708d2cc3c52..f52420f27f51d9dbf214f96a0530c0f1
  
          } else {
 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 a5294012d432d5d1fce570a1eb1b1716a24522de..83f9a1139a501135a89a758993c7ff209b5b92d5 100644
+index 5b3eb1ef97b2c0979e28592e0572231e3d92256d..476bcac41d569a9734aa4e97fc11e4776b454ffc 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -67,6 +67,11 @@ public class Blaze extends Monster {
@@ -792,7 +792,7 @@ index dd05c5f35d78d1385f793f4e34333ff242d136e1..45b53f11b52cc161775fcaa18567e4a7
  
      @Override
 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 b9d23fb187541d734b56bfa48ccc18ee4f6d7e88..3a14f975e26530e1c4887844ec0c3967bd15a05b 100644
+index 9f3c6d6a33fa59cad7ffa40d63b140014b92deb2..20d9da3ddd2bc85954b9bcdab238d902238ba518 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -133,6 +133,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -808,7 +808,7 @@ index b9d23fb187541d734b56bfa48ccc18ee4f6d7e88..3a14f975e26530e1c4887844ec0c3967
  
      @Override
 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 ace909fab2334105eabe0593aba47736e3f67451..591dfcd091c1c4611aeb17dfc5ee493be8131b50 100644
+index 071c77039371688180a189f7715f3d0b62f2287a..a01ee7e62519a3d9f26a4f96360fc9c23ab7e751 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -79,6 +79,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -829,7 +829,7 @@ index ace909fab2334105eabe0593aba47736e3f67451..591dfcd091c1c4611aeb17dfc5ee493b
  
      @Override
 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 5f8233c1be6f92bcf58c5c5db360b2660c9439ad..55f67061aa4a63105059bfecfb153a579472adc0 100644
+index 1f789b1d481234cafaa6e75c36a272bbd064482e..e25374b06e3babd93cd5bbdd58ea401a92dbb001 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ElderGuardian.java
 @@ -40,6 +40,11 @@ public class ElderGuardian extends Guardian {
@@ -845,7 +845,7 @@ index 5f8233c1be6f92bcf58c5c5db360b2660c9439ad..55f67061aa4a63105059bfecfb153a57
  
      public static AttributeSupplier.Builder createAttributes() {
 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 f505cc4fc7945b2b462bc24ee3ecc76995072e14..b92a83cfd15cedf7cd68c26193e65c5f24d9a621 100644
+index b9d8e6d0b7e4d139dada63f0014ef90dd7ca85fc..b0908c864592095a30dc56e010bde02418e2f037 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -93,6 +93,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -861,7 +861,7 @@ index f505cc4fc7945b2b462bc24ee3ecc76995072e14..b92a83cfd15cedf7cd68c26193e65c5f
  
      @Override
 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 1f315cc57f6365a782ca4e645b0dcfbe5485138a..d9e2bc9d37968430910c8de33390004ba5db22a6 100644
+index a7eb3bdb45cfefbe290fdb26bc1444eb46ee8ae6..d5c8cba1c443681e8bf81db1298ea24c954b1136 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -46,6 +46,11 @@ public class Endermite extends Monster {
@@ -877,7 +877,7 @@ index 1f315cc57f6365a782ca4e645b0dcfbe5485138a..d9e2bc9d37968430910c8de33390004b
  
      @Override
 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 053374baf3ec7730bcddf072ddf98e3176656435..0ae0a49da681c6603d6f1504ee58f99b8f345e44 100644
+index 349670deed65a83e4a09e8f71edbb66bd63ff53c..9e50cf5d5b48718b1f8ff74c4de891172970ac12 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -56,6 +56,11 @@ public class Evoker extends SpellcasterIllager {
@@ -893,7 +893,7 @@ index 053374baf3ec7730bcddf072ddf98e3176656435..0ae0a49da681c6603d6f1504ee58f99b
  
      @Override
 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 bb1a6f6847d0e459eb26a029d8a1f5646168a422..e3f479bcc3bd9e28fc4a6ef2f390f79a8e361a3f 100644
+index 8f738130b33b49af84a76f89e1a6b9586adfb420..748eea45acb62cb6180bcf3409c608db2471d164 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 @@ -71,6 +71,11 @@ public class Ghast extends FlyingMob implements Enemy {
@@ -927,7 +927,7 @@ index d95b110a025d48e7ab18f172e455593740e45252..c67f33f2e2e0ff5c2a85782185103325
  
      @Override
 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 20b7104b7fd38b3c6c05a68a1472c6006814cb81..2a25dbf9449ebc63587f24346ee92bd3115ad4d6 100644
+index e825e974c8586928dbc18c5d69071e17ccfe01c5..add17a3a1766172cfbcec9651c93cb89e020c31d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Guardian.java
 @@ -87,6 +87,11 @@ public class Guardian extends Monster {
@@ -943,7 +943,7 @@ index 20b7104b7fd38b3c6c05a68a1472c6006814cb81..2a25dbf9449ebc63587f24346ee92bd3
  
      @Override
 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 75397a8e1ae8d48bf07f5c0409536acd54851c48..464e062bba03a17c9281b3dfb8fa9193c1b81150 100644
+index 82a14d717e8f2ee005c2c410625b811cd016cdc3..81a3f6c1774b187be96b412dae44be623ce7f6cb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
 @@ -32,6 +32,16 @@ public class Husk extends Zombie {
@@ -964,7 +964,7 @@ index 75397a8e1ae8d48bf07f5c0409536acd54851c48..464e062bba03a17c9281b3dfb8fa9193
  
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 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 5f57c14a7ba03af9432a839e6caed47286638b2c..c4c239ab51c48a2b9c12e547dc7e125955911794 100644
+index c03e5836a313876d856c6318b288946c4ebd1af9..23074f7dd2e670e884ac5f6386c16e853bb0144f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 @@ -69,6 +69,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
@@ -982,7 +982,7 @@ index 5f57c14a7ba03af9432a839e6caed47286638b2c..c4c239ab51c48a2b9c12e547dc7e1259
  
      @Override
 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 7d39f25734f2c52b11931e141524acd2c244c2c5..87aae8fa18704e58f2b1fc0abd1a98987715123f 100644
+index 95741b63d68bdf815212d718c3cc0fc689c0e4de..68abf045f0510abc45bdc2fd8c147f27c2fa784d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -42,6 +42,16 @@ public class MagmaCube extends Slime {
@@ -1003,7 +1003,7 @@ index 7d39f25734f2c52b11931e141524acd2c244c2c5..87aae8fa18704e58f2b1fc0abd1a9898
  
      public static AttributeSupplier.Builder createAttributes() {
 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 61aff98a7b56eab6a43ddc9f07618cbbedb6b77d..5e069ac0c57d2a3a23f6e4483d12ce298d172691 100644
+index fda285444538ae09cef15ecc0f68836902f3c474..5e71b3d5126d30626fbc9bd4b9eefebd20916e60 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -112,6 +112,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -1019,7 +1019,7 @@ index 61aff98a7b56eab6a43ddc9f07618cbbedb6b77d..5e069ac0c57d2a3a23f6e4483d12ce29
  
      @Override
 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 84bd5e7df663f315fd099742195e85508ea25adf..48a1bd4c9c7e36e42797937ea1af3d213f418da4 100644
+index 2137f8133f03467667296f94a26a285288e8c352..4276c33261995dba3fb71c7b700e550824fcd123 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 @@ -76,6 +76,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
@@ -1035,7 +1035,7 @@ index 84bd5e7df663f315fd099742195e85508ea25adf..48a1bd4c9c7e36e42797937ea1af3d21
  
      @Override
 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 32ef769b2b3e3ab42c7a50bf4c8ec7ec548d5e7b..b8c753a574487cdc045ea334229aafd257d6e223 100644
+index 23b0fe96aab0234e17c43423817c4f34c694751a..13f4b6d17312dd7379875eb56049c87c10deae88 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ravager.java
 @@ -86,6 +86,11 @@ public class Ravager extends Raider {
@@ -1051,7 +1051,7 @@ index 32ef769b2b3e3ab42c7a50bf4c8ec7ec548d5e7b..b8c753a574487cdc045ea334229aafd2
  
      @Override
 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 42635be6183d86978df3f174c74a71691f2bfcdd..d6fdaa9f9033d8b1e8aa9ef0aace387e286ebce9 100644
+index ec41c07f2f7d7c4c24b54a2fbf5cd2b73d8d1247..6a0a82498360d1721f8cdb5801552379943a76b6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -102,6 +102,11 @@ public class Shulker extends AbstractGolem implements Enemy {
@@ -1067,7 +1067,7 @@ index 42635be6183d86978df3f174c74a71691f2bfcdd..d6fdaa9f9033d8b1e8aa9ef0aace387e
  
      @Override
 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 e66cc79dc61721b31ffb743f68f4388cc499a92d..0d60d6352294fadc1a26579a712b01cf0da681af 100644
+index 44d8ef55d47ff63589e6b47210f460a04a146291..1c523c384668b483ba0211c413ade7b87c7ca16a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 @@ -49,6 +49,11 @@ public class Silverfish extends Monster {
@@ -1083,7 +1083,7 @@ index e66cc79dc61721b31ffb743f68f4388cc499a92d..0d60d6352294fadc1a26579a712b01cf
  
      @Override
 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 059a62da29b7ec11e2ff9baf18dde788bec4923c..5a2759e636717920a6b34ddbda34a1106a88714b 100644
+index 8bfcfbae5046e3089b85194cfb1fe1a57d285647..2e7cf694805927e251f9208b377a807a60ac13cf 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -35,6 +35,11 @@ public class Skeleton extends AbstractSkeleton {
@@ -1099,7 +1099,7 @@ index 059a62da29b7ec11e2ff9baf18dde788bec4923c..5a2759e636717920a6b34ddbda34a110
  
      @Override
 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 342c6158f6fc145a779ed60b48698e14a944726b..01d04bf183743bf892be25fe839f3f5cf7ccff42 100644
+index cf5e780a1708c7d72bb07da2565792fa09a87c77..7f3b89aa8bd92f821baa31b3fe47a02c43b6a3ca 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -101,6 +101,30 @@ public class Slime extends Mob implements Enemy {
@@ -1143,7 +1143,7 @@ index 342c6158f6fc145a779ed60b48698e14a944726b..01d04bf183743bf892be25fe839f3f5c
          this.getAttribute(Attributes.ATTACK_DAMAGE).setBaseValue((double) j);
          if (heal) {
 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 5874d86ca34200e9ce7d41cf7a80eb0f1f13410c..7ed31ccc9fbb3960f9de24d5893f7fa1f86ab4b8 100644
+index 62760822ef8837d20dfa7ed92a64e14574098c23..20100770115430c100ab73a341ae7f613e50f4f0 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -61,6 +61,11 @@ public class Spider extends Monster {
@@ -1159,7 +1159,7 @@ index 5874d86ca34200e9ce7d41cf7a80eb0f1f13410c..7ed31ccc9fbb3960f9de24d5893f7fa1
  
      @Override
 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 6a8a0cd09e0bf17c7ecb6e55342b645f111dac22..d2eb323c8957ac4ccdf2ab73d83dbbdeefd6ae53 100644
+index 8480687e452b7cad0d3e434cebe17e15c59bdc40..86b1c7a1ddd33249ce3d1ff25030d4218058af2c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -31,6 +31,11 @@ public class Stray extends AbstractSkeleton {
@@ -1175,7 +1175,7 @@ index 6a8a0cd09e0bf17c7ecb6e55342b645f111dac22..d2eb323c8957ac4ccdf2ab73d83dbbde
  
      public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 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 6c0af80f47c53e4573efb0c50412d289c0bb5540..2d7b83ce2e0e26ef3976514ec8921a718ccc28bd 100644
+index dcf31bc288e8371c17574a3dd4b495ea2c7a8dac..0f7383849399db1218acda986fe29ac14a36d768 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -107,6 +107,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -1191,7 +1191,7 @@ index 6c0af80f47c53e4573efb0c50412d289c0bb5540..2d7b83ce2e0e26ef3976514ec8921a71
  
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, Random random) {
 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 c914cfc75cc0426c0333a6bb30aab7b9e4c52971..18d650befe5f257b9e8f269e605de70d4201dd5c 100644
+index 589a6f8db279c52cc7f19d7c14d08bf46ebffd7c..620b1692bda9c69ba39547b0bdcfd408a62bc5e6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -94,6 +94,11 @@ public class Vex extends Monster {
@@ -1207,7 +1207,7 @@ index c914cfc75cc0426c0333a6bb30aab7b9e4c52971..18d650befe5f257b9e8f269e605de70d
  
      @Override
 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 a3b1332a92824255b807adc9a5a1d29569e7073b..76e6ea34db3942e9dd7646ad7ca1259f4387a4d8 100644
+index cbd170cec638dfcd19c2d597e2b39bbcf38c570d..9b4a20a78f24d4b05fefbf2a7d05686ef9cc8adb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -67,6 +67,11 @@ public class Vindicator extends AbstractIllager {
@@ -1223,7 +1223,7 @@ index a3b1332a92824255b807adc9a5a1d29569e7073b..76e6ea34db3942e9dd7646ad7ca1259f
  
      @Override
 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 e70fb661c62add74cdbe9fc9ef1e3143e96333b2..0876224d15b7b08954ab4348f942d2aaf91aa078 100644
+index 0eb8010cc701014d5dd9b6c1ec167e0befcedeb9..9e0f91d4aa1c52d865e9f27ff876590740d6f650 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -70,6 +70,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -1239,7 +1239,7 @@ index e70fb661c62add74cdbe9fc9ef1e3143e96333b2..0876224d15b7b08954ab4348f942d2aa
  
      @Override
 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 4cea4ba127dc036ce5d585323a25bbcf06bd46a6..16d7266c32f5aa5cb980bf07d9d92c41c6405a2f 100644
+index 570a7f7c63cae90563129dc04aeb76a0d97ffcc3..5f01beb931546a8bfc714754a65c1c9dbd2ebf8b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -44,6 +44,11 @@ public class WitherSkeleton extends AbstractSkeleton {
@@ -1255,7 +1255,7 @@ index 4cea4ba127dc036ce5d585323a25bbcf06bd46a6..16d7266c32f5aa5cb980bf07d9d92c41
  
      @Override
 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 8fd4e26ebe0527fd8a69b15095dd4091fcdde206..7afc9b83e385d711096db5ea9c6c259fd2387075 100644
+index 175ff8a67b4ac28efef112bd75508a059d6c1f50..1d5726b5ae153cb51fb0e4d343ed999335098869 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 @@ -77,6 +77,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -1271,7 +1271,7 @@ index 8fd4e26ebe0527fd8a69b15095dd4091fcdde206..7afc9b83e385d711096db5ea9c6c259f
  
      @Override
 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 6dee348b4e1faec208e5144527ca3df0dab4f96e..c3288e6a5be2c0805067fe14496315afd6156110 100644
+index 9d911c5e217207e3030f9dec2daef64ae5d09e7f..dd9a7494184f36b64ea8461750a1cff4178e13aa 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -117,6 +117,11 @@ public class Zombie extends Monster {
@@ -1317,7 +1317,7 @@ index d487b4cb2da18eac12ec3dc71997cdc1217a85f6..9c60e3b3e62a29d6898c82a4110ffd4d
  
      @Override
 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 708ba2c64a0736a30e477017b46dc711948cfc3d..8464026df1b46ad30301fed4944aa1d3cd39bd9e 100644
+index 8e5fb46d3c56a71788d02eb1865b597553c7de8e..cc5bd132bbd40aba8c910695f25a896c5f4fe635 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -68,6 +68,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -1342,7 +1342,7 @@ index 708ba2c64a0736a30e477017b46dc711948cfc3d..8464026df1b46ad30301fed4944aa1d3
  
      @Override
 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 060676e094c425ab11889ee221808e5814d34f43..fb0aa2854f8be22682ee65298080b668c722f447 100644
+index aabaf7feef222515bf59a5c3e33ee624168f46a8..2cd4f8b34611f20aaee1eba89ac831bb00c3470f 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
 @@ -77,6 +77,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1358,7 +1358,7 @@ index 060676e094c425ab11889ee221808e5814d34f43..fb0aa2854f8be22682ee65298080b668
  
      @Override
 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 ace6891fd0e14af5268249b60e14a99c17a2f435..79f075e7d7e5d8312f5a9ed47bea2a558b9491d5 100644
+index 34fbe1853742dcbd6d0abd45bebcb3a21422d0b0..e395f540590b9a820fb445e31ab48b79493bd2ff 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
 @@ -107,6 +107,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1374,7 +1374,7 @@ index ace6891fd0e14af5268249b60e14a99c17a2f435..79f075e7d7e5d8312f5a9ed47bea2a55
  
      @Override
 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 d01a8fe6dd5c84ea5b7370a90c0d57130b27e447..9e66f8f2a92cb7b32cdb2cf749ca273759efa6eb 100644
+index 5025d4571a34fe9e0e58ada6b81b064716b8f672..f6734f2eb44af7b2389de5079831e0e4f8a1c742 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
 @@ -50,6 +50,11 @@ public class PiglinBrute extends AbstractPiglin {
@@ -1390,7 +1390,7 @@ index d01a8fe6dd5c84ea5b7370a90c0d57130b27e447..9e66f8f2a92cb7b32cdb2cf749ca2737
  
      public static AttributeSupplier.Builder createAttributes() {
 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 8a37e6b42a50da4822389004123e3b72b33f50b4..682feb6f3c109b0b3034f3942f7dfa73721d359b 100644
+index 7d10225fd52c4291f13eb644716aa3949c6037e6..209028dd99690d1cc8589581aac47b3603d526d5 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -172,6 +172,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1406,7 +1406,7 @@ index 8a37e6b42a50da4822389004123e3b72b33f50b4..682feb6f3c109b0b3034f3942f7dfa73
  
      @Override
 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 d6c31596e21041a124a263054ccb6447829eccdd..d2588a91b55aebdecf8e1644498111ccf84a9dc9 100644
+index ab648e7dafd78f414646cef96b422e87da5c1982..0bcfece84ac11f04671ed38a99b31da9f8b03858 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -77,6 +77,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill