Turtle eggs random tick crack chance

This commit is contained in:
BillyGalbreath
2021-12-31 06:28:36 -06:00
parent 996ea58dbe
commit 1597c773e3
164 changed files with 861 additions and 797 deletions

View File

@@ -1157,10 +1157,10 @@ index 1a8df13b06b1ac5e5a7d63033b4a53261c779eda..8be025b735cea47ab3ce6c6b2aef052e
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f7debdeb6 100644
index 31896c8f2e76bfd3d29f78a4e7569b04e11fb7c0..f4bd1f5bcfcba3d92c1c3d340b437727ae6dbdb3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1014,11 +1014,13 @@ public class PurpurWorldConfig {
@@ -1025,11 +1025,13 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
public int axolotlBreedingTicks = 6000;
@@ -1174,7 +1174,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean batRidable = false;
@@ -1033,6 +1035,7 @@ public class PurpurWorldConfig {
@@ -1044,6 +1046,7 @@ public class PurpurWorldConfig {
public double batArmorToughness = 0.0D;
public double batAttackKnockback = 0.0D;
public boolean batTakeDamageFromWater = false;
@@ -1182,7 +1182,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void batSettings() {
batRidable = getBoolean("mobs.bat.ridable", batRidable);
batRidableInWater = getBoolean("mobs.bat.ridable-in-water", batRidableInWater);
@@ -1044,6 +1047,7 @@ public class PurpurWorldConfig {
@@ -1055,6 +1058,7 @@ public class PurpurWorldConfig {
}
batMaxHealth = getDouble("mobs.bat.attributes.max_health", batMaxHealth);
batTakeDamageFromWater = getBoolean("mobs.bat.takes-damage-from-water", batTakeDamageFromWater);
@@ -1190,7 +1190,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean beeRidable = false;
@@ -1054,6 +1058,7 @@ public class PurpurWorldConfig {
@@ -1065,6 +1069,7 @@ public class PurpurWorldConfig {
public boolean beeTakeDamageFromWater = false;
public boolean beeCanWorkAtNight = false;
public boolean beeCanWorkInRain = false;
@@ -1198,7 +1198,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -1068,6 +1073,7 @@ public class PurpurWorldConfig {
@@ -1079,6 +1084,7 @@ public class PurpurWorldConfig {
beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater);
beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight);
beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain);
@@ -1206,7 +1206,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean blazeRidable = false;
@@ -1075,6 +1081,7 @@ public class PurpurWorldConfig {
@@ -1086,6 +1092,7 @@ public class PurpurWorldConfig {
public double blazeMaxY = 256D;
public double blazeMaxHealth = 20.0D;
public boolean blazeTakeDamageFromWater = true;
@@ -1214,7 +1214,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void blazeSettings() {
blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable);
blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater);
@@ -1086,6 +1093,7 @@ public class PurpurWorldConfig {
@@ -1097,6 +1104,7 @@ public class PurpurWorldConfig {
}
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
blazeTakeDamageFromWater = getBoolean("mobs.blaze.takes-damage-from-water", blazeTakeDamageFromWater);
@@ -1222,7 +1222,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean catRidable = false;
@@ -1097,6 +1105,7 @@ public class PurpurWorldConfig {
@@ -1108,6 +1116,7 @@ public class PurpurWorldConfig {
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
public boolean catTakeDamageFromWater = false;
@@ -1230,7 +1230,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -1116,12 +1125,14 @@ public class PurpurWorldConfig {
@@ -1127,12 +1136,14 @@ public class PurpurWorldConfig {
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks);
catTakeDamageFromWater = getBoolean("mobs.cat.takes-damage-from-water", catTakeDamageFromWater);
@@ -1245,7 +1245,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void caveSpiderSettings() {
caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable);
caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater);
@@ -1132,6 +1143,7 @@ public class PurpurWorldConfig {
@@ -1143,6 +1154,7 @@ public class PurpurWorldConfig {
}
caveSpiderMaxHealth = getDouble("mobs.cave_spider.attributes.max_health", caveSpiderMaxHealth);
caveSpiderTakeDamageFromWater = getBoolean("mobs.cave_spider.takes-damage-from-water", caveSpiderTakeDamageFromWater);
@@ -1253,7 +1253,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean chickenRidable = false;
@@ -1140,6 +1152,7 @@ public class PurpurWorldConfig {
@@ -1151,6 +1163,7 @@ public class PurpurWorldConfig {
public boolean chickenRetaliate = false;
public int chickenBreedingTicks = 6000;
public boolean chickenTakeDamageFromWater = false;
@@ -1261,7 +1261,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -1152,11 +1165,13 @@ public class PurpurWorldConfig {
@@ -1163,11 +1176,13 @@ public class PurpurWorldConfig {
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
chickenBreedingTicks = getInt("mobs.chicken.breeding-delay-ticks", chickenBreedingTicks);
chickenTakeDamageFromWater = getBoolean("mobs.chicken.takes-damage-from-water", chickenTakeDamageFromWater);
@@ -1275,7 +1275,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void codSettings() {
codRidable = getBoolean("mobs.cod.ridable", codRidable);
if (PurpurConfig.version < 10) {
@@ -1166,6 +1181,7 @@ public class PurpurWorldConfig {
@@ -1177,6 +1192,7 @@ public class PurpurWorldConfig {
}
codMaxHealth = getDouble("mobs.cod.attributes.max_health", codMaxHealth);
codTakeDamageFromWater = getBoolean("mobs.cod.takes-damage-from-water", codTakeDamageFromWater);
@@ -1283,7 +1283,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean cowRidable = false;
@@ -1176,6 +1192,7 @@ public class PurpurWorldConfig {
@@ -1187,6 +1203,7 @@ public class PurpurWorldConfig {
public boolean cowTakeDamageFromWater = false;
public double cowNaturallyAggressiveToPlayersChance = 0.0D;
public double cowNaturallyAggressiveToPlayersDamage = 2.0D;
@@ -1291,7 +1291,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void cowSettings() {
if (PurpurConfig.version < 22) {
double oldValue = getDouble("mobs.cow.naturally-aggressive-to-players-chance", cowNaturallyAggressiveToPlayersChance);
@@ -1195,6 +1212,7 @@ public class PurpurWorldConfig {
@@ -1206,6 +1223,7 @@ public class PurpurWorldConfig {
cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);
cowNaturallyAggressiveToPlayersChance = getDouble("mobs.cow.naturally-aggressive-to-players.chance", cowNaturallyAggressiveToPlayersChance);
cowNaturallyAggressiveToPlayersDamage = getDouble("mobs.cow.naturally-aggressive-to-players.damage", cowNaturallyAggressiveToPlayersDamage);
@@ -1299,7 +1299,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean creeperRidable = false;
@@ -1206,6 +1224,7 @@ public class PurpurWorldConfig {
@@ -1217,6 +1235,7 @@ public class PurpurWorldConfig {
public boolean creeperTakeDamageFromWater = false;
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
@@ -1307,7 +1307,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1221,6 +1240,7 @@ public class PurpurWorldConfig {
@@ -1232,6 +1251,7 @@ public class PurpurWorldConfig {
creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
@@ -1315,7 +1315,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean dolphinRidable = false;
@@ -1231,6 +1251,7 @@ public class PurpurWorldConfig {
@@ -1242,6 +1262,7 @@ public class PurpurWorldConfig {
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
public double dolphinNaturallyAggressiveToPlayersChance = 0.0D;
@@ -1323,7 +1323,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown);
@@ -1245,6 +1266,7 @@ public class PurpurWorldConfig {
@@ -1256,6 +1277,7 @@ public class PurpurWorldConfig {
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);
dolphinNaturallyAggressiveToPlayersChance = getDouble("mobs.dolphin.naturally-aggressive-to-players-chance", dolphinNaturallyAggressiveToPlayersChance);
@@ -1331,7 +1331,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean donkeyRidableInWater = false;
@@ -1256,6 +1278,7 @@ public class PurpurWorldConfig {
@@ -1267,6 +1289,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMax = 0.175D;
public int donkeyBreedingTicks = 6000;
public boolean donkeyTakeDamageFromWater = false;
@@ -1339,7 +1339,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1273,6 +1296,7 @@ public class PurpurWorldConfig {
@@ -1284,6 +1307,7 @@ public class PurpurWorldConfig {
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
donkeyBreedingTicks = getInt("mobs.donkey.breeding-delay-ticks", donkeyBreedingTicks);
donkeyTakeDamageFromWater = getBoolean("mobs.donkey.takes-damage-from-water", donkeyTakeDamageFromWater);
@@ -1347,7 +1347,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean drownedRidable = false;
@@ -1284,6 +1308,7 @@ public class PurpurWorldConfig {
@@ -1295,6 +1319,7 @@ public class PurpurWorldConfig {
public boolean drownedJockeyTryExistingChickens = true;
public boolean drownedTakeDamageFromWater = false;
public boolean drownedBreakDoors = false;
@@ -1355,7 +1355,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1299,11 +1324,13 @@ public class PurpurWorldConfig {
@@ -1310,11 +1335,13 @@ public class PurpurWorldConfig {
drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors);
@@ -1369,7 +1369,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void elderGuardianSettings() {
elderGuardianRidable = getBoolean("mobs.elder_guardian.ridable", elderGuardianRidable);
if (PurpurConfig.version < 10) {
@@ -1313,6 +1340,7 @@ public class PurpurWorldConfig {
@@ -1324,6 +1351,7 @@ public class PurpurWorldConfig {
}
elderGuardianMaxHealth = getDouble("mobs.elder_guardian.attributes.max_health", elderGuardianMaxHealth);
elderGuardianTakeDamageFromWater = getBoolean("mobs.elder_guardian.takes-damage-from-water", elderGuardianTakeDamageFromWater);
@@ -1377,7 +1377,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean enderDragonRidable = false;
@@ -1355,6 +1383,7 @@ public class PurpurWorldConfig {
@@ -1366,6 +1394,7 @@ public class PurpurWorldConfig {
public boolean endermanIgnorePlayerDragonHead = false;
public boolean endermanDisableStareAggro = false;
public boolean endermanIgnoreProjectiles = false;
@@ -1385,7 +1385,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -1377,12 +1406,14 @@ public class PurpurWorldConfig {
@@ -1388,12 +1417,14 @@ public class PurpurWorldConfig {
endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead);
endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro);
endermanIgnoreProjectiles = getBoolean("mobs.enderman.ignore-projectiles", endermanIgnoreProjectiles);
@@ -1400,7 +1400,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void endermiteSettings() {
endermiteRidable = getBoolean("mobs.endermite.ridable", endermiteRidable);
endermiteRidableInWater = getBoolean("mobs.endermite.ridable-in-water", endermiteRidableInWater);
@@ -1393,6 +1424,7 @@ public class PurpurWorldConfig {
@@ -1404,6 +1435,7 @@ public class PurpurWorldConfig {
}
endermiteMaxHealth = getDouble("mobs.endermite.attributes.max_health", endermiteMaxHealth);
endermiteTakeDamageFromWater = getBoolean("mobs.endermite.takes-damage-from-water", endermiteTakeDamageFromWater);
@@ -1408,7 +1408,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean evokerRidable = false;
@@ -1400,6 +1432,7 @@ public class PurpurWorldConfig {
@@ -1411,6 +1443,7 @@ public class PurpurWorldConfig {
public double evokerMaxHealth = 24.0D;
public boolean evokerBypassMobGriefing = false;
public boolean evokerTakeDamageFromWater = false;
@@ -1416,7 +1416,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -1411,6 +1444,7 @@ public class PurpurWorldConfig {
@@ -1422,6 +1455,7 @@ public class PurpurWorldConfig {
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
evokerBypassMobGriefing = getBoolean("mobs.evoker.bypass-mob-griefing", evokerBypassMobGriefing);
evokerTakeDamageFromWater = getBoolean("mobs.evoker.takes-damage-from-water", evokerTakeDamageFromWater);
@@ -1424,7 +1424,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean foxRidable = false;
@@ -1420,6 +1454,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1465,7 @@ public class PurpurWorldConfig {
public int foxBreedingTicks = 6000;
public boolean foxBypassMobGriefing = false;
public boolean foxTakeDamageFromWater = false;
@@ -1432,7 +1432,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -1433,6 +1468,7 @@ public class PurpurWorldConfig {
@@ -1444,6 +1479,7 @@ public class PurpurWorldConfig {
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
foxBypassMobGriefing = getBoolean("mobs.fox.bypass-mob-griefing", foxBypassMobGriefing);
foxTakeDamageFromWater = getBoolean("mobs.fox.takes-damage-from-water", foxTakeDamageFromWater);
@@ -1440,7 +1440,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean ghastRidable = false;
@@ -1440,6 +1476,7 @@ public class PurpurWorldConfig {
@@ -1451,6 +1487,7 @@ public class PurpurWorldConfig {
public double ghastMaxY = 256D;
public double ghastMaxHealth = 10.0D;
public boolean ghastTakeDamageFromWater = false;
@@ -1448,7 +1448,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void ghastSettings() {
ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable);
ghastRidableInWater = getBoolean("mobs.ghast.ridable-in-water", ghastRidableInWater);
@@ -1451,6 +1488,7 @@ public class PurpurWorldConfig {
@@ -1462,6 +1499,7 @@ public class PurpurWorldConfig {
}
ghastMaxHealth = getDouble("mobs.ghast.attributes.max_health", ghastMaxHealth);
ghastTakeDamageFromWater = getBoolean("mobs.ghast.takes-damage-from-water", ghastTakeDamageFromWater);
@@ -1456,7 +1456,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean giantRidable = false;
@@ -1463,6 +1501,7 @@ public class PurpurWorldConfig {
@@ -1474,6 +1512,7 @@ public class PurpurWorldConfig {
public boolean giantHaveAI = false;
public boolean giantHaveHostileAI = false;
public boolean giantTakeDamageFromWater = false;
@@ -1464,7 +1464,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void giantSettings() {
giantRidable = getBoolean("mobs.giant.ridable", giantRidable);
giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater);
@@ -1483,17 +1522,20 @@ public class PurpurWorldConfig {
@@ -1494,17 +1533,20 @@ 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);
@@ -1485,7 +1485,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean goatRidable = false;
@@ -1501,17 +1543,20 @@ public class PurpurWorldConfig {
@@ -1512,17 +1554,20 @@ public class PurpurWorldConfig {
public double goatMaxHealth = 10.0D;
public int goatBreedingTicks = 6000;
public boolean goatTakeDamageFromWater = false;
@@ -1506,7 +1506,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void guardianSettings() {
guardianRidable = getBoolean("mobs.guardian.ridable", guardianRidable);
if (PurpurConfig.version < 10) {
@@ -1521,6 +1566,7 @@ public class PurpurWorldConfig {
@@ -1532,6 +1577,7 @@ public class PurpurWorldConfig {
}
guardianMaxHealth = getDouble("mobs.guardian.attributes.max_health", guardianMaxHealth);
guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater);
@@ -1514,7 +1514,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean forceHalloweenSeason = false;
@@ -1535,6 +1581,7 @@ public class PurpurWorldConfig {
@@ -1546,6 +1592,7 @@ public class PurpurWorldConfig {
public double hoglinMaxHealth = 40.0D;
public int hoglinBreedingTicks = 6000;
public boolean hoglinTakeDamageFromWater = false;
@@ -1522,7 +1522,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -1546,6 +1593,7 @@ public class PurpurWorldConfig {
@@ -1557,6 +1604,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);
@@ -1530,7 +1530,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean horseRidableInWater = false;
@@ -1558,6 +1606,7 @@ public class PurpurWorldConfig {
@@ -1569,6 +1617,7 @@ public class PurpurWorldConfig {
public int horseBreedingTicks = 6000;
public boolean horseTakeDamageFromWater = false;
public boolean horseStandWithRider = true;
@@ -1538,7 +1538,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1576,6 +1625,7 @@ public class PurpurWorldConfig {
@@ -1587,6 +1636,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);
@@ -1546,7 +1546,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean huskRidable = false;
@@ -1586,6 +1636,7 @@ public class PurpurWorldConfig {
@@ -1597,6 +1647,7 @@ public class PurpurWorldConfig {
public double huskJockeyChance = 0.05D;
public boolean huskJockeyTryExistingChickens = true;
public boolean huskTakeDamageFromWater = false;
@@ -1554,7 +1554,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void huskSettings() {
huskRidable = getBoolean("mobs.husk.ridable", huskRidable);
huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater);
@@ -1600,6 +1651,7 @@ public class PurpurWorldConfig {
@@ -1611,6 +1662,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);
@@ -1562,7 +1562,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean illusionerRidable = false;
@@ -1608,6 +1660,7 @@ public class PurpurWorldConfig {
@@ -1619,6 +1671,7 @@ public class PurpurWorldConfig {
public double illusionerFollowRange = 18.0D;
public double illusionerMaxHealth = 32.0D;
public boolean illusionerTakeDamageFromWater = false;
@@ -1570,7 +1570,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void illusionerSettings() {
illusionerRidable = getBoolean("mobs.illusioner.ridable", illusionerRidable);
illusionerRidableInWater = getBoolean("mobs.illusioner.ridable-in-water", illusionerRidableInWater);
@@ -1624,6 +1677,7 @@ public class PurpurWorldConfig {
@@ -1635,6 +1688,7 @@ public class PurpurWorldConfig {
}
illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max_health", illusionerMaxHealth);
illusionerTakeDamageFromWater = getBoolean("mobs.illusioner.takes-damage-from-water", illusionerTakeDamageFromWater);
@@ -1578,7 +1578,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean ironGolemRidable = false;
@@ -1632,6 +1686,7 @@ public class PurpurWorldConfig {
@@ -1643,6 +1697,7 @@ public class PurpurWorldConfig {
public double ironGolemMaxHealth = 100.0D;
public boolean ironGolemTakeDamageFromWater = false;
public boolean ironGolemPoppyCalm = false;
@@ -1586,7 +1586,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void ironGolemSettings() {
ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable);
ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater);
@@ -1644,6 +1699,7 @@ public class PurpurWorldConfig {
@@ -1655,6 +1710,7 @@ public class PurpurWorldConfig {
ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth);
ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater);
ironGolemPoppyCalm = getBoolean("mobs.iron_golem.poppy-calms-anger", ironGolemPoppyCalm);
@@ -1594,7 +1594,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean llamaRidable = false;
@@ -1657,6 +1713,7 @@ public class PurpurWorldConfig {
@@ -1668,6 +1724,7 @@ public class PurpurWorldConfig {
public int llamaBreedingTicks = 6000;
public boolean llamaTakeDamageFromWater = false;
public boolean llamaJoinCaravans = true;
@@ -1602,7 +1602,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1676,12 +1733,14 @@ public class PurpurWorldConfig {
@@ -1687,12 +1744,14 @@ 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);
@@ -1617,7 +1617,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void magmaCubeSettings() {
magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable);
magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater);
@@ -1692,6 +1751,7 @@ public class PurpurWorldConfig {
@@ -1703,6 +1762,7 @@ public class PurpurWorldConfig {
}
magmaCubeMaxHealth = getString("mobs.magma_cube.attributes.max_health", magmaCubeMaxHealth);
magmaCubeTakeDamageFromWater = getBoolean("mobs.magma_cube.takes-damage-from-water", magmaCubeTakeDamageFromWater);
@@ -1625,7 +1625,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean mooshroomRidable = false;
@@ -1699,6 +1759,7 @@ public class PurpurWorldConfig {
@@ -1710,6 +1770,7 @@ public class PurpurWorldConfig {
public double mooshroomMaxHealth = 10.0D;
public int mooshroomBreedingTicks = 6000;
public boolean mooshroomTakeDamageFromWater = false;
@@ -1633,7 +1633,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1710,6 +1771,7 @@ public class PurpurWorldConfig {
@@ -1721,6 +1782,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);
@@ -1641,7 +1641,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean muleRidableInWater = false;
@@ -1721,6 +1783,7 @@ public class PurpurWorldConfig {
@@ -1732,6 +1794,7 @@ public class PurpurWorldConfig {
public double muleMovementSpeedMax = 0.175D;
public int muleBreedingTicks = 6000;
public boolean muleTakeDamageFromWater = false;
@@ -1649,7 +1649,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1738,6 +1801,7 @@ public class PurpurWorldConfig {
@@ -1749,6 +1812,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);
@@ -1657,7 +1657,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean ocelotRidable = false;
@@ -1745,6 +1809,7 @@ public class PurpurWorldConfig {
@@ -1756,6 +1820,7 @@ public class PurpurWorldConfig {
public double ocelotMaxHealth = 10.0D;
public int ocelotBreedingTicks = 6000;
public boolean ocelotTakeDamageFromWater = false;
@@ -1665,7 +1665,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1756,6 +1821,7 @@ public class PurpurWorldConfig {
@@ -1767,6 +1832,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);
@@ -1673,7 +1673,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean pandaRidable = false;
@@ -1763,6 +1829,7 @@ public class PurpurWorldConfig {
@@ -1774,6 +1840,7 @@ public class PurpurWorldConfig {
public double pandaMaxHealth = 20.0D;
public int pandaBreedingTicks = 6000;
public boolean pandaTakeDamageFromWater = false;
@@ -1681,7 +1681,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1774,6 +1841,7 @@ public class PurpurWorldConfig {
@@ -1785,6 +1852,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);
@@ -1689,7 +1689,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean parrotRidable = false;
@@ -1782,6 +1850,7 @@ public class PurpurWorldConfig {
@@ -1793,6 +1861,7 @@ public class PurpurWorldConfig {
public double parrotMaxHealth = 6.0D;
public boolean parrotTakeDamageFromWater = false;
public boolean parrotBreedable = false;
@@ -1697,7 +1697,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void parrotSettings() {
parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable);
parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater);
@@ -1794,6 +1863,7 @@ public class PurpurWorldConfig {
@@ -1805,6 +1874,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);
@@ -1705,7 +1705,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean phantomRidable = false;
@@ -1823,6 +1893,7 @@ public class PurpurWorldConfig {
@@ -1834,6 +1904,7 @@ public class PurpurWorldConfig {
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
public boolean phantomTakeDamageFromWater = false;
@@ -1713,7 +1713,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -1856,6 +1927,7 @@ public class PurpurWorldConfig {
@@ -1867,6 +1938,7 @@ public class PurpurWorldConfig {
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater);
@@ -1721,7 +1721,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean pigRidable = false;
@@ -1864,6 +1936,7 @@ public class PurpurWorldConfig {
@@ -1875,6 +1947,7 @@ public class PurpurWorldConfig {
public boolean pigGiveSaddleBack = false;
public int pigBreedingTicks = 6000;
public boolean pigTakeDamageFromWater = false;
@@ -1729,7 +1729,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1876,6 +1949,7 @@ public class PurpurWorldConfig {
@@ -1887,6 +1960,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);
@@ -1737,7 +1737,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean piglinRidable = false;
@@ -1884,6 +1958,7 @@ public class PurpurWorldConfig {
@@ -1895,6 +1969,7 @@ public class PurpurWorldConfig {
public boolean piglinBypassMobGriefing = false;
public boolean piglinTakeDamageFromWater = false;
public int piglinPortalSpawnModifier = 2000;
@@ -1745,7 +1745,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1896,12 +1971,14 @@ public class PurpurWorldConfig {
@@ -1907,12 +1982,14 @@ 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);
@@ -1760,7 +1760,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void piglinBruteSettings() {
piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable);
piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater);
@@ -1912,6 +1989,7 @@ public class PurpurWorldConfig {
@@ -1923,6 +2000,7 @@ public class PurpurWorldConfig {
}
piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth);
piglinBruteTakeDamageFromWater = getBoolean("mobs.piglin_brute.takes-damage-from-water", piglinBruteTakeDamageFromWater);
@@ -1768,7 +1768,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean pillagerRidable = false;
@@ -1919,6 +1997,7 @@ public class PurpurWorldConfig {
@@ -1930,6 +2008,7 @@ public class PurpurWorldConfig {
public double pillagerMaxHealth = 24.0D;
public boolean pillagerBypassMobGriefing = false;
public boolean pillagerTakeDamageFromWater = false;
@@ -1776,7 +1776,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1930,6 +2009,7 @@ public class PurpurWorldConfig {
@@ -1941,6 +2020,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);
@@ -1784,7 +1784,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean polarBearRidable = false;
@@ -1939,6 +2019,7 @@ public class PurpurWorldConfig {
@@ -1950,6 +2030,7 @@ public class PurpurWorldConfig {
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
public boolean polarBearTakeDamageFromWater = false;
@@ -1792,7 +1792,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1953,11 +2034,13 @@ public class PurpurWorldConfig {
@@ -1964,11 +2045,13 @@ 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);
@@ -1806,7 +1806,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void pufferfishSettings() {
pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable);
if (PurpurConfig.version < 10) {
@@ -1967,6 +2050,7 @@ public class PurpurWorldConfig {
@@ -1978,6 +2061,7 @@ public class PurpurWorldConfig {
}
pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth);
pufferfishTakeDamageFromWater = getBoolean("mobs.pufferfish.takes-damage-from-water", pufferfishTakeDamageFromWater);
@@ -1814,7 +1814,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean rabbitRidable = false;
@@ -1977,6 +2061,7 @@ public class PurpurWorldConfig {
@@ -1988,6 +2072,7 @@ public class PurpurWorldConfig {
public int rabbitBreedingTicks = 6000;
public boolean rabbitBypassMobGriefing = false;
public boolean rabbitTakeDamageFromWater = false;
@@ -1822,7 +1822,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1991,6 +2076,7 @@ public class PurpurWorldConfig {
@@ -2002,6 +2087,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);
@@ -1830,7 +1830,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean ravagerRidable = false;
@@ -1999,6 +2085,7 @@ public class PurpurWorldConfig {
@@ -2010,6 +2096,7 @@ public class PurpurWorldConfig {
public boolean ravagerBypassMobGriefing = false;
public boolean ravagerTakeDamageFromWater = false;
public List<Block> ravagerGriefableBlocks = new ArrayList<>();
@@ -1838,7 +1838,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -2027,11 +2114,13 @@ public class PurpurWorldConfig {
@@ -2038,11 +2125,13 @@ public class PurpurWorldConfig {
ravagerGriefableBlocks.add(block);
}
});
@@ -1852,7 +1852,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void salmonSettings() {
salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable);
if (PurpurConfig.version < 10) {
@@ -2041,6 +2130,7 @@ public class PurpurWorldConfig {
@@ -2052,6 +2141,7 @@ public class PurpurWorldConfig {
}
salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth);
salmonTakeDamageFromWater = getBoolean("mobs.salmon.takes-damage-from-water", salmonTakeDamageFromWater);
@@ -1860,7 +1860,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean sheepRidable = false;
@@ -2049,6 +2139,7 @@ public class PurpurWorldConfig {
@@ -2060,6 +2150,7 @@ public class PurpurWorldConfig {
public int sheepBreedingTicks = 6000;
public boolean sheepBypassMobGriefing = false;
public boolean sheepTakeDamageFromWater = false;
@@ -1868,7 +1868,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -2061,6 +2152,7 @@ public class PurpurWorldConfig {
@@ -2072,6 +2163,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);
@@ -1876,7 +1876,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean shulkerRidable = false;
@@ -2073,6 +2165,7 @@ public class PurpurWorldConfig {
@@ -2084,6 +2176,7 @@ public class PurpurWorldConfig {
public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0";
public boolean shulkerSpawnFromBulletRandomColor = false;
public boolean shulkerChangeColorWithDye = false;
@@ -1884,7 +1884,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void shulkerSettings() {
shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable);
shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater);
@@ -2089,6 +2182,7 @@ public class PurpurWorldConfig {
@@ -2100,6 +2193,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);
@@ -1892,7 +1892,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean silverfishRidable = false;
@@ -2096,6 +2190,7 @@ public class PurpurWorldConfig {
@@ -2107,6 +2201,7 @@ public class PurpurWorldConfig {
public double silverfishMaxHealth = 8.0D;
public boolean silverfishBypassMobGriefing = false;
public boolean silverfishTakeDamageFromWater = false;
@@ -1900,7 +1900,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -2107,12 +2202,14 @@ public class PurpurWorldConfig {
@@ -2118,12 +2213,14 @@ 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);
@@ -1915,7 +1915,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void skeletonSettings() {
skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable);
skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater);
@@ -2123,6 +2220,7 @@ public class PurpurWorldConfig {
@@ -2134,6 +2231,7 @@ public class PurpurWorldConfig {
}
skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth);
skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater);
@@ -1923,7 +1923,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean skeletonHorseRidableInWater = true;
@@ -2134,6 +2232,7 @@ public class PurpurWorldConfig {
@@ -2145,6 +2243,7 @@ public class PurpurWorldConfig {
public double skeletonHorseMovementSpeedMin = 0.2D;
public double skeletonHorseMovementSpeedMax = 0.2D;
public boolean skeletonHorseTakeDamageFromWater = false;
@@ -1931,7 +1931,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void skeletonHorseSettings() {
skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater);
skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim);
@@ -2150,6 +2249,7 @@ public class PurpurWorldConfig {
@@ -2161,6 +2260,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);
@@ -1939,7 +1939,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean slimeRidable = false;
@@ -2157,6 +2257,7 @@ public class PurpurWorldConfig {
@@ -2168,6 +2268,7 @@ public class PurpurWorldConfig {
public String slimeMaxHealth = "size * size";
public Map<Integer, Double> slimeMaxHealthCache = new HashMap<>();
public boolean slimeTakeDamageFromWater = false;
@@ -1947,7 +1947,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void slimeSettings() {
slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable);
slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater);
@@ -2168,6 +2269,7 @@ public class PurpurWorldConfig {
@@ -2179,6 +2280,7 @@ public class PurpurWorldConfig {
slimeMaxHealth = getString("mobs.slime.attributes.max_health", slimeMaxHealth);
slimeMaxHealthCache.clear();
slimeTakeDamageFromWater = getBoolean("mobs.slime.takes-damage-from-water", slimeTakeDamageFromWater);
@@ -1955,7 +1955,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean snowGolemRidable = false;
@@ -2182,6 +2284,7 @@ public class PurpurWorldConfig {
@@ -2193,6 +2295,7 @@ public class PurpurWorldConfig {
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
public boolean snowGolemTakeDamageFromWater = true;
@@ -1963,7 +1963,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -2200,6 +2303,7 @@ public class PurpurWorldConfig {
@@ -2211,6 +2314,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);
@@ -1971,7 +1971,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean squidRidable = false;
@@ -2208,6 +2312,7 @@ public class PurpurWorldConfig {
@@ -2219,6 +2323,7 @@ public class PurpurWorldConfig {
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
public boolean squidTakeDamageFromWater = false;
@@ -1979,7 +1979,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
if (PurpurConfig.version < 10) {
@@ -2220,12 +2325,14 @@ public class PurpurWorldConfig {
@@ -2231,12 +2336,14 @@ 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);
@@ -1994,7 +1994,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -2236,12 +2343,14 @@ public class PurpurWorldConfig {
@@ -2247,12 +2354,14 @@ public class PurpurWorldConfig {
}
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater);
@@ -2009,7 +2009,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -2252,6 +2361,7 @@ public class PurpurWorldConfig {
@@ -2263,6 +2372,7 @@ public class PurpurWorldConfig {
}
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
strayTakeDamageFromWater = getBoolean("mobs.stray.takes-damage-from-water", strayTakeDamageFromWater);
@@ -2017,7 +2017,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean striderRidable = false;
@@ -2260,6 +2370,7 @@ public class PurpurWorldConfig {
@@ -2271,6 +2381,7 @@ public class PurpurWorldConfig {
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
public boolean striderTakeDamageFromWater = true;
@@ -2025,7 +2025,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -2272,6 +2383,7 @@ public class PurpurWorldConfig {
@@ -2283,6 +2394,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);
@@ -2033,7 +2033,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
}
public boolean traderLlamaRidable = false;
@@ -2284,6 +2396,7 @@ public class PurpurWorldConfig {
@@ -2295,6 +2407,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
public boolean traderLlamaTakeDamageFromWater = false;
@@ -2041,7 +2041,7 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -2302,11 +2415,13 @@ public class PurpurWorldConfig {
@@ -2313,11 +2426,13 @@ 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);
@@ -2055,24 +2055,24 @@ index 9938ec945282ec726f720abb140743f9bc1f1834..3ab0c55db605c15ba3488b682b06ee8f
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
if (PurpurConfig.version < 10) {
@@ -2316,6 +2431,7 @@ public class PurpurWorldConfig {
@@ -2327,6 +2442,7 @@ public class PurpurWorldConfig {
}
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater);
+ tropicalFishAlwaysDropExp = getBoolean("mobs.tropical_fish.always-drop-exp", tropicalFishAlwaysDropExp);
}
public boolean turtleEggsBypassMobGriefing = false;
@@ -2331,6 +2447,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromMinecarts = true;
public boolean turtleRidable = false;
@@ -2334,6 +2450,7 @@ public class PurpurWorldConfig {
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
public boolean turtleTakeDamageFromWater = false;
+ public boolean turtleAlwaysDropExp = false;
private void turtleEggSettings() {
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -2345,6 +2462,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
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);
+ turtleAlwaysDropExp = getBoolean("mobs.turtle.always-drop-exp", turtleAlwaysDropExp);