Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

add frog breeding time

Browse Source
This commit is contained in:
BillyGalbreath
2022-06-12 06:36:56 -05:00
parent dfb253a429
commit e869e89274
39 changed files with 381 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
patches/server/0241-Mobs-always-drop-experience.patch
View File

@@ -1157,7 +1157,7 @@ index 8d6930868a42b9fc98d7672bff433ec50d36999e..53bebecd30fee7613af73901b3aa9961
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cfb75d57f8 100644
index 6e2352841252c693fd7cfe6935694e116c01e243..df4f916efd84cec23ae66cf2ed6d62e6b5e61398 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1007,12 +1007,14 @@ public class PurpurWorldConfig {
@@ -1444,8 +1444,8 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
+ foxAlwaysDropExp = getBoolean("mobs.fox.always-drop-exp", foxAlwaysDropExp);
}
public boolean ghastRidable = false;
@@ -1469,6 +1505,7 @@ public class PurpurWorldConfig {
public int frogBreedingTicks = 6000;
@@ -1474,6 +1510,7 @@ public class PurpurWorldConfig {
public double ghastMaxY = 320D;
public double ghastMaxHealth = 10.0D;
public boolean ghastTakeDamageFromWater = false;
@@ -1453,7 +1453,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void ghastSettings() {
ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable);
ghastRidableInWater = getBoolean("mobs.ghast.ridable-in-water", ghastRidableInWater);
@@ -1481,6 +1518,7 @@ public class PurpurWorldConfig {
@@ -1486,6 +1523,7 @@ public class PurpurWorldConfig {
}
ghastMaxHealth = getDouble("mobs.ghast.attributes.max_health", ghastMaxHealth);
ghastTakeDamageFromWater = getBoolean("mobs.ghast.takes-damage-from-water", ghastTakeDamageFromWater);
@@ -1461,7 +1461,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean giantRidable = false;
@@ -1494,6 +1532,7 @@ public class PurpurWorldConfig {
@@ -1499,6 +1537,7 @@ public class PurpurWorldConfig {
public boolean giantHaveAI = false;
public boolean giantHaveHostileAI = false;
public boolean giantTakeDamageFromWater = false;
@@ -1469,7 +1469,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -1515,6 +1554,7 @@ public class PurpurWorldConfig {
@@ -1520,6 +1559,7 @@ public class PurpurWorldConfig {
giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI);
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
giantTakeDamageFromWater = getBoolean("mobs.giant.takes-damage-from-water", giantTakeDamageFromWater);
@@ -1477,7 +1477,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean glowSquidRidable = false;
@@ -1522,12 +1562,14 @@ public class PurpurWorldConfig {
@@ -1527,12 +1567,14 @@ public class PurpurWorldConfig {
public double glowSquidMaxHealth = 10.0D;
public boolean glowSquidsCanFly = false;
public boolean glowSquidTakeDamageFromWater = false;
@@ -1492,7 +1492,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean goatRidable = false;
@@ -1536,6 +1578,7 @@ public class PurpurWorldConfig {
@@ -1541,6 +1583,7 @@ public class PurpurWorldConfig {
public double goatMaxHealth = 10.0D;
public int goatBreedingTicks = 6000;
public boolean goatTakeDamageFromWater = false;
@@ -1500,7 +1500,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void goatSettings() {
goatRidable = getBoolean("mobs.goat.ridable", goatRidable);
goatRidableInWater = getBoolean("mobs.goat.ridable-in-water", goatRidableInWater);
@@ -1543,12 +1586,14 @@ public class PurpurWorldConfig {
@@ -1548,12 +1591,14 @@ public class PurpurWorldConfig {
goatMaxHealth = getDouble("mobs.goat.attributes.max_health", goatMaxHealth);
goatBreedingTicks = getInt("mobs.goat.breeding-delay-ticks", goatBreedingTicks);
goatTakeDamageFromWater = getBoolean("mobs.goat.takes-damage-from-water", goatTakeDamageFromWater);
@@ -1515,7 +1515,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void guardianSettings() {
guardianRidable = getBoolean("mobs.guardian.ridable", guardianRidable);
guardianControllable = getBoolean("mobs.guardian.controllable", guardianControllable);
@@ -1559,6 +1604,7 @@ public class PurpurWorldConfig {
@@ -1564,6 +1609,7 @@ public class PurpurWorldConfig {
}
guardianMaxHealth = getDouble("mobs.guardian.attributes.max_health", guardianMaxHealth);
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
@@ -1523,7 +1523,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean forceHalloweenSeason = false;
@@ -1574,6 +1620,7 @@ public class PurpurWorldConfig {
@@ -1579,6 +1625,7 @@ public class PurpurWorldConfig {
public double hoglinMaxHealth = 40.0D;
public int hoglinBreedingTicks = 6000;
public boolean hoglinTakeDamageFromWater = false;
@@ -1531,7 +1531,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -1586,6 +1633,7 @@ public class PurpurWorldConfig {
@@ -1591,6 +1638,7 @@ public class PurpurWorldConfig {
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
hoglinBreedingTicks = getInt("mobs.hoglin.breeding-delay-ticks", hoglinBreedingTicks);
hoglinTakeDamageFromWater = getBoolean("mobs.hoglin.takes-damage-from-water", hoglinTakeDamageFromWater);
@@ -1539,7 +1539,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean horseRidableInWater = false;
@@ -1598,6 +1646,7 @@ public class PurpurWorldConfig {
@@ -1603,6 +1651,7 @@ public class PurpurWorldConfig {
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
public boolean horseStandWithRider = true;
@@ -1547,7 +1547,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1616,6 +1665,7 @@ public class PurpurWorldConfig {
@@ -1621,6 +1670,7 @@ public class PurpurWorldConfig {
horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks);
horseTakeDamageFromWater = getBoolean("mobs.horse.takes-damage-from-water", horseTakeDamageFromWater);
horseStandWithRider = getBoolean("mobs.horse.stand-with-rider", horseStandWithRider);
@@ -1555,7 +1555,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean huskRidable = false;
@@ -1627,6 +1677,7 @@ public class PurpurWorldConfig {
@@ -1632,6 +1682,7 @@ public class PurpurWorldConfig {
public double huskJockeyChance = 0.05D;
public boolean huskJockeyTryExistingChickens = true;
public boolean huskTakeDamageFromWater = false;
@@ -1563,7 +1563,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -1642,6 +1693,7 @@ public class PurpurWorldConfig {
@@ -1647,6 +1698,7 @@ public class PurpurWorldConfig {
huskJockeyChance = getDouble("mobs.husk.jockey.chance", huskJockeyChance);
huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens);
huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater);
@@ -1571,7 +1571,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean illusionerRidable = false;
@@ -1651,6 +1703,7 @@ public class PurpurWorldConfig {
@@ -1656,6 +1708,7 @@ public class PurpurWorldConfig {
public double illusionerFollowRange = 18.0D;
public double illusionerMaxHealth = 32.0D;
public boolean illusionerTakeDamageFromWater = false;
@@ -1579,7 +1579,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void illusionerSettings() {
illusionerRidable = getBoolean("mobs.illusioner.ridable", illusionerRidable);
illusionerRidableInWater = getBoolean("mobs.illusioner.ridable-in-water", illusionerRidableInWater);
@@ -1668,6 +1721,7 @@ public class PurpurWorldConfig {
@@ -1673,6 +1726,7 @@ public class PurpurWorldConfig {
}
illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max_health", illusionerMaxHealth);
illusionerTakeDamageFromWater = getBoolean("mobs.illusioner.takes-damage-from-water", illusionerTakeDamageFromWater);
@@ -1587,7 +1587,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean ironGolemRidable = false;
@@ -1678,6 +1732,7 @@ public class PurpurWorldConfig {
@@ -1683,6 +1737,7 @@ public class PurpurWorldConfig {
public boolean ironGolemTakeDamageFromWater = false;
public boolean ironGolemPoppyCalm = false;
public boolean ironGolemHealCalm = false;
@@ -1595,7 +1595,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1692,6 +1747,7 @@ public class PurpurWorldConfig {
@@ -1697,6 +1752,7 @@ public class PurpurWorldConfig {
ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater);
ironGolemPoppyCalm = getBoolean("mobs.iron_golem.poppy-calms-anger", ironGolemPoppyCalm);
ironGolemHealCalm = getBoolean("mobs.iron_golem.healing-calms-anger", ironGolemHealCalm);
@@ -1603,7 +1603,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean llamaRidable = false;
@@ -1706,6 +1762,7 @@ public class PurpurWorldConfig {
@@ -1711,6 +1767,7 @@ public class PurpurWorldConfig {
public int llamaBreedingTicks = 6000;
public boolean llamaTakeDamageFromWater = false;
public boolean llamaJoinCaravans = true;
@@ -1611,7 +1611,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1726,6 +1783,7 @@ public class PurpurWorldConfig {
@@ -1731,6 +1788,7 @@ public class PurpurWorldConfig {
llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks);
llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater);
llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans);
@@ -1619,7 +1619,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean magmaCubeRidable = false;
@@ -1736,6 +1794,7 @@ public class PurpurWorldConfig {
@@ -1741,6 +1799,7 @@ public class PurpurWorldConfig {
public Map<Integer, Double> magmaCubeMaxHealthCache = new HashMap<>();
public Map<Integer, Double> magmaCubeAttackDamageCache = new HashMap<>();
public boolean magmaCubeTakeDamageFromWater = false;
@@ -1627,7 +1627,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void magmaCubeSettings() {
magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable);
magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater);
@@ -1750,6 +1809,7 @@ public class PurpurWorldConfig {
@@ -1755,6 +1814,7 @@ public class PurpurWorldConfig {
magmaCubeMaxHealthCache.clear();
magmaCubeAttackDamageCache.clear();
magmaCubeTakeDamageFromWater = getBoolean("mobs.magma_cube.takes-damage-from-water", magmaCubeTakeDamageFromWater);
@@ -1635,7 +1635,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean mooshroomRidable = false;
@@ -1758,6 +1818,7 @@ public class PurpurWorldConfig {
@@ -1763,6 +1823,7 @@ public class PurpurWorldConfig {
public double mooshroomMaxHealth = 10.0D;
public int mooshroomBreedingTicks = 6000;
public boolean mooshroomTakeDamageFromWater = false;
@@ -1643,7 +1643,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1770,6 +1831,7 @@ public class PurpurWorldConfig {
@@ -1775,6 +1836,7 @@ public class PurpurWorldConfig {
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
mooshroomBreedingTicks = getInt("mobs.mooshroom.breeding-delay-ticks", mooshroomBreedingTicks);
mooshroomTakeDamageFromWater = getBoolean("mobs.mooshroom.takes-damage-from-water", mooshroomTakeDamageFromWater);
@@ -1651,7 +1651,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean muleRidableInWater = false;
@@ -1781,6 +1843,7 @@ public class PurpurWorldConfig {
@@ -1786,6 +1848,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMax = 0.175D;
public int muleBreedingTicks = 6000;
public boolean muleTakeDamageFromWater = false;
@@ -1659,7 +1659,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1798,6 +1861,7 @@ public class PurpurWorldConfig {
@@ -1803,6 +1866,7 @@ public class PurpurWorldConfig {
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
muleBreedingTicks = getInt("mobs.mule.breeding-delay-ticks", muleBreedingTicks);
muleTakeDamageFromWater = getBoolean("mobs.mule.takes-damage-from-water", muleTakeDamageFromWater);
@@ -1667,7 +1667,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean ocelotRidable = false;
@@ -1806,6 +1870,7 @@ public class PurpurWorldConfig {
@@ -1811,6 +1875,7 @@ public class PurpurWorldConfig {
public double ocelotMaxHealth = 10.0D;
public int ocelotBreedingTicks = 6000;
public boolean ocelotTakeDamageFromWater = false;
@@ -1675,7 +1675,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1818,6 +1883,7 @@ public class PurpurWorldConfig {
@@ -1823,6 +1888,7 @@ public class PurpurWorldConfig {
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks);
ocelotTakeDamageFromWater = getBoolean("mobs.ocelot.takes-damage-from-water", ocelotTakeDamageFromWater);
@@ -1683,7 +1683,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean pandaRidable = false;
@@ -1826,6 +1892,7 @@ public class PurpurWorldConfig {
@@ -1831,6 +1897,7 @@ public class PurpurWorldConfig {
public double pandaMaxHealth = 20.0D;
public int pandaBreedingTicks = 6000;
public boolean pandaTakeDamageFromWater = false;
@@ -1691,7 +1691,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1838,6 +1905,7 @@ public class PurpurWorldConfig {
@@ -1843,6 +1910,7 @@ public class PurpurWorldConfig {
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
pandaBreedingTicks = getInt("mobs.panda.breeding-delay-ticks", pandaBreedingTicks);
pandaTakeDamageFromWater = getBoolean("mobs.panda.takes-damage-from-water", pandaTakeDamageFromWater);
@@ -1699,7 +1699,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean parrotRidable = false;
@@ -1847,6 +1915,7 @@ public class PurpurWorldConfig {
@@ -1852,6 +1920,7 @@ public class PurpurWorldConfig {
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
public boolean parrotBreedable = false;
@@ -1707,7 +1707,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1860,6 +1929,7 @@ public class PurpurWorldConfig {
@@ -1865,6 +1934,7 @@ public class PurpurWorldConfig {
parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth);
parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater);
parrotBreedable = getBoolean("mobs.parrot.can-breed", parrotBreedable);
@@ -1715,7 +1715,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean phantomRidable = false;
@@ -1893,6 +1963,7 @@ public class PurpurWorldConfig {
@@ -1898,6 +1968,7 @@ public class PurpurWorldConfig {
public boolean phantomBurnInDaylight = true;
public boolean phantomFlamesOnSwoop = false;
public boolean phantomTakeDamageFromWater = false;
@@ -1723,7 +1723,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1934,6 +2005,7 @@ public class PurpurWorldConfig {
@@ -1939,6 +2010,7 @@ public class PurpurWorldConfig {
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop);
phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
@@ -1731,7 +1731,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean pigRidable = false;
@@ -1943,6 +2015,7 @@ public class PurpurWorldConfig {
@@ -1948,6 +2020,7 @@ public class PurpurWorldConfig {
public boolean pigGiveSaddleBack = false;
public int pigBreedingTicks = 6000;
public boolean pigTakeDamageFromWater = false;
@@ -1739,7 +1739,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1956,6 +2029,7 @@ public class PurpurWorldConfig {
@@ -1961,6 +2034,7 @@ public class PurpurWorldConfig {
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks);
pigTakeDamageFromWater = getBoolean("mobs.pig.takes-damage-from-water", pigTakeDamageFromWater);
@@ -1747,7 +1747,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean piglinRidable = false;
@@ -1965,6 +2039,7 @@ public class PurpurWorldConfig {
@@ -1970,6 +2044,7 @@ public class PurpurWorldConfig {
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
@@ -1755,7 +1755,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1978,6 +2053,7 @@ public class PurpurWorldConfig {
@@ -1983,6 +2058,7 @@ public class PurpurWorldConfig {
piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing);
piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater);
piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier);
@@ -1763,7 +1763,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean piglinBruteRidable = false;
@@ -1985,6 +2061,7 @@ public class PurpurWorldConfig {
@@ -1990,6 +2066,7 @@ public class PurpurWorldConfig {
public boolean piglinBruteControllable = true;
public double piglinBruteMaxHealth = 50.0D;
public boolean piglinBruteTakeDamageFromWater = false;
@@ -1771,7 +1771,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void piglinBruteSettings() {
piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
@@ -1996,6 +2073,7 @@ public class PurpurWorldConfig {
@@ -2001,6 +2078,7 @@ public class PurpurWorldConfig {
}
piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
piglinBruteTakeDamageFromWater = getBoolean("mobs.piglin_brute.takes-damage-from-water", piglinBruteTakeDamageFromWater);
@@ -1779,7 +1779,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean pillagerRidable = false;
@@ -2004,6 +2082,7 @@ public class PurpurWorldConfig {
@@ -2009,6 +2087,7 @@ public class PurpurWorldConfig {
public double pillagerMaxHealth = 24.0D;
public boolean pillagerBypassMobGriefing = false;
public boolean pillagerTakeDamageFromWater = false;
@@ -1787,7 +1787,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -2016,6 +2095,7 @@ public class PurpurWorldConfig {
@@ -2021,6 +2100,7 @@ public class PurpurWorldConfig {
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing);
pillagerTakeDamageFromWater = getBoolean("mobs.pillager.takes-damage-from-water", pillagerTakeDamageFromWater);
@@ -1795,7 +1795,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean polarBearRidable = false;
@@ -2026,6 +2106,7 @@ public class PurpurWorldConfig {
@@ -2031,6 +2111,7 @@ public class PurpurWorldConfig {
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
public boolean polarBearTakeDamageFromWater = false;
@@ -1803,7 +1803,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -2041,12 +2122,14 @@ public class PurpurWorldConfig {
@@ -2046,12 +2127,14 @@ public class PurpurWorldConfig {
if (item != Items.AIR) polarBearBreedableItem = item;
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
polarBearTakeDamageFromWater = getBoolean("mobs.polar_bear.takes-damage-from-water", polarBearTakeDamageFromWater);
@@ -1818,7 +1818,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void pufferfishSettings() {
pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable);
@@ -2057,6 +2140,7 @@ public class PurpurWorldConfig {
@@ -2062,6 +2145,7 @@ public class PurpurWorldConfig {
}
pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
pufferfishTakeDamageFromWater = getBoolean("mobs.pufferfish.takes-damage-from-water", pufferfishTakeDamageFromWater);
@@ -1826,7 +1826,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean rabbitRidable = false;
@@ -2068,6 +2152,7 @@ public class PurpurWorldConfig {
@@ -2073,6 +2157,7 @@ public class PurpurWorldConfig {
public int rabbitBreedingTicks = 6000;
public boolean rabbitBypassMobGriefing = false;
public boolean rabbitTakeDamageFromWater = false;
@@ -1834,7 +1834,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -2083,6 +2168,7 @@ public class PurpurWorldConfig {
@@ -2088,6 +2173,7 @@ public class PurpurWorldConfig {
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing);
rabbitTakeDamageFromWater = getBoolean("mobs.rabbit.takes-damage-from-water", rabbitTakeDamageFromWater);
@@ -1842,7 +1842,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean ravagerRidable = false;
@@ -2092,6 +2178,7 @@ public class PurpurWorldConfig {
@@ -2097,6 +2183,7 @@ public class PurpurWorldConfig {
public boolean ravagerBypassMobGriefing = false;
public boolean ravagerTakeDamageFromWater = false;
public List<Block> ravagerGriefableBlocks = new ArrayList<>();
@@ -1850,7 +1850,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -2121,12 +2208,14 @@ public class PurpurWorldConfig {
@@ -2126,12 +2213,14 @@ public class PurpurWorldConfig {
ravagerGriefableBlocks.add(block);
}
});
@@ -1865,7 +1865,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void salmonSettings() {
salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable);
@@ -2137,6 +2226,7 @@ public class PurpurWorldConfig {
@@ -2142,6 +2231,7 @@ public class PurpurWorldConfig {
}
salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
salmonTakeDamageFromWater = getBoolean("mobs.salmon.takes-damage-from-water", salmonTakeDamageFromWater);
@@ -1873,7 +1873,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean sheepRidable = false;
@@ -2146,6 +2236,7 @@ public class PurpurWorldConfig {
@@ -2151,6 +2241,7 @@ public class PurpurWorldConfig {
public int sheepBreedingTicks = 6000;
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
@@ -1881,7 +1881,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2159,6 +2250,7 @@ public class PurpurWorldConfig {
@@ -2164,6 +2255,7 @@ public class PurpurWorldConfig {
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing);
sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater);
@@ -1889,7 +1889,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean shulkerRidable = false;
@@ -2172,6 +2264,7 @@ public class PurpurWorldConfig {
@@ -2177,6 +2269,7 @@ public class PurpurWorldConfig {
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
public boolean shulkerChangeColorWithDye = false;
@@ -1897,7 +1897,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2189,6 +2282,7 @@ public class PurpurWorldConfig {
@@ -2194,6 +2287,7 @@ public class PurpurWorldConfig {
shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation);
shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor);
shulkerChangeColorWithDye = getBoolean("mobs.shulker.change-color-with-dye", shulkerChangeColorWithDye);
@@ -1905,7 +1905,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean silverfishRidable = false;
@@ -2197,6 +2291,7 @@ public class PurpurWorldConfig {
@@ -2202,6 +2296,7 @@ public class PurpurWorldConfig {
public double silverfishMaxHealth = 8.0D;
public boolean silverfishBypassMobGriefing = false;
public boolean silverfishTakeDamageFromWater = false;
@@ -1913,7 +1913,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -2209,6 +2304,7 @@ public class PurpurWorldConfig {
@@ -2214,6 +2309,7 @@ public class PurpurWorldConfig {
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing);
silverfishTakeDamageFromWater = getBoolean("mobs.silverfish.takes-damage-from-water", silverfishTakeDamageFromWater);
@@ -1921,7 +1921,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean skeletonRidable = false;
@@ -2216,6 +2312,7 @@ public class PurpurWorldConfig {
@@ -2221,6 +2317,7 @@ public class PurpurWorldConfig {
public boolean skeletonControllable = true;
public double skeletonMaxHealth = 20.0D;
public boolean skeletonTakeDamageFromWater = false;
@@ -1929,7 +1929,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2227,6 +2324,7 @@ public class PurpurWorldConfig {
@@ -2232,6 +2329,7 @@ public class PurpurWorldConfig {
}
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
@@ -1937,7 +1937,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean skeletonHorseRidableInWater = true;
@@ -2238,6 +2336,7 @@ public class PurpurWorldConfig {
@@ -2243,6 +2341,7 @@ public class PurpurWorldConfig {
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
public boolean skeletonHorseTakeDamageFromWater = false;
@@ -1945,7 +1945,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -2254,6 +2353,7 @@ public class PurpurWorldConfig {
@@ -2259,6 +2358,7 @@ public class PurpurWorldConfig {
skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin);
skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax);
skeletonHorseTakeDamageFromWater = getBoolean("mobs.skeleton_horse.takes-damage-from-water", skeletonHorseTakeDamageFromWater);
@@ -1953,7 +1953,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean slimeRidable = false;
@@ -2264,6 +2364,7 @@ public class PurpurWorldConfig {
@@ -2269,6 +2369,7 @@ public class PurpurWorldConfig {
public Map<Integer, Double> slimeMaxHealthCache = new HashMap<>();
public Map<Integer, Double> slimeAttackDamageCache = new HashMap<>();
public boolean slimeTakeDamageFromWater = false;
@@ -1961,7 +1961,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void slimeSettings() {
slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
@@ -2278,6 +2379,7 @@ public class PurpurWorldConfig {
@@ -2283,6 +2384,7 @@ public class PurpurWorldConfig {
slimeMaxHealthCache.clear();
slimeAttackDamageCache.clear();
slimeTakeDamageFromWater = getBoolean("mobs.slime.takes-damage-from-water", slimeTakeDamageFromWater);
@@ -1969,7 +1969,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean snowGolemRidable = false;
@@ -2293,6 +2395,7 @@ public class PurpurWorldConfig {
@@ -2298,6 +2400,7 @@ public class PurpurWorldConfig {
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
public boolean snowGolemTakeDamageFromWater = true;
@@ -1977,7 +1977,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -2312,6 +2415,7 @@ public class PurpurWorldConfig {
@@ -2317,6 +2420,7 @@ public class PurpurWorldConfig {
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
snowGolemTakeDamageFromWater = getBoolean("mobs.snow_golem.takes-damage-from-water", snowGolemTakeDamageFromWater);
@@ -1985,7 +1985,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean squidRidable = false;
@@ -2321,6 +2425,7 @@ public class PurpurWorldConfig {
@@ -2326,6 +2430,7 @@ public class PurpurWorldConfig {
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
public boolean squidTakeDamageFromWater = false;
@@ -1993,7 +1993,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -2334,6 +2439,7 @@ public class PurpurWorldConfig {
@@ -2339,6 +2444,7 @@ public class PurpurWorldConfig {
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
squidTakeDamageFromWater = getBoolean("mobs.squid.takes-damage-from-water", squidTakeDamageFromWater);
@@ -2001,7 +2001,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean spiderRidable = false;
@@ -2341,6 +2447,7 @@ public class PurpurWorldConfig {
@@ -2346,6 +2452,7 @@ public class PurpurWorldConfig {
public boolean spiderControllable = true;
public double spiderMaxHealth = 16.0D;
public boolean spiderTakeDamageFromWater = false;
@@ -2009,7 +2009,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -2352,6 +2459,7 @@ public class PurpurWorldConfig {
@@ -2357,6 +2464,7 @@ public class PurpurWorldConfig {
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater);
@@ -2017,7 +2017,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean strayRidable = false;
@@ -2359,6 +2467,7 @@ public class PurpurWorldConfig {
@@ -2364,6 +2472,7 @@ public class PurpurWorldConfig {
public boolean strayControllable = true;
public double strayMaxHealth = 20.0D;
public boolean strayTakeDamageFromWater = false;
@@ -2025,7 +2025,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -2370,6 +2479,7 @@ public class PurpurWorldConfig {
@@ -2375,6 +2484,7 @@ public class PurpurWorldConfig {
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
strayTakeDamageFromWater = getBoolean("mobs.stray.takes-damage-from-water", strayTakeDamageFromWater);
@@ -2033,7 +2033,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean striderRidable = false;
@@ -2379,6 +2489,7 @@ public class PurpurWorldConfig {
@@ -2384,6 +2494,7 @@ public class PurpurWorldConfig {
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
public boolean striderTakeDamageFromWater = true;
@@ -2041,7 +2041,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -2392,6 +2503,7 @@ public class PurpurWorldConfig {
@@ -2397,6 +2508,7 @@ public class PurpurWorldConfig {
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
striderTakeDamageFromWater = getBoolean("mobs.strider.takes-damage-from-water", striderTakeDamageFromWater);
@@ -2049,7 +2049,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean traderLlamaRidable = false;
@@ -2405,6 +2517,7 @@ public class PurpurWorldConfig {
@@ -2410,6 +2522,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
public boolean traderLlamaTakeDamageFromWater = false;
@@ -2057,7 +2057,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -2424,12 +2537,14 @@ public class PurpurWorldConfig {
@@ -2429,12 +2542,14 @@ public class PurpurWorldConfig {
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
traderLlamaTakeDamageFromWater = getBoolean("mobs.trader_llama.takes-damage-from-water", traderLlamaTakeDamageFromWater);
@@ -2072,7 +2072,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
@@ -2440,6 +2555,7 @@ public class PurpurWorldConfig {
@@ -2445,6 +2560,7 @@ public class PurpurWorldConfig {
}
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater);
@@ -2080,7 +2080,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean turtleRidable = false;
@@ -2448,6 +2564,7 @@ public class PurpurWorldConfig {
@@ -2453,6 +2569,7 @@ public class PurpurWorldConfig {
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
public boolean turtleTakeDamageFromWater = false;
@@ -2088,7 +2088,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -2460,6 +2577,7 @@ public class PurpurWorldConfig {
@@ -2465,6 +2582,7 @@ public class PurpurWorldConfig {
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
turtleTakeDamageFromWater = getBoolean("mobs.turtle.takes-damage-from-water", turtleTakeDamageFromWater);
@@ -2096,7 +2096,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean vexRidable = false;
@@ -2468,6 +2586,7 @@ public class PurpurWorldConfig {
@@ -2473,6 +2591,7 @@ public class PurpurWorldConfig {
public double vexMaxY = 320D;
public double vexMaxHealth = 14.0D;
public boolean vexTakeDamageFromWater = false;
@@ -2104,7 +2104,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -2480,6 +2599,7 @@ public class PurpurWorldConfig {
@@ -2485,6 +2604,7 @@ public class PurpurWorldConfig {
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
vexTakeDamageFromWater = getBoolean("mobs.vex.takes-damage-from-water", vexTakeDamageFromWater);
@@ -2112,7 +2112,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean villagerRidable = false;
@@ -2497,6 +2617,7 @@ public class PurpurWorldConfig {
@@ -2502,6 +2622,7 @@ public class PurpurWorldConfig {
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
@@ -2120,7 +2120,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2518,6 +2639,7 @@ public class PurpurWorldConfig {
@@ -2523,6 +2644,7 @@ public class PurpurWorldConfig {
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater);
villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading);
@@ -2128,7 +2128,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean vindicatorRidable = false;
@@ -2526,6 +2648,7 @@ public class PurpurWorldConfig {
@@ -2531,6 +2653,7 @@ public class PurpurWorldConfig {
public double vindicatorMaxHealth = 24.0D;
public double vindicatorJohnnySpawnChance = 0D;
public boolean vindicatorTakeDamageFromWater = false;
@@ -2136,7 +2136,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -2538,6 +2661,7 @@ public class PurpurWorldConfig {
@@ -2543,6 +2666,7 @@ public class PurpurWorldConfig {
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
vindicatorTakeDamageFromWater = getBoolean("mobs.vindicator.takes-damage-from-water", vindicatorTakeDamageFromWater);
@@ -2144,7 +2144,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean wanderingTraderRidable = false;
@@ -2548,6 +2672,7 @@ public class PurpurWorldConfig {
@@ -2553,6 +2677,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
public boolean wanderingTraderAllowTrading = true;
@@ -2152,7 +2152,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2562,6 +2687,7 @@ public class PurpurWorldConfig {
@@ -2567,6 +2692,7 @@ public class PurpurWorldConfig {
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater);
wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading);
@@ -2160,7 +2160,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean witchRidable = false;
@@ -2569,6 +2695,7 @@ public class PurpurWorldConfig {
@@ -2574,6 +2700,7 @@ public class PurpurWorldConfig {
public boolean witchControllable = true;
public double witchMaxHealth = 26.0D;
public boolean witchTakeDamageFromWater = false;
@@ -2168,7 +2168,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -2580,6 +2707,7 @@ public class PurpurWorldConfig {
@@ -2585,6 +2712,7 @@ public class PurpurWorldConfig {
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
witchTakeDamageFromWater = getBoolean("mobs.witch.takes-damage-from-water", witchTakeDamageFromWater);
@@ -2176,7 +2176,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean witherRidable = false;
@@ -2594,6 +2722,7 @@ public class PurpurWorldConfig {
@@ -2599,6 +2727,7 @@ public class PurpurWorldConfig {
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
public boolean witherPlaySpawnSound = true;
@@ -2184,7 +2184,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2616,6 +2745,7 @@ public class PurpurWorldConfig {
@@ -2621,6 +2750,7 @@ public class PurpurWorldConfig {
witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles);
witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius);
witherPlaySpawnSound = getBoolean("mobs.wither.play-spawn-sound", witherPlaySpawnSound);
@@ -2192,7 +2192,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean witherSkeletonRidable = false;
@@ -2623,6 +2753,7 @@ public class PurpurWorldConfig {
@@ -2628,6 +2758,7 @@ public class PurpurWorldConfig {
public boolean witherSkeletonControllable = true;
public double witherSkeletonMaxHealth = 20.0D;
public boolean witherSkeletonTakeDamageFromWater = false;
@@ -2200,7 +2200,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -2634,6 +2765,7 @@ public class PurpurWorldConfig {
@@ -2639,6 +2770,7 @@ public class PurpurWorldConfig {
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
witherSkeletonTakeDamageFromWater = getBoolean("mobs.wither_skeleton.takes-damage-from-water", witherSkeletonTakeDamageFromWater);
@@ -2208,7 +2208,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean wolfRidable = false;
@@ -2645,6 +2777,7 @@ public class PurpurWorldConfig {
@@ -2650,6 +2782,7 @@ public class PurpurWorldConfig {
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
public boolean wolfTakeDamageFromWater = false;
@@ -2216,7 +2216,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -2664,6 +2797,7 @@ public class PurpurWorldConfig {
@@ -2669,6 +2802,7 @@ public class PurpurWorldConfig {
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
wolfTakeDamageFromWater = getBoolean("mobs.wolf.takes-damage-from-water", wolfTakeDamageFromWater);
@@ -2224,7 +2224,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean zoglinRidable = false;
@@ -2671,6 +2805,7 @@ public class PurpurWorldConfig {
@@ -2676,6 +2810,7 @@ public class PurpurWorldConfig {
public boolean zoglinControllable = true;
public double zoglinMaxHealth = 40.0D;
public boolean zoglinTakeDamageFromWater = false;
@@ -2232,7 +2232,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -2682,6 +2817,7 @@ public class PurpurWorldConfig {
@@ -2687,6 +2822,7 @@ public class PurpurWorldConfig {
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
zoglinTakeDamageFromWater = getBoolean("mobs.zoglin.takes-damage-from-water", zoglinTakeDamageFromWater);
@@ -2240,7 +2240,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean zombieRidable = false;
@@ -2695,6 +2831,7 @@ public class PurpurWorldConfig {
@@ -2700,6 +2836,7 @@ public class PurpurWorldConfig {
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
@@ -2248,7 +2248,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2712,6 +2849,7 @@ public class PurpurWorldConfig {
@@ -2717,6 +2854,7 @@ public class PurpurWorldConfig {
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater);
@@ -2256,7 +2256,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean zombieHorseRidableInWater = false;
@@ -2724,6 +2862,7 @@ public class PurpurWorldConfig {
@@ -2729,6 +2867,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
public boolean zombieHorseTakeDamageFromWater = false;
@@ -2264,7 +2264,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2741,6 +2880,7 @@ public class PurpurWorldConfig {
@@ -2746,6 +2885,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
zombieHorseTakeDamageFromWater = getBoolean("mobs.zombie_horse.takes-damage-from-water", zombieHorseTakeDamageFromWater);
@@ -2272,7 +2272,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean zombieVillagerRidable = false;
@@ -2755,6 +2895,7 @@ public class PurpurWorldConfig {
@@ -2760,6 +2900,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;
@@ -2280,7 +2280,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2773,6 +2914,7 @@ public class PurpurWorldConfig {
@@ -2778,6 +2919,7 @@ public class PurpurWorldConfig {
zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin);
zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);
zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled);
@@ -2288,7 +2288,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
}
public boolean zombifiedPiglinRidable = false;
@@ -2785,6 +2927,7 @@ public class PurpurWorldConfig {
@@ -2790,6 +2932,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
public boolean zombifiedPiglinTakeDamageFromWater = false;
@@ -2296,7 +2296,7 @@ index dad9ee9b52a152bd64f116e83ed95e29c62003ad..2c3c65c9eed0a21d33c7e1958a7660cf
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2801,6 +2944,7 @@ public class PurpurWorldConfig {
@@ -2806,6 +2949,7 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater);