Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

drop two config options in favor of PurpurExtras impl

Browse Source 
dropped options:
- `mobs.snow_golem.drop-pumpkin-when-sheared`
- `mobs.sheep.jeb-shear-random-color`
This commit is contained in:
granny
2024-01-07 16:50:35 -08:00
parent 3727300bd0
commit d05e78bdb1
108 changed files with 302 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
patches/server/0225-Mobs-always-drop-experience.patch
View File

@@ -165,7 +165,7 @@ index c2817324ff57860ea2628dc4ac8e78b76cf67a5a..64aba511e615983988cdb6a0fd45b7d9
protected void registerGoals() {
if (level().purpurConfig.ironGolemCanSwim) this.goalSelector.addGoal(0, new net.minecraft.world.entity.ai.goal.FloatGoal(this)); // Purpur
diff --git a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
index 1e51eee2c4e425c7ac0152b55a1d1376a5a5708e..c49d25eae4b9d2cdd15022b32947a94364ea2791 100644
index 7bd539ed5fea0d4db8e97722bd9bd37e6563185d..5d75e715a2edac73350cd74e2a5184e7fccbad53 100644
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
@@ -95,6 +95,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
@@ -309,7 +309,7 @@ index e101c3bf425902908c43ffa18867fb83a5e1f16e..382e47f26ee94506cb76463a677351b9
public int getMaxSchoolSize() {
return 5;
diff --git a/src/main/java/net/minecraft/world/entity/animal/Sheep.java b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
index 6e951928482fb6d662f2b7aa37ebe7a0885b47de..f2d0c67709e38209a8a02e98f4392b9e0a53c211 100644
index d1a8b15de4f4aa20d6049135bcbef94f0d1fb388..ae2662a5cdc4e531e09876ff8664eaf66a63a960 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
@@ -151,6 +151,11 @@ public class Sheep extends Animal implements Shearable {
@@ -325,7 +325,7 @@ index 6e951928482fb6d662f2b7aa37ebe7a0885b47de..f2d0c67709e38209a8a02e98f4392b9e
protected void registerGoals() {
this.eatBlockGoal = new EatBlockGoal(this);
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index 20f2fd0edf290d448d06e4772b5947fc7865c20b..fc8526af7e1df15794b4560b58e7f6a47508aa08 100644
index 557141d5cf85ef4b23d449fb32c28c25a4a96a33..c11ae706f85119d8dd5ac48e6fd585540779814c 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
@@ -86,6 +86,11 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
@@ -549,7 +549,7 @@ index dcc1d71c2eeea48669651165868899ba4a797d48..813501e8aac1c121569cb996b47f0293
return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0D).add(Attributes.MOVEMENT_SPEED, (double)0.2F);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index dd5552f87ec78c3b16aebe0767e124c368aa8c24..939f003dd488fe7e6c63db38fddebfb6b5cc0f38 100644
index d50b8c407ed30c0bb46159994c1b0e310a15e33a..63bddd92fe13c50160acab33016c5b62257ad704 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -132,6 +132,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -837,7 +837,7 @@ index 5e717433ef29d02669ee2e95454c69c36cbafc24..c9c21c87e3bd1c404fbef6768761bcb5
protected void registerGoals() {
super.registerGoals();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Shulker.java b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
index 47abc81aa04774abeb97c912cd118bbab3b51e86..22669a188c1961783341b22551325e19aaeb8088 100644
index f7780da77a98b04b570d4c01e2b738dffeeb9415..8a52c1ad5e2872e4b484eebc834fa42fd1930481 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
@@ -141,6 +141,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
@@ -1157,7 +1157,7 @@ index d672c1e381e5c4a4b79a1dfb96f1410ec35cb1b5..08320248a6956d41d60681e3d29f8176
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb5b993dc1 100644
index ed4c29795aae72d16e26d126888944204cae0291..108554529587f6e7ba56d1eabff8f061a74cc1b0 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1109,12 +1109,14 @@ public class PurpurWorldConfig {
@@ -1969,7 +1969,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean snowGolemRidable = false;
@@ -2422,6 +2524,7 @@ public class PurpurWorldConfig {
@@ -2421,6 +2523,7 @@ public class PurpurWorldConfig {
public double snowGolemAttackDistance = 1.25D;
public boolean snowGolemBypassMobGriefing = false;
public boolean snowGolemTakeDamageFromWater = true;
@@ -1977,7 +1977,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -2441,6 +2544,7 @@ public class PurpurWorldConfig {
@@ -2439,6 +2542,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean snifferRidable = false;
@@ -2463,6 +2567,7 @@ public class PurpurWorldConfig {
@@ -2461,6 +2565,7 @@ public class PurpurWorldConfig {
public double squidOffsetWaterCheck = 0.0D;
public boolean squidsCanFly = false;
public boolean squidTakeDamageFromWater = false;
@@ -1993,7 +1993,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void squidSettings() {
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
@@ -2476,6 +2581,7 @@ public class PurpurWorldConfig {
@@ -2474,6 +2579,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean spiderRidable = false;
@@ -2483,6 +2589,7 @@ public class PurpurWorldConfig {
@@ -2481,6 +2587,7 @@ public class PurpurWorldConfig {
public boolean spiderControllable = true;
public double spiderMaxHealth = 16.0D;
public boolean spiderTakeDamageFromWater = false;
@@ -2009,7 +2009,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void spiderSettings() {
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
@@ -2494,6 +2601,7 @@ public class PurpurWorldConfig {
@@ -2492,6 +2599,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean strayRidable = false;
@@ -2501,6 +2609,7 @@ public class PurpurWorldConfig {
@@ -2499,6 +2607,7 @@ public class PurpurWorldConfig {
public boolean strayControllable = true;
public double strayMaxHealth = 20.0D;
public boolean strayTakeDamageFromWater = false;
@@ -2025,7 +2025,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void straySettings() {
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
@@ -2512,6 +2621,7 @@ public class PurpurWorldConfig {
@@ -2510,6 +2619,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean striderRidable = false;
@@ -2521,6 +2631,7 @@ public class PurpurWorldConfig {
@@ -2519,6 +2629,7 @@ public class PurpurWorldConfig {
public int striderBreedingTicks = 6000;
public boolean striderGiveSaddleBack = false;
public boolean striderTakeDamageFromWater = true;
@@ -2041,7 +2041,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -2534,6 +2645,7 @@ public class PurpurWorldConfig {
@@ -2532,6 +2643,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean tadpoleRidable = false;
@@ -2556,6 +2668,7 @@ public class PurpurWorldConfig {
@@ -2554,6 +2666,7 @@ public class PurpurWorldConfig {
public double traderLlamaMovementSpeedMax = 0.175D;
public int traderLlamaBreedingTicks = 6000;
public boolean traderLlamaTakeDamageFromWater = false;
@@ -2057,7 +2057,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -2575,12 +2688,14 @@ public class PurpurWorldConfig {
@@ -2573,12 +2686,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void tropicalFishSettings() {
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
@@ -2591,6 +2706,7 @@ public class PurpurWorldConfig {
@@ -2589,6 +2704,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean turtleRidable = false;
@@ -2599,6 +2715,7 @@ public class PurpurWorldConfig {
@@ -2597,6 +2713,7 @@ public class PurpurWorldConfig {
public double turtleMaxHealth = 30.0D;
public int turtleBreedingTicks = 6000;
public boolean turtleTakeDamageFromWater = false;
@@ -2088,7 +2088,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -2611,6 +2728,7 @@ public class PurpurWorldConfig {
@@ -2609,6 +2726,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean vexRidable = false;
@@ -2619,6 +2737,7 @@ public class PurpurWorldConfig {
@@ -2617,6 +2735,7 @@ public class PurpurWorldConfig {
public double vexMaxY = 320D;
public double vexMaxHealth = 14.0D;
public boolean vexTakeDamageFromWater = false;
@@ -2104,7 +2104,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -2631,6 +2750,7 @@ public class PurpurWorldConfig {
@@ -2629,6 +2748,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean villagerRidable = false;
@@ -2646,6 +2766,7 @@ public class PurpurWorldConfig {
@@ -2644,6 +2764,7 @@ public class PurpurWorldConfig {
public boolean villagerBypassMobGriefing = false;
public boolean villagerTakeDamageFromWater = false;
public boolean villagerAllowTrading = true;
@@ -2120,7 +2120,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -2665,6 +2786,7 @@ public class PurpurWorldConfig {
@@ -2663,6 +2784,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean vindicatorRidable = false;
@@ -2673,6 +2795,7 @@ public class PurpurWorldConfig {
@@ -2671,6 +2793,7 @@ public class PurpurWorldConfig {
public double vindicatorMaxHealth = 24.0D;
public double vindicatorJohnnySpawnChance = 0D;
public boolean vindicatorTakeDamageFromWater = false;
@@ -2136,7 +2136,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -2685,6 +2808,7 @@ public class PurpurWorldConfig {
@@ -2683,6 +2806,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean wanderingTraderRidable = false;
@@ -2695,6 +2819,7 @@ public class PurpurWorldConfig {
@@ -2693,6 +2817,7 @@ public class PurpurWorldConfig {
public boolean wanderingTraderCanBeLeashed = false;
public boolean wanderingTraderTakeDamageFromWater = false;
public boolean wanderingTraderAllowTrading = true;
@@ -2152,7 +2152,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -2709,6 +2834,7 @@ public class PurpurWorldConfig {
@@ -2707,6 +2832,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean wardenRidable = false;
@@ -2725,6 +2851,7 @@ public class PurpurWorldConfig {
@@ -2723,6 +2849,7 @@ public class PurpurWorldConfig {
public boolean witchControllable = true;
public double witchMaxHealth = 26.0D;
public boolean witchTakeDamageFromWater = false;
@@ -2168,7 +2168,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -2736,6 +2863,7 @@ public class PurpurWorldConfig {
@@ -2734,6 +2861,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean witherRidable = false;
@@ -2750,6 +2878,7 @@ public class PurpurWorldConfig {
@@ -2748,6 +2876,7 @@ public class PurpurWorldConfig {
public boolean witherCanRideVehicles = false;
public float witherExplosionRadius = 1.0F;
public boolean witherPlaySpawnSound = true;
@@ -2184,7 +2184,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -2772,6 +2901,7 @@ public class PurpurWorldConfig {
@@ -2770,6 +2899,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean witherSkeletonRidable = false;
@@ -2779,6 +2909,7 @@ public class PurpurWorldConfig {
@@ -2777,6 +2907,7 @@ public class PurpurWorldConfig {
public boolean witherSkeletonControllable = true;
public double witherSkeletonMaxHealth = 20.0D;
public boolean witherSkeletonTakeDamageFromWater = false;
@@ -2200,7 +2200,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -2790,6 +2921,7 @@ public class PurpurWorldConfig {
@@ -2788,6 +2919,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean wolfRidable = false;
@@ -2801,6 +2933,7 @@ public class PurpurWorldConfig {
@@ -2799,6 +2931,7 @@ public class PurpurWorldConfig {
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
public boolean wolfTakeDamageFromWater = false;
@@ -2216,7 +2216,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -2820,6 +2953,7 @@ public class PurpurWorldConfig {
@@ -2818,6 +2951,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean zoglinRidable = false;
@@ -2827,6 +2961,7 @@ public class PurpurWorldConfig {
@@ -2825,6 +2959,7 @@ public class PurpurWorldConfig {
public boolean zoglinControllable = true;
public double zoglinMaxHealth = 40.0D;
public boolean zoglinTakeDamageFromWater = false;
@@ -2232,7 +2232,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -2838,6 +2973,7 @@ public class PurpurWorldConfig {
@@ -2836,6 +2971,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean zombieRidable = false;
@@ -2851,6 +2987,7 @@ public class PurpurWorldConfig {
@@ -2849,6 +2985,7 @@ public class PurpurWorldConfig {
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
public boolean zombieTakeDamageFromWater = false;
@@ -2248,7 +2248,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2868,6 +3005,7 @@ public class PurpurWorldConfig {
@@ -2866,6 +3003,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean zombieHorseRidable = false;
@@ -2881,6 +3019,7 @@ public class PurpurWorldConfig {
@@ -2879,6 +3017,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
public boolean zombieHorseTakeDamageFromWater = false;
@@ -2264,7 +2264,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void zombieHorseSettings() {
zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
@@ -2899,6 +3038,7 @@ public class PurpurWorldConfig {
@@ -2897,6 +3036,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean zombieVillagerRidable = false;
@@ -2913,6 +3053,7 @@ public class PurpurWorldConfig {
@@ -2911,6 +3051,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;
@@ -2280,7 +2280,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -2931,6 +3072,7 @@ public class PurpurWorldConfig {
@@ -2929,6 +3070,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 d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
}
public boolean zombifiedPiglinRidable = false;
@@ -2943,6 +3085,7 @@ public class PurpurWorldConfig {
@@ -2941,6 +3083,7 @@ public class PurpurWorldConfig {
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
public boolean zombifiedPiglinTakeDamageFromWater = false;
@@ -2296,7 +2296,7 @@ index d5ce0eda09bfa4b6e708b5468697102cc853cfc7..ecf28b77b6d899827d6f35681bfdc1bb
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -2959,6 +3102,7 @@ public class PurpurWorldConfig {
@@ -2957,6 +3100,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);