add "use-dismounts-underwater-tag" to fix ridables in water

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

@@ -55,7 +55,7 @@ index e8798de526e2836308eca8e5f4a4388aa7e9d3c0..1152cdb64ff72358292400d33a4a4f3c
          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 24733d2b967cc9d332ad8c3b8beb0c141e18ee77..f0ba6e7971090e086fd7a70a510ae91c104f0ae9 100644
+index a48d40e4242f35c6830286739172459635be3e43..da2b0dfd8a3c033488a1e5d928c40fd66ada5091 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -93,6 +93,18 @@ public class Bat extends AmbientCreature {
@@ -78,7 +78,7 @@ index 24733d2b967cc9d332ad8c3b8beb0c141e18ee77..f0ba6e7971090e086fd7a70a510ae91c
  
      @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 605707839ca61c24d4a30e7a219875be09512ade..1ff79871121944864da0b5179bba17f97c551608 100644
+index 9881c77aca7a0b25d1dda9c5a89c367df516743f..c0b85da9cce5ec75d83945ba7b4d2fc823105103 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
 @@ -214,6 +214,11 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
@@ -94,7 +94,7 @@ index 605707839ca61c24d4a30e7a219875be09512ade..1ff79871121944864da0b5179bba17f9
  
      @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 516186c322114d835141ce6440df7c0232272b72..61f83ec67c68dfafbdb11ed88f02d2be526ab7f9 100644
+index a708cacf755ce82042452558bef3140361b945c2..944da53f7f48e5218c12b7fd4bb443621cafc331 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
 @@ -120,6 +120,11 @@ public class Cat extends TamableAnimal implements VariantHolder<CatVariant> {
@@ -110,7 +110,7 @@ index 516186c322114d835141ce6440df7c0232272b72..61f83ec67c68dfafbdb11ed88f02d2be
  
      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 526a7104ef44a7ccb24b9afada7cb602f8a8b7a9..f28e6daa41e99f1279c79e2392a76ca6f51c1b4b 100644
+index a2c72f9c90aa95d50ee9fb0e278171a6a0cee2a5..5207a2a8c06cd413e1d62c5eec7a232dce952b8b 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Chicken.java
 @@ -69,6 +69,11 @@ public class Chicken extends Animal {
@@ -142,7 +142,7 @@ index 718b064fa3fb3d1a00f786ff839c91ce88ae4f70..47b537deac66f93a66a1df007b2bb8af
  
      @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 f71ba5d1a52f7e23d23939e91049e8aa9fbd15b0..29720c0681b5c08e3a7ac5b07c6d83a1760297f1 100644
+index 2424ff760fc7dd91962e070f373ebf8e21f41b7d..e24173dcd6f083a3ae61edcf71bb7236d644a422 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Cow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Cow.java
 @@ -56,6 +56,11 @@ public class Cow extends Animal {
@@ -174,7 +174,7 @@ index 106caca10bdd8dd546b6de24594afe236c8f7ce8..0accc5595461ce92259e3f819a9837aa
  
      @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 2557e8dbc13cdb3ea64781b029a0bdf1341b4e04..7a6239897d03a0502addc42853414e6d0caa42c3 100644
+index eb7f96f7b1583dfeb8e57a1984ed8cabeac0a2fe..5de86c59bf857e6697bb768e3dd71a05739fb3d2 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Fox.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Fox.java
 @@ -177,6 +177,11 @@ public class Fox extends Animal implements VariantHolder<Fox.Type> {
@@ -190,7 +190,7 @@ index 2557e8dbc13cdb3ea64781b029a0bdf1341b4e04..7a6239897d03a0502addc42853414e6d
  
      @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 b78ef3626fe62d79e9edbf3279cb2cc773a6be32..5a3da8390d1b8b4e818da42578174f2016f73407 100644
+index 44db31b9f93970a65735eab4850dc799e6bdf002..ca4ef2397582245b52c73b12f80e876e03bb7e55 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/IronGolem.java
 @@ -84,6 +84,11 @@ public class IronGolem extends AbstractGolem implements NeutralMob {
@@ -206,7 +206,7 @@ index b78ef3626fe62d79e9edbf3279cb2cc773a6be32..5a3da8390d1b8b4e818da42578174f20
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
-index 1e9c75d9fd41c164d8853488fdbe4ed145e0f004..a63f8764ae8f0fce4e0de5799de7da3a82ceb80d 100644
+index b27e7381db833f4583a32b4276caddf277f5d25c..b1c2663a7f42714a620d59096f26f0a965875846 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
 @@ -78,6 +78,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -222,7 +222,7 @@ index 1e9c75d9fd41c164d8853488fdbe4ed145e0f004..a63f8764ae8f0fce4e0de5799de7da3a
  
      @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 939b1e9c9eb6d364658ad5a6ade44f17443969f7..5b2996a782e8f2ad01c587aac113074c5c382da0 100644
+index 04bb867096f6d8203ec5058f9958704f8efada71..c4d36725c614d4fb2a7d097ea5c5cd381b758e92 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Ocelot.java
 @@ -83,6 +83,11 @@ public class Ocelot extends Animal {
@@ -238,7 +238,7 @@ index 939b1e9c9eb6d364658ad5a6ade44f17443969f7..5b2996a782e8f2ad01c587aac113074c
  
      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 a4a244ecc85d478faea0b1bd17809c77a8d88830..e5156dba9cf467e73c2376ffabafc437bc9e3536 100644
+index 5212e531d500fa7272561fea4fc62d15a077c7d6..a5654221f7488c66582b6d97565b96ea7abb6f14 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
 @@ -132,6 +132,12 @@ public class Panda extends Animal {
@@ -267,7 +267,7 @@ index a4a244ecc85d478faea0b1bd17809c77a8d88830..e5156dba9cf467e73c2376ffabafc437
  
          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 23209f27c02bdd7e7a986cca03e90f03057024f3..e031a0a60253d896788cf14aaf65d4001d74d9a8 100644
+index 644324e05f5bc82beb911a65085a1b8dbf7259ab..d3e9288928ac3a0132050b4aa3b6098b4dc293c0 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Parrot.java
 @@ -189,6 +189,11 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -283,7 +283,7 @@ index 23209f27c02bdd7e7a986cca03e90f03057024f3..e031a0a60253d896788cf14aaf65d400
  
      @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 d08e6947504f19edb0b9631c5ed78836cdc777dc..03844563434133a8fab4db4c597d35d4a745a12f 100644
+index 5d7a865a59c523c9575a00391543f375a05c5829..17cd8463fa5b601946782174f0a0a77a93aacf4d 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Pig.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Pig.java
 @@ -79,6 +79,11 @@ public class Pig extends Animal implements ItemSteerable, Saddleable {
@@ -299,7 +299,7 @@ index d08e6947504f19edb0b9631c5ed78836cdc777dc..03844563434133a8fab4db4c597d35d4
  
      @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 697562ad6259a0857fb29da71046bcb696ca2a48..e7b6e42aabe30b7804bf2d98d2b4d393621e1d7b 100644
+index 16ee121aa80656d33ffdf82dc81679ab94adeb98..90e5114a5c1a341d0ac64d72d6306ddeb09cb728 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/PolarBear.java
 @@ -92,6 +92,11 @@ public class PolarBear extends Animal implements NeutralMob {
@@ -331,7 +331,7 @@ index 1190a22f03aaf7f2c3b53bdfd9afac00200f77f4..acfff1e2a54471013c3524e482d35d32
  
      @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 2fe90301d15895863bd7651e7f6ce52635e4e4b1..76dcd7430dbadc6b925f58b670a9eb59078b2882 100644
+index a465925fdef618110bbf997b8ab43ed4e601cb6d..ebb85ac5b77450a1ae91c986512125814fa0907f 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Rabbit.java
 @@ -135,6 +135,11 @@ public class Rabbit extends Animal implements VariantHolder<Rabbit.Variant> {
@@ -363,7 +363,7 @@ index cc1e6f9d0ee241f32878ed96820f17ccb72396ba..2d525af3955a1f6dfbd21f07d813a832
  
      @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 6da1ab2aa26a1e09d20176504c2134b4cdad17b3..0b9c36f130a0ccd62bbf2418896627553bc61225 100644
+index 99c55d6bae08d75ae19c5dc004ca577e44b589a4..ce2bac7cc95dca0f3d8c97ba6d7cf922d328c579 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
 @@ -131,6 +131,11 @@ public class Sheep extends Animal implements Shearable {
@@ -379,7 +379,7 @@ index 6da1ab2aa26a1e09d20176504c2134b4cdad17b3..0b9c36f130a0ccd62bbf241889662755
  
      @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 e50847a88228d1b71d59339a633911911218f912..6f6542f57ed942de91957edf49ef8d92b5233aa8 100644
+index 383302ab11d2e62cc4ca135fda9c1ebe566491e5..7da9fcf10e6480a71d7a3e9934bb91320cac227e 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
 @@ -69,6 +69,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -427,7 +427,7 @@ index 7c90f91685845329845a8c81f87ad9f6fdf4d973..948d86a125648300a258e08200bb90e9
  
      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 fbfae6297769d79b87b0db63a88ce4f904d801d0..31c98011ee4521acebf8d452f135e534ffafd64c 100644
+index ea66c2976401752688fdf9ee44802c79ea8545a1..67c8f06d1befaf810e3954dbda156ee29bfbc0d4 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
 @@ -98,6 +98,11 @@ public class Turtle extends Animal {
@@ -443,7 +443,7 @@ index fbfae6297769d79b87b0db63a88ce4f904d801d0..31c98011ee4521acebf8d452f135e534
  
      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 c35cd3d995bac317396aedff007e9bf7e132f1a0..4713da69b3f45bfcf423726feff2800560494306 100644
+index c8a18ecd36393747a95ad9026c5a7b1d62ff727a..05792466a89bdcffe1a4241761b7c23afcc6bc88 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 @@ -122,6 +122,11 @@ public class Wolf extends TamableAnimal implements NeutralMob {
@@ -475,7 +475,7 @@ index f30aad7e722f895b8f6966f042021fc80f470994..eaf2e6b9865a36b7c648bd1205db922a
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
-index 47a9e7a036e647c05d8abebdda4cab0d69aac997..bc74bae29b8426ced84e203edb0c41065062f422 100644
+index 473b801645a62c89ed680f993761dcb64f73bc01..30ff9967aa19a9e77bdf7d32e494276b1b72ab72 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/sniffer/Sniffer.java
 @@ -96,6 +96,11 @@ public class Sniffer extends Animal {
@@ -491,7 +491,7 @@ index 47a9e7a036e647c05d8abebdda4cab0d69aac997..bc74bae29b8426ced84e203edb0c4106
  
      // CraftBukkit start - SPIGOT-7295: moved from constructor to appropriate location
 diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index d4561ddfd79e80414ce006d54b90a45345017378..09ed5144c448f7620b5c856a9fa12da07ec0cce6 100644
+index 165f3a058caf6ce5fd346b7f46969b67ea75f003..a23458734a192425ddbec9b114d8485d8e7a2bd3 100644
 --- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -161,6 +161,11 @@ public class EnderDragon extends Mob implements Enemy {
@@ -507,7 +507,7 @@ index d4561ddfd79e80414ce006d54b90a45345017378..09ed5144c448f7620b5c856a9fa12da0
  
      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 da20eee9d210cd13dc47dea7294043d61a78f41d..33ce9424b8b60d5673ebabe9e62ca03ac84190b8 100644
+index 1001ef99f28a4f4f29e48d6ae9e3cb1bcfa27686..a6a9628f0e467f2b38dd346d90862f19712b3016 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
 @@ -224,6 +224,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -532,7 +532,7 @@ index da20eee9d210cd13dc47dea7294043d61a78f41d..33ce9424b8b60d5673ebabe9e62ca03a
  
          } 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 9fc8bc954be035ec75fce21f4317330b64ae66a0..ae291e741f283d2e56f55512608f5852ef266ccd 100644
+index 4fe550dc61b64b6c16731a5bf21d4144f3e257c0..60d51823442d86b3aef502bda3f6d5b18ae1aa4c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Blaze.java
 @@ -72,6 +72,11 @@ public class Blaze extends Monster {
@@ -548,7 +548,7 @@ index 9fc8bc954be035ec75fce21f4317330b64ae66a0..ae291e741f283d2e56f55512608f5852
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
-index 342da1b83b5c00fb99bd7dedaccf986de0a8cad2..90dc6df729e72c7925ed2c3d36debb92989b2646 100644
+index 2795153f9f27ab0017dd29dc6d90737e890d6a6e..20f1a73a13e0c43ef7423ae1e50f63ed4910b0e4 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/CaveSpider.java
 @@ -43,6 +43,11 @@ public class CaveSpider extends Spider {
@@ -564,7 +564,7 @@ index 342da1b83b5c00fb99bd7dedaccf986de0a8cad2..90dc6df729e72c7925ed2c3d36debb92
  
      @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 45ba62391e2732377c3b92202773ec5d32cc59c4..b128c8bf3c655464d0c279f32eb9a1968fcccc71 100644
+index a3b52b0aa442a2c69f8bec7004db5ea913919d30..50fa28f8348625be15e93800e2c071e243afd39a 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java
 @@ -137,6 +137,11 @@ public class Creeper extends Monster implements PowerableMob {
@@ -580,7 +580,7 @@ index 45ba62391e2732377c3b92202773ec5d32cc59c4..b128c8bf3c655464d0c279f32eb9a196
  
      @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 d59a28657f3d776ae54528287dff80e88ec17db3..edfc149ef228954fe0900439c8bf25f4249b28e2 100644
+index 4d1d5a7608e20d684c1942c9c241c84cd7097d96..0139d890c22db09c4b67a1e1bcf179a6571c7cd6 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Drowned.java
 @@ -83,6 +83,16 @@ public class Drowned extends Zombie implements RangedAttackMob {
@@ -617,7 +617,7 @@ index 4fbae6e88daaabfce22bb9d6e60e02a109e5178a..84bac517860c565d26dfa31ee06fac5c
  
      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 9c5b2a694ba3d29669fb6855e72090e7912e842d..6e93faa6debeba159664401a49ddd5ca159abf80 100644
+index db5427939d62434ad2d3271e44ffad58b96f121b..b7b2762ff6b01da9a3df0ab0add6d50efd76db8d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -107,6 +107,11 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -633,7 +633,7 @@ index 9c5b2a694ba3d29669fb6855e72090e7912e842d..6e93faa6debeba159664401a49ddd5ca
  
      @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 a83131974a1ce9d24003534767c330eefbac5c96..294eb415d57cf28489d8cfd3d3a9102b9bbe9e9a 100644
+index 4b24821b3161e448da76b6484df7bcb66cfc0acc..93f91c171a0c4dbb875bbfdd239f38bcd6b5b5a3 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Endermite.java
 @@ -52,6 +52,11 @@ public class Endermite extends Monster {
@@ -649,7 +649,7 @@ index a83131974a1ce9d24003534767c330eefbac5c96..294eb415d57cf28489d8cfd3d3a9102b
  
      @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 cc1f8cd24a360937ce26d39868053f26bbae198f..d0342c28f028a26536ef8e42302ea310a6064a18 100644
+index 1482bddc996df22e9542e7934d99bfe29a325af0..bbcbccaeb479cc61adab96da2670ca31a1fda740 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Evoker.java
 @@ -63,6 +63,11 @@ public class Evoker extends SpellcasterIllager {
@@ -665,7 +665,7 @@ index cc1f8cd24a360937ce26d39868053f26bbae198f..d0342c28f028a26536ef8e42302ea310
  
      @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 5f6abfe412f205b13ec6ac249d97a6e7bbc87809..b21d8d069caffe9c7a6f5a856fb91d5c5b60567e 100644
+index 3a3dbf3721cae13b5e5cbc98aaf74b7ecd9e2263..6fa4c22fd5ec9d981ac36dc3bd2871aacaff3be1 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java
 @@ -76,6 +76,11 @@ public class Ghast extends FlyingMob implements Enemy {
@@ -681,7 +681,7 @@ index 5f6abfe412f205b13ec6ac249d97a6e7bbc87809..b21d8d069caffe9c7a6f5a856fb91d5c
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 4e21b0eb57cde5d5cea59b1971367de25a4118e0..a57299a152eb05d49fed58eda6aaa29c0b5f1362 100644
+index 6971cb46087aabcda66cd04c494a822886104b04..2019896dee313bcc982686fc665d1cb3e2d40503 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
 @@ -35,6 +35,13 @@ public class Giant extends Monster {
@@ -715,7 +715,7 @@ index ba03f3e524b9ba8e8767b9e3133e96782b5d4267..4292174f1f6c77374aecf74f1ed81929
  
      @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 22b5748f86f8f51204ce59bf9cd6282aaadae767..80bb77199791a312216e8366275e5b0e1c8b14fa 100644
+index 1e2bc8b2c90599134d513e9062a2fb81c7c046b1..4dc604f2d36494bbe139b7ef4649089207dd092f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Husk.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Husk.java
 @@ -37,6 +37,16 @@ public class Husk extends Zombie {
@@ -736,7 +736,7 @@ index 22b5748f86f8f51204ce59bf9cd6282aaadae767..80bb77199791a312216e8366275e5b0e
  
      public static boolean checkHuskSpawnRules(EntityType<Husk> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 590313ec852cac17ab6cc27337d42ed9b30662fe..a9c0989d23a11ea9273712aa0e98bf275376abef 100644
+index 91e048a14366aec2142ca36c3a8081eea6af0052..a22756ed865dfa583029a742f3e9f9c80e1533ad 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Illusioner.java
 @@ -74,6 +74,13 @@ public class Illusioner extends SpellcasterIllager implements RangedAttackMob {
@@ -754,7 +754,7 @@ index 590313ec852cac17ab6cc27337d42ed9b30662fe..a9c0989d23a11ea9273712aa0e98bf27
  
      @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 106e01b931f5b04269b280bbb82a732caaba9259..9e73c3c79fcbbb17015f00cf300de3e5447c3c29 100644
+index b51f11fe8366ba15e02083a50ee401e1f335fbb6..c78bc3ca4324905d03e789c516d6a9a7226e072d 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/MagmaCube.java
 @@ -45,6 +45,26 @@ public class MagmaCube extends Slime {
@@ -785,7 +785,7 @@ index 106e01b931f5b04269b280bbb82a732caaba9259..9e73c3c79fcbbb17015f00cf300de3e5
  
      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 fd9c107bbaea0daea1882f3715956c28448580b8..8a592993aedc72d8ffe1b1ad5e526cc292d69737 100644
+index 736610f5d1e180b4df68a9355adce9b8135268ff..e271555ac03fcbb565a7fe08efdc9a6036164e74 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -116,6 +116,21 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -823,7 +823,7 @@ index fd9c107bbaea0daea1882f3715956c28448580b8..8a592993aedc72d8ffe1b1ad5e526cc2
  
      public int getPhantomSize() {
 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 6fc3af5989a41f3e0f18ae14453fcd8388ea940a..f1eb424f1c4c15f777350603543bdf6613c97019 100644
+index f2a8dffecc27ec45e3f7341cb67a2bd783400f4a..ea1da86fef146a50a6908cbc51fab9d195693aeb 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Pillager.java
 @@ -77,6 +77,11 @@ public class Pillager extends AbstractIllager implements CrossbowAttackMob, Inve
@@ -839,7 +839,7 @@ index 6fc3af5989a41f3e0f18ae14453fcd8388ea940a..f1eb424f1c4c15f777350603543bdf66
  
      @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 a345d9a16831257d06f0b6ae43d2aa50a1adfc91..2a176517488bbe0804deaf3948dcfe7eee9e9089 100644
+index 78bd5a76f105ff1ebf005ccb2590b4a04934ebb2..2d592307f42ede8a490c072da9ec796b2e356f0a 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 {
@@ -855,7 +855,7 @@ index a345d9a16831257d06f0b6ae43d2aa50a1adfc91..2a176517488bbe0804deaf3948dcfe7e
  
      @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 46edc9ea9b5cd352d87996937aeb076f93114907..8276c8cb76f36e99ec09c0cede5aeac90dfd11fb 100644
+index e46bd4944801c75a197e67ef66b5e87517a68a03..a17cb25071132d601ff42f884f2e668328c7df41 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
 @@ -110,6 +110,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -871,7 +871,7 @@ index 46edc9ea9b5cd352d87996937aeb076f93114907..8276c8cb76f36e99ec09c0cede5aeac9
  
      @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 589c19f5d512c2256b1ddfe306f6b0cbeb6e850b..8efc8d6e05da041efb61776ac0b5363f31f8bb4f 100644
+index cebde559bfb922e279cfcee9c34b971441d5681d..77204ec0e18807dd46cadb515b07a919b1bee16b 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Silverfish.java
 @@ -57,6 +57,11 @@ public class Silverfish extends Monster {
@@ -887,7 +887,7 @@ index 589c19f5d512c2256b1ddfe306f6b0cbeb6e850b..8efc8d6e05da041efb61776ac0b5363f
  
      @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 c871416d5ec80a41034c14dce4e8c839b3091e3e..46caa30dec30b62add4cdb41932f3268c07dac67 100644
+index 7a2e0b0e30ef1155061ecad4a517a19078b71984..9a37727b61174caad397fb6e634e50bbc79db13c 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Skeleton.java
 @@ -41,6 +41,11 @@ public class Skeleton extends AbstractSkeleton {
@@ -903,7 +903,7 @@ index c871416d5ec80a41034c14dce4e8c839b3091e3e..46caa30dec30b62add4cdb41932f3268
  
      @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 19e1c0bd1516732826672642e54dc0813d413f10..a773fc3a5f7a16c382188e2419d58d009a2af5a7 100644
+index 0e0f82403add7912f512a675fc1c9328d61b4ff3..fef4d7beee5bb856e80fe2f6a8358ffb291bbc9e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
 @@ -104,6 +104,37 @@ public class Slime extends Mob implements Enemy {
@@ -957,7 +957,7 @@ index 19e1c0bd1516732826672642e54dc0813d413f10..a773fc3a5f7a16c382188e2419d58d00
              this.setHealth(this.getMaxHealth());
          }
 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 0e8d114813da3c47021ad32c45cac23217dfbc4c..e3d3690bb8cec0c610da7ddf781ebff165de418f 100644
+index ca13dbeea191b7508abbf7a89c3cf182ce0cfa09..f40f9c319cc1b353f03172230e35dbecc722bfd5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -66,6 +66,11 @@ public class Spider extends Monster {
@@ -973,7 +973,7 @@ index 0e8d114813da3c47021ad32c45cac23217dfbc4c..e3d3690bb8cec0c610da7ddf781ebff1
  
      @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 4c81ea7cea571d8e4afb07c2bc84d1d1a8b33f3f..a0247b8e29aad13c2c6f90f686664cfae99c6acd 100644
+index 03a0dc6594b423191ec5c54252c37081a12a19a9..09a37553503c4cfa3dcd1d68cba5470f90a5388f 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Stray.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Stray.java
 @@ -36,6 +36,11 @@ public class Stray extends AbstractSkeleton {
@@ -989,7 +989,7 @@ index 4c81ea7cea571d8e4afb07c2bc84d1d1a8b33f3f..a0247b8e29aad13c2c6f90f686664cfa
  
      public static boolean checkStraySpawnRules(EntityType<Stray> type, ServerLevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 486111443d2557dde8c75aef6855bc749c2487de..b512ac4b75e53c272a3c41fb5b66c84b6b0e9847 100644
+index da652fdb3afbdae1a26d76a2669b57affbfecd84..0a480333373c3f3a9504d0b4a3e00fba2e8b2e15 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
 @@ -115,6 +115,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -1005,7 +1005,7 @@ index 486111443d2557dde8c75aef6855bc749c2487de..b512ac4b75e53c272a3c41fb5b66c84b
  
      public static boolean checkStriderSpawnRules(EntityType<Strider> type, LevelAccessor world, MobSpawnType spawnReason, BlockPos pos, RandomSource 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 ee3143d24914a14ec5f15785d303aec0846727e3..cd2670bcffbf8c790d128ed312855a835cb70749 100644
+index 38f7e1e41816721f332f548887d69c5eb98bad6a..87956e99e8a309c90b522652d29458d6f437f866 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vex.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vex.java
 @@ -105,6 +105,11 @@ public class Vex extends Monster implements TraceableEntity {
@@ -1021,7 +1021,7 @@ index ee3143d24914a14ec5f15785d303aec0846727e3..cd2670bcffbf8c790d128ed312855a83
  
      @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 0f547bffc269416b5e0b74b7c448cde44a662edc..32c7836fcceaeee018dd965f77ac1d2c2ab45ea0 100644
+index 78fe2cc6c866252c1d537c1e23854a0d2608fe36..0a4f7125c38d3138ec8eedec4ca72000f25ba6ac 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Vindicator.java
 @@ -73,6 +73,11 @@ public class Vindicator extends AbstractIllager {
@@ -1037,7 +1037,7 @@ index 0f547bffc269416b5e0b74b7c448cde44a662edc..32c7836fcceaeee018dd965f77ac1d2c
  
      @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 8c289269dbfe346089e4264f5fbcdf06860414cc..cf64f00c7a1528006d4946ad5d871cf487336745 100644
+index c15a35e7ac5dac31872b5e27671ce26fe1702eef..cbbdbf3bf316140b2591f29f0309ed17f341473e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Witch.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Witch.java
 @@ -72,6 +72,11 @@ public class Witch extends Raider implements RangedAttackMob {
@@ -1053,7 +1053,7 @@ index 8c289269dbfe346089e4264f5fbcdf06860414cc..cf64f00c7a1528006d4946ad5d871cf4
  
      @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 7776a9cfdcb19a3baf82bc8d75e39a4fbea6a00b..259896608f947b1dd574192e5e4babce4bd7d7ff 100644
+index 8da19fac75c283f026cb051668557c2034c40af9..ff43c5a1f8398b2c56920ec4e0a8fa5fbd135df8 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/WitherSkeleton.java
 @@ -50,6 +50,11 @@ public class WitherSkeleton extends AbstractSkeleton {
@@ -1069,7 +1069,7 @@ index 7776a9cfdcb19a3baf82bc8d75e39a4fbea6a00b..259896608f947b1dd574192e5e4babce
  
      @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 ce6567f6fd28777f4e10fb2e6ba16f78ac454fd9..a0c39477f7a565307c95df7bf7616d58e6960d30 100644
+index ee1bbff9e9dfd110e33a36c652d50a7f83093cab..13010725d9e6026ac77eb69e9f302684dc50cfec 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zoglin.java
 @@ -82,6 +82,11 @@ public class Zoglin extends Monster implements Enemy, HoglinBase {
@@ -1085,7 +1085,7 @@ index ce6567f6fd28777f4e10fb2e6ba16f78ac454fd9..a0c39477f7a565307c95df7bf7616d58
  
      @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 2dc41320ad62d3b88d64baea3358957ce990cb23..afe866e4a41a824bcfb9aa70779c52381386c472 100644
+index aa264a5975b1373fa979104355dae899c785aaf1..77712e0bb78bef24f05d9949c3ae4ee7ec2efb96 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
 @@ -121,6 +121,11 @@ public class Zombie extends Monster {
@@ -1110,7 +1110,7 @@ index 2dc41320ad62d3b88d64baea3358957ce990cb23..afe866e4a41a824bcfb9aa70779c5238
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
-index 5e17e5bedf41e246a4e8c4d04b71d1bec4184fb9..d24e41ac992972d1679c279b10290c01db73a5b5 100644
+index 02a97f526fb10056dcad78614ae8f6973449e9ab..073a45cd24c92e63b349a93da91cedfa10103101 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombieVillager.java
 @@ -94,6 +94,16 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -1131,7 +1131,7 @@ index 5e17e5bedf41e246a4e8c4d04b71d1bec4184fb9..d24e41ac992972d1679c279b10290c01
  
      @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 d1d36feab3ebfc0311b29997c2b81b7d53f638f4..cdeb39d02b618b648681ca51a592b7b3508e46f5 100644
+index ad82c064c9e31ffc1dd96e44517187635100fc22..2df1aa1af12b403e9cd87d61b2ff1516f754f589 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/ZombifiedPiglin.java
 @@ -78,6 +78,11 @@ public class ZombifiedPiglin extends Zombie implements NeutralMob {
@@ -1156,7 +1156,7 @@ index d1d36feab3ebfc0311b29997c2b81b7d53f638f4..cdeb39d02b618b648681ca51a592b7b3
  
      @Nullable
 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 cded207699b4500b1d9ea90cbde9b27c14cf8192..9cc42b4a1ea0d2315350e038034dfe7171668658 100644
+index b4deb7fa656aadd9c62db68bb46d3fb39f8429e5..930d74e5fd20b69baeec60dfc54da37a1290fccc 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
 @@ -82,6 +82,11 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -1172,7 +1172,7 @@ index cded207699b4500b1d9ea90cbde9b27c14cf8192..9cc42b4a1ea0d2315350e038034dfe71
  
      @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 580482c976e81452720dc3fa0f86babccd8e6e2f..5bc02e73ffde3d0d164532b6b8ce42213dc6eadc 100644
+index dad688184896720099357bf91fe092da3eac8931..9b7e38e7a73206663a06dd180b7ef746d2237f16 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
 @@ -112,6 +112,11 @@ public class Piglin extends AbstractPiglin implements CrossbowAttackMob, Invento
@@ -1188,7 +1188,7 @@ index 580482c976e81452720dc3fa0f86babccd8e6e2f..5bc02e73ffde3d0d164532b6b8ce4221
  
      @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 442d0ce3f3376d8a544b60d7832ea72630fcbca4..b931880d8cda19bc042bacc98a6a5fead9d54303 100644
+index ac066b2f3e369321752470722941ae26af511309..ba460cb0f65eb98d2c0934084c51c81ef10a0b44 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
 @@ -56,6 +56,11 @@ public class PiglinBrute extends AbstractPiglin {
@@ -1204,7 +1204,7 @@ index 442d0ce3f3376d8a544b60d7832ea72630fcbca4..b931880d8cda19bc042bacc98a6a5fea
  
      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 05ec03fb3b3c84ca2d2f58ca0b70459f90760601..9c3541a3506f270dd79e52103c4f83ad0df0ae94 100644
+index dcebf1f79f11b032c12199db8ca0a40396663871..f9828580075d70d804c92d6db9a944d2e436e268 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -173,6 +173,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
@@ -1220,7 +1220,7 @@ index 05ec03fb3b3c84ca2d2f58ca0b70459f90760601..9c3541a3506f270dd79e52103c4f83ad
  
      @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 774da46962f70e73d31ea523eb5bfc286f38856d..d2324e2dbd72fcd5a8ab562bc3b6e53088647137 100644
+index 89ec1e52f91c2e4cd17eeaa23cab366c9cbb8dc0..71212ecb84bdbf838b4a5fbefbe9cfa6343542c4 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTrader.java
 @@ -84,6 +84,11 @@ public class WanderingTrader extends net.minecraft.world.entity.npc.AbstractVill
@@ -1236,10 +1236,10 @@ index 774da46962f70e73d31ea523eb5bfc286f38856d..d2324e2dbd72fcd5a8ab562bc3b6e530
  
      @Override
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1c4ef7e78 100644
+index ec168b917d60cc6d8c48620eb4dcd89b0b121aea..46b6994812086405f20a4dd410c1d79621958cd5 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -112,94 +112,181 @@ public class PurpurWorldConfig {
+@@ -114,94 +114,181 @@ public class PurpurWorldConfig {
  
      public boolean axolotlRidable = false;
      public boolean axolotlControllable = true;
@@ -1251,7 +1251,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean batRidable = false;
-     public boolean batRidableInWater = false;
+     public boolean batRidableInWater = true;
      public boolean batControllable = true;
      public double batMaxY = 320D;
 +    public double batMaxHealth = 6.0D;
@@ -1276,7 +1276,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean beeRidable = false;
-     public boolean beeRidableInWater = false;
+     public boolean beeRidableInWater = true;
      public boolean beeControllable = true;
      public double beeMaxY = 320D;
 +    public double beeMaxHealth = 10.0D;
@@ -1294,7 +1294,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean blazeRidable = false;
-     public boolean blazeRidableInWater = false;
+     public boolean blazeRidableInWater = true;
      public boolean blazeControllable = true;
      public double blazeMaxY = 320D;
 +    public double blazeMaxHealth = 20.0D;
@@ -1327,7 +1327,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean catRidable = false;
-     public boolean catRidableInWater = false;
+     public boolean catRidableInWater = true;
      public boolean catControllable = true;
 +    public double catMaxHealth = 10.0D;
      private void catSettings() {
@@ -1343,7 +1343,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean caveSpiderRidable = false;
-     public boolean caveSpiderRidableInWater = false;
+     public boolean caveSpiderRidableInWater = true;
      public boolean caveSpiderControllable = true;
 +    public double caveSpiderMaxHealth = 12.0D;
      private void caveSpiderSettings() {
@@ -1389,7 +1389,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean cowRidable = false;
-     public boolean cowRidableInWater = false;
+     public boolean cowRidableInWater = true;
      public boolean cowControllable = true;
 +    public double cowMaxHealth = 10.0D;
      private void cowSettings() {
@@ -1405,7 +1405,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean creeperRidable = false;
-     public boolean creeperRidableInWater = false;
+     public boolean creeperRidableInWater = true;
      public boolean creeperControllable = true;
 +    public double creeperMaxHealth = 20.0D;
      private void creeperSettings() {
@@ -1421,7 +1421,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean dolphinRidable = false;
-@@ -207,80 +294,161 @@ public class PurpurWorldConfig {
+@@ -209,80 +296,161 @@ public class PurpurWorldConfig {
      public int dolphinSpitCooldown = 20;
      public float dolphinSpitSpeed = 1.0F;
      public float dolphinSpitDamage = 2.0F;
@@ -1465,7 +1465,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean drownedRidable = false;
-     public boolean drownedRidableInWater = false;
+     public boolean drownedRidableInWater = true;
      public boolean drownedControllable = true;
 +    public double drownedMaxHealth = 20.0D;
 +    public double drownedSpawnReinforcements = 0.1D;
@@ -1497,7 +1497,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean enderDragonRidable = false;
-     public boolean enderDragonRidableInWater = false;
+     public boolean enderDragonRidableInWater = true;
      public boolean enderDragonControllable = true;
      public double enderDragonMaxY = 320D;
 +    public double enderDragonMaxHealth = 200.0D;
@@ -1519,7 +1519,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean endermanRidable = false;
-     public boolean endermanRidableInWater = false;
+     public boolean endermanRidableInWater = true;
      public boolean endermanControllable = true;
 +    public double endermanMaxHealth = 40.0D;
      private void endermanSettings() {
@@ -1535,7 +1535,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean endermiteRidable = false;
-     public boolean endermiteRidableInWater = false;
+     public boolean endermiteRidableInWater = true;
      public boolean endermiteControllable = true;
 +    public double endermiteMaxHealth = 8.0D;
      private void endermiteSettings() {
@@ -1551,7 +1551,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean evokerRidable = false;
-     public boolean evokerRidableInWater = false;
+     public boolean evokerRidableInWater = true;
      public boolean evokerControllable = true;
 +    public double evokerMaxHealth = 24.0D;
      private void evokerSettings() {
@@ -1567,7 +1567,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean foxRidable = false;
-     public boolean foxRidableInWater = false;
+     public boolean foxRidableInWater = true;
      public boolean foxControllable = true;
 +    public double foxMaxHealth = 10.0D;
      private void foxSettings() {
@@ -1583,8 +1583,8 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean frogRidable = false;
-@@ -298,147 +466,316 @@ public class PurpurWorldConfig {
-     public boolean ghastRidableInWater = false;
+@@ -300,147 +468,316 @@ public class PurpurWorldConfig {
+     public boolean ghastRidableInWater = true;
      public boolean ghastControllable = true;
      public double ghastMaxY = 320D;
 +    public double ghastMaxHealth = 10.0D;
@@ -1602,7 +1602,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean giantRidable = false;
-     public boolean giantRidableInWater = false;
+     public boolean giantRidableInWater = true;
      public boolean giantControllable = true;
 +    public double giantMovementSpeed = 0.5D;
 +    public double giantAttackDamage = 50.0D;
@@ -1635,7 +1635,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean goatRidable = false;
-     public boolean goatRidableInWater = false;
+     public boolean goatRidableInWater = true;
      public boolean goatControllable = true;
 +    public double goatMaxHealth = 10.0D;
      private void goatSettings() {
@@ -1660,7 +1660,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean hoglinRidable = false;
-     public boolean hoglinRidableInWater = false;
+     public boolean hoglinRidableInWater = true;
      public boolean hoglinControllable = true;
 +    public double hoglinMaxHealth = 40.0D;
      private void hoglinSettings() {
@@ -1700,7 +1700,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean huskRidable = false;
-     public boolean huskRidableInWater = false;
+     public boolean huskRidableInWater = true;
      public boolean huskControllable = true;
 +    public double huskMaxHealth = 20.0D;
 +    public double huskSpawnReinforcements = 0.1D;
@@ -1718,7 +1718,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean illusionerRidable = false;
-     public boolean illusionerRidableInWater = false;
+     public boolean illusionerRidableInWater = true;
      public boolean illusionerControllable = true;
 +    public double illusionerMovementSpeed = 0.5D;
 +    public double illusionerFollowRange = 18.0D;
@@ -1742,7 +1742,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean ironGolemRidable = false;
-     public boolean ironGolemRidableInWater = false;
+     public boolean ironGolemRidableInWater = true;
      public boolean ironGolemControllable = true;
      public boolean ironGolemCanSwim = false;
 +    public double ironGolemMaxHealth = 100.0D;
@@ -1788,7 +1788,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean magmaCubeRidable = false;
-     public boolean magmaCubeRidableInWater = false;
+     public boolean magmaCubeRidableInWater = true;
      public boolean magmaCubeControllable = true;
 +    public String magmaCubeMaxHealth = "size * size";
 +    public String magmaCubeAttackDamage = "size";
@@ -1810,7 +1810,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean mooshroomRidable = false;
-     public boolean mooshroomRidableInWater = false;
+     public boolean mooshroomRidableInWater = true;
      public boolean mooshroomControllable = true;
 +    public double mooshroomMaxHealth = 10.0D;
      private void mooshroomSettings() {
@@ -1850,7 +1850,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean ocelotRidable = false;
-     public boolean ocelotRidableInWater = false;
+     public boolean ocelotRidableInWater = true;
      public boolean ocelotControllable = true;
 +    public double ocelotMaxHealth = 10.0D;
      private void ocelotSettings() {
@@ -1866,7 +1866,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean pandaRidable = false;
-     public boolean pandaRidableInWater = false;
+     public boolean pandaRidableInWater = true;
      public boolean pandaControllable = true;
 +    public double pandaMaxHealth = 20.0D;
      private void pandaSettings() {
@@ -1882,7 +1882,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean parrotRidable = false;
-     public boolean parrotRidableInWater = false;
+     public boolean parrotRidableInWater = true;
      public boolean parrotControllable = true;
      public double parrotMaxY = 320D;
 +    public double parrotMaxHealth = 6.0D;
@@ -1900,7 +1900,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean phantomRidable = false;
-@@ -448,6 +785,10 @@ public class PurpurWorldConfig {
+@@ -450,6 +787,10 @@ public class PurpurWorldConfig {
      public float phantomFlameDamage = 1.0F;
      public int phantomFlameFireTime = 8;
      public boolean phantomAllowGriefing = false;
@@ -1911,7 +1911,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      private void phantomSettings() {
          phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
          phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
-@@ -456,189 +797,361 @@ public class PurpurWorldConfig {
+@@ -458,189 +799,361 @@ public class PurpurWorldConfig {
          phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage);
          phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime);
          phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -1947,7 +1947,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean piglinRidable = false;
-     public boolean piglinRidableInWater = false;
+     public boolean piglinRidableInWater = true;
      public boolean piglinControllable = true;
 +    public double piglinMaxHealth = 16.0D;
      private void piglinSettings() {
@@ -1963,7 +1963,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean piglinBruteRidable = false;
-     public boolean piglinBruteRidableInWater = false;
+     public boolean piglinBruteRidableInWater = true;
      public boolean piglinBruteControllable = true;
 +    public double piglinBruteMaxHealth = 50.0D;
      private void piglinBruteSettings() {
@@ -1979,7 +1979,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean pillagerRidable = false;
-     public boolean pillagerRidableInWater = false;
+     public boolean pillagerRidableInWater = true;
      public boolean pillagerControllable = true;
 +    public double pillagerMaxHealth = 24.0D;
      private void pillagerSettings() {
@@ -1995,7 +1995,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean polarBearRidable = false;
-     public boolean polarBearRidableInWater = false;
+     public boolean polarBearRidableInWater = true;
      public boolean polarBearControllable = true;
 +    public double polarBearMaxHealth = 30.0D;
      private void polarBearSettings() {
@@ -2025,7 +2025,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean rabbitRidable = false;
-     public boolean rabbitRidableInWater = false;
+     public boolean rabbitRidableInWater = true;
      public boolean rabbitControllable = true;
 +    public double rabbitMaxHealth = 3.0D;
      private void rabbitSettings() {
@@ -2071,7 +2071,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean sheepRidable = false;
-     public boolean sheepRidableInWater = false;
+     public boolean sheepRidableInWater = true;
      public boolean sheepControllable = true;
 +    public double sheepMaxHealth = 8.0D;
      private void sheepSettings() {
@@ -2087,7 +2087,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean shulkerRidable = false;
-     public boolean shulkerRidableInWater = false;
+     public boolean shulkerRidableInWater = true;
      public boolean shulkerControllable = true;
 +    public double shulkerMaxHealth = 30.0D;
      private void shulkerSettings() {
@@ -2103,7 +2103,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean silverfishRidable = false;
-     public boolean silverfishRidableInWater = false;
+     public boolean silverfishRidableInWater = true;
      public boolean silverfishControllable = true;
 +    public double silverfishMaxHealth = 8.0D;
      private void silverfishSettings() {
@@ -2119,7 +2119,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean skeletonRidable = false;
-     public boolean skeletonRidableInWater = false;
+     public boolean skeletonRidableInWater = true;
      public boolean skeletonControllable = true;
 +    public double skeletonMaxHealth = 20.0D;
      private void skeletonSettings() {
@@ -2160,7 +2160,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean slimeRidable = false;
-     public boolean slimeRidableInWater = false;
+     public boolean slimeRidableInWater = true;
      public boolean slimeControllable = true;
 +    public String slimeMaxHealth = "size * size";
 +    public String slimeAttackDamage = "size";
@@ -2182,7 +2182,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean snowGolemRidable = false;
-     public boolean snowGolemRidableInWater = false;
+     public boolean snowGolemRidableInWater = true;
      public boolean snowGolemControllable = true;
      public boolean snowGolemLeaveTrailWhenRidden = false;
 +    public double snowGolemMaxHealth = 4.0D;
@@ -2200,7 +2200,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean snifferRidable = false;
-     public boolean snifferRidableInWater = false;
+     public boolean snifferRidableInWater = true;
      public boolean snifferControllable = true;
 +    public double snifferMaxHealth = 14.0D;
      private void snifferSettings() {
@@ -2241,7 +2241,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean strayRidable = false;
-     public boolean strayRidableInWater = false;
+     public boolean strayRidableInWater = true;
      public boolean strayControllable = true;
 +    public double strayMaxHealth = 20.0D;
      private void straySettings() {
@@ -2273,7 +2273,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean tadpoleRidable = false;
-@@ -653,64 +1166,125 @@ public class PurpurWorldConfig {
+@@ -655,64 +1168,125 @@ public class PurpurWorldConfig {
      public boolean traderLlamaRidable = false;
      public boolean traderLlamaRidableInWater = false;
      public boolean traderLlamaControllable = true;
@@ -2317,7 +2317,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean turtleRidable = false;
-     public boolean turtleRidableInWater = false;
+     public boolean turtleRidableInWater = true;
      public boolean turtleControllable = true;
 +    public double turtleMaxHealth = 30.0D;
      private void turtleSettings() {
@@ -2333,7 +2333,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean vexRidable = false;
-     public boolean vexRidableInWater = false;
+     public boolean vexRidableInWater = true;
      public boolean vexControllable = true;
      public double vexMaxY = 320D;
 +    public double vexMaxHealth = 14.0D;
@@ -2351,7 +2351,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean villagerRidable = false;
-     public boolean villagerRidableInWater = false;
+     public boolean villagerRidableInWater = true;
      public boolean villagerControllable = true;
 +    public double villagerMaxHealth = 20.0D;
      private void villagerSettings() {
@@ -2367,7 +2367,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean vindicatorRidable = false;
-     public boolean vindicatorRidableInWater = false;
+     public boolean vindicatorRidableInWater = true;
      public boolean vindicatorControllable = true;
 +    public double vindicatorMaxHealth = 24.0D;
      private void vindicatorSettings() {
@@ -2383,7 +2383,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean wanderingTraderRidable = false;
-     public boolean wanderingTraderRidableInWater = false;
+     public boolean wanderingTraderRidableInWater = true;
      public boolean wanderingTraderControllable = true;
 +    public double wanderingTraderMaxHealth = 20.0D;
      private void wanderingTraderSettings() {
@@ -2399,9 +2399,9 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean wardenRidable = false;
-@@ -725,81 +1299,165 @@ public class PurpurWorldConfig {
+@@ -727,81 +1301,165 @@ public class PurpurWorldConfig {
      public boolean witchRidable = false;
-     public boolean witchRidableInWater = false;
+     public boolean witchRidableInWater = true;
      public boolean witchControllable = true;
 +    public double witchMaxHealth = 26.0D;
      private void witchSettings() {
@@ -2417,7 +2417,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean witherRidable = false;
-     public boolean witherRidableInWater = false;
+     public boolean witherRidableInWater = true;
      public boolean witherControllable = true;
      public double witherMaxY = 320D;
 +    public double witherMaxHealth = 300.0D;
@@ -2439,7 +2439,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean witherSkeletonRidable = false;
-     public boolean witherSkeletonRidableInWater = false;
+     public boolean witherSkeletonRidableInWater = true;
      public boolean witherSkeletonControllable = true;
 +    public double witherSkeletonMaxHealth = 20.0D;
      private void witherSkeletonSettings() {
@@ -2455,7 +2455,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean wolfRidable = false;
-     public boolean wolfRidableInWater = false;
+     public boolean wolfRidableInWater = true;
      public boolean wolfControllable = true;
 +    public double wolfMaxHealth = 8.0D;
      private void wolfSettings() {
@@ -2471,7 +2471,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean zoglinRidable = false;
-     public boolean zoglinRidableInWater = false;
+     public boolean zoglinRidableInWater = true;
      public boolean zoglinControllable = true;
 +    public double zoglinMaxHealth = 40.0D;
      private void zoglinSettings() {
@@ -2487,7 +2487,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean zombieRidable = false;
-     public boolean zombieRidableInWater = false;
+     public boolean zombieRidableInWater = true;
      public boolean zombieControllable = true;
 +    public double zombieMaxHealth = 20.0D;
 +    public double zombieSpawnReinforcements = 0.1D;
@@ -2530,7 +2530,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean zombieVillagerRidable = false;
-     public boolean zombieVillagerRidableInWater = false;
+     public boolean zombieVillagerRidableInWater = true;
      public boolean zombieVillagerControllable = true;
 +    public double zombieVillagerMaxHealth = 20.0D;
 +    public double zombieVillagerSpawnReinforcements = 0.1D;
@@ -2548,7 +2548,7 @@ index de0b2d79435f55f35f1063094ac9c674b186fc79..550d1722c17048ea38886382062dd0e1
      }
  
      public boolean zombifiedPiglinRidable = false;
-     public boolean zombifiedPiglinRidableInWater = false;
+     public boolean zombifiedPiglinRidableInWater = true;
      public boolean zombifiedPiglinControllable = true;
 +    public double zombifiedPiglinMaxHealth = 20.0D;
 +    public double zombifiedPiglinSpawnReinforcements = 0.0D;