fix build issue

This commit is contained in:
Ben Kerllenevich
2023-06-11 22:04:37 -04:00
parent 866df4ad0e
commit 788c14f02c
77 changed files with 586 additions and 586 deletions

View File

@@ -522,7 +522,7 @@ index 853fe631a7d665e2379296c89e433e761495a814..ae4d404b837da202e52d246dabfc00c8
public boolean canBeLeashed(Player player) {
return !this.isLeashed();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c10955f033891 100644
index 7a9ac5c8b6c2576e9a1728dc77f9a1e71013db22..852b8f4eee52840eac1feb8d98843e7d74a3a5f9 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -507,10 +507,12 @@ public class PurpurWorldConfig {
@@ -554,23 +554,23 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean blazeRidable = false;
@@ -581,6 +585,7 @@ public class PurpurWorldConfig {
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
}
@@ -588,6 +592,7 @@ public class PurpurWorldConfig {
public double camelJumpStrengthMax = 0.42D;
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
+ public int camelBreedingTicks = 6000;
public double camelMaxHealthMin = 32.0D;
public double camelMaxHealthMax = 32.0D;
public double camelJumpStrengthMin = 0.42D;
@@ -594,6 +599,7 @@ public class PurpurWorldConfig {
private void camelSettings() {
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
@@ -596,6 +601,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
+ camelBreedingTicks = getInt("mobs.camel.breeding-delay-ticks", camelBreedingTicks);
}
public boolean camelRidableInWater = false;
@@ -608,6 +614,7 @@ public class PurpurWorldConfig {
public boolean catRidable = false;
@@ -605,6 +611,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -578,7 +578,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -621,6 +628,7 @@ public class PurpurWorldConfig {
@@ -618,6 +625,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -586,7 +586,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean caveSpiderRidable = false;
@@ -644,6 +652,7 @@ public class PurpurWorldConfig {
@@ -641,6 +649,7 @@ public class PurpurWorldConfig {
public boolean chickenControllable = true;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -594,7 +594,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -655,6 +664,7 @@ public class PurpurWorldConfig {
@@ -652,6 +661,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -602,7 +602,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean codRidable = false;
@@ -676,6 +686,7 @@ public class PurpurWorldConfig {
@@ -673,6 +683,7 @@ public class PurpurWorldConfig {
public boolean cowControllable = true;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -610,7 +610,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -687,6 +698,7 @@ public class PurpurWorldConfig {
@@ -684,6 +695,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -618,7 +618,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean creeperRidable = false;
@@ -738,6 +750,7 @@ public class PurpurWorldConfig {
@@ -735,6 +747,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -626,7 +626,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -753,6 +766,7 @@ public class PurpurWorldConfig {
@@ -750,6 +763,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -634,7 +634,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean drownedRidable = false;
@@ -872,6 +886,7 @@ public class PurpurWorldConfig {
@@ -869,6 +883,7 @@ public class PurpurWorldConfig {
public boolean foxControllable = true;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -642,7 +642,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -883,17 +898,20 @@ public class PurpurWorldConfig {
@@ -880,17 +895,20 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -663,7 +663,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean ghastRidable = false;
@@ -961,11 +979,13 @@ public class PurpurWorldConfig {
@@ -958,11 +976,13 @@ public class PurpurWorldConfig {
public boolean goatRidableInWater = true;
public boolean goatControllable = true;
public double goatMaxHealth = 10.0D;
@@ -677,7 +677,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean guardianRidable = false;
@@ -986,6 +1006,7 @@ public class PurpurWorldConfig {
@@ -983,6 +1003,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidableInWater = true;
public boolean hoglinControllable = true;
public double hoglinMaxHealth = 40.0D;
@@ -685,7 +685,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -996,6 +1017,7 @@ public class PurpurWorldConfig {
@@ -993,6 +1014,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -693,7 +693,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean horseRidableInWater = false;
@@ -1005,6 +1027,7 @@ public class PurpurWorldConfig {
@@ -1002,6 +1024,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -701,7 +701,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1020,6 +1043,7 @@ public class PurpurWorldConfig {
@@ -1017,6 +1040,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -709,7 +709,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean huskRidable = false;
@@ -1097,6 +1121,7 @@ public class PurpurWorldConfig {
@@ -1094,6 +1118,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -717,7 +717,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1114,6 +1139,7 @@ public class PurpurWorldConfig {
@@ -1111,6 +1136,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -725,7 +725,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean magmaCubeRidable = false;
@@ -1142,6 +1168,7 @@ public class PurpurWorldConfig {
@@ -1139,6 +1165,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = true;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
@@ -733,7 +733,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1152,6 +1179,7 @@ public class PurpurWorldConfig {
@@ -1149,6 +1176,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -741,7 +741,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean muleRidableInWater = false;
@@ -1161,6 +1189,7 @@ public class PurpurWorldConfig {
@@ -1158,6 +1186,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -749,7 +749,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1176,12 +1205,14 @@ public class PurpurWorldConfig {
@@ -1173,12 +1202,14 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -764,7 +764,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1192,12 +1223,14 @@ public class PurpurWorldConfig {
@@ -1189,12 +1220,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -779,7 +779,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1208,6 +1241,7 @@ public class PurpurWorldConfig {
@@ -1205,6 +1238,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -787,7 +787,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean parrotRidable = false;
@@ -1291,6 +1325,7 @@ public class PurpurWorldConfig {
@@ -1288,6 +1322,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -795,7 +795,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1302,6 +1337,7 @@ public class PurpurWorldConfig {
@@ -1299,6 +1334,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -803,7 +803,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean piglinRidable = false;
@@ -1358,6 +1394,7 @@ public class PurpurWorldConfig {
@@ -1355,6 +1391,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -811,7 +811,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1371,6 +1408,7 @@ public class PurpurWorldConfig {
@@ -1368,6 +1405,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -819,7 +819,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean pufferfishRidable = false;
@@ -1393,6 +1431,7 @@ public class PurpurWorldConfig {
@@ -1390,6 +1428,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -827,7 +827,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1405,6 +1444,7 @@ public class PurpurWorldConfig {
@@ -1402,6 +1441,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -835,7 +835,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean ravagerRidable = false;
@@ -1441,6 +1481,7 @@ public class PurpurWorldConfig {
@@ -1438,6 +1478,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -843,7 +843,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1451,6 +1492,7 @@ public class PurpurWorldConfig {
@@ -1448,6 +1489,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -851,7 +851,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean shulkerRidable = false;
@@ -1574,11 +1616,13 @@ public class PurpurWorldConfig {
@@ -1571,11 +1613,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
@@ -865,7 +865,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean squidRidable = false;
@@ -1637,6 +1681,7 @@ public class PurpurWorldConfig {
@@ -1634,6 +1678,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -873,7 +873,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1647,6 +1692,7 @@ public class PurpurWorldConfig {
@@ -1644,6 +1689,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -881,7 +881,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean tadpoleRidable = false;
@@ -1667,6 +1713,7 @@ public class PurpurWorldConfig {
@@ -1664,6 +1710,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -889,7 +889,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1684,6 +1731,7 @@ public class PurpurWorldConfig {
@@ -1681,6 +1728,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -897,7 +897,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean tropicalFishRidable = false;
@@ -1704,6 +1752,7 @@ public class PurpurWorldConfig {
@@ -1701,6 +1749,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -905,7 +905,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1714,6 +1763,7 @@ public class PurpurWorldConfig {
@@ -1711,6 +1760,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -913,7 +913,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean vexRidable = false;
@@ -1741,6 +1791,7 @@ public class PurpurWorldConfig {
@@ -1738,6 +1788,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -921,7 +921,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1754,6 +1805,7 @@ public class PurpurWorldConfig {
@@ -1751,6 +1802,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -929,7 +929,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
}
public boolean vindicatorRidable = false;
@@ -1865,6 +1917,7 @@ public class PurpurWorldConfig {
@@ -1862,6 +1914,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -937,7 +937,7 @@ index 6e049d5b08550b5073f3d790d1b3805e930ad002..19c0d2a94fef6e6a62908d93160c1095
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1875,6 +1928,7 @@ public class PurpurWorldConfig {
@@ -1872,6 +1925,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);