mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 02:17:42 +01:00
drop two config options in favor of PurpurExtras impl
dropped options: - `mobs.snow_golem.drop-pumpkin-when-sheared` - `mobs.sheep.jeb-shear-random-color`
This commit is contained in:
@@ -174,7 +174,7 @@ index 95ff109511c97d603aeaf9e73c49397a841fcbce..58539d29b8e2a8c0676cc574f64e7d61
|
||||
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 09fc3c6ddf99854d43b6577b4d2d74665f32dfa3..1e51eee2c4e425c7ac0152b55a1d1376a5a5708e 100644
|
||||
index db0170fb22ee8424c29fc0d4f3c93c9eac79611c..7bd539ed5fea0d4db8e97722bd9bd37e6563185d 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/MushroomCow.java
|
||||
@@ -90,6 +90,11 @@ public class MushroomCow extends Cow implements Shearable, VariantHolder<Mushroo
|
||||
@@ -318,7 +318,7 @@ index 742805994f29a18af444912b10af631d2c60cacf..e101c3bf425902908c43ffa18867fb83
|
||||
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 284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288..6e951928482fb6d662f2b7aa37ebe7a0885b47de 100644
|
||||
index df7deec204ebf99afdbfe49f9a113857dcd413c6..d1a8b15de4f4aa20d6049135bcbef94f0d1fb388 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Sheep.java
|
||||
@@ -146,6 +146,11 @@ public class Sheep extends Animal implements Shearable {
|
||||
@@ -334,7 +334,7 @@ index 284c9780e18f51b6ebd32b7eb7a9d3e47b4d0288..6e951928482fb6d662f2b7aa37ebe7a0
|
||||
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 84e0a41620fd52af0cd22dc92fd13ee4efd206fb..a1efde792eaa3f80cd0c7c48e38bbd07e1eb5c9d 100644
|
||||
index fd64a12c7f215f47d366af60882981c2cc0ef04f..61943dc8238190072dbdce1e1aff1d7932c87da6 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
|
||||
@@ -116,7 +116,7 @@ public class SnowGolem extends AbstractGolem implements Shearable, RangedAttackM
|
||||
@@ -555,7 +555,7 @@ index aaec706b7eaa6afdf7959e6dd53cc39344bb97df..dcc1d71c2eeea48669651165868899ba
|
||||
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/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||
index 5381ee91770a0f1012b5478d6615540263e46533..5643f35f02fff5a2d4072d246f8646772695b797 100644
|
||||
index f5dfcf2aefebf9faabd962d6f331de88ae26eb26..df8baf2059cdfed3f0c43496fba843b8b6819281 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
|
||||
@@ -191,6 +191,11 @@ public class EnderDragon extends Mob implements Enemy {
|
||||
@@ -571,7 +571,7 @@ index 5381ee91770a0f1012b5478d6615540263e46533..5643f35f02fff5a2d4072d246f864677
|
||||
return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0D);
|
||||
}
|
||||
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 bd4658651ba8bccdc5b8a7d59e70e527942615dd..aea64f97be2430e92cb45d43e1b50c0e32eebdf9 100644
|
||||
index 5e61463f5d25b42165813df43c30246dff8a4a7e..73930b4eea2bd632c390b79118ecafad84cfa44a 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
|
||||
@@ -117,6 +117,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
|
||||
@@ -871,7 +871,7 @@ index 5aa00878c4c7be4a38137a93b1a2cf1c468422ea..0992e3729fdfa945660affb7eb7efcff
|
||||
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 5bdeac3ed1bbc70d0620a548f03792e5df212629..ea09f65e89b2c683c1549146948ff4f5b5073500 100644
|
||||
index 9efda5d6cf9a235b5039ed622e917124aae7be82..bc8e86f9e1703709f3d4bc160f4c3e1cfbc1f066 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/monster/Shulker.java
|
||||
@@ -119,6 +119,11 @@ public class Shulker extends AbstractGolem implements VariantHolder<Optional<Dye
|
||||
@@ -1197,7 +1197,7 @@ index ad7a32169b0decad1d3a2bd98e25b07731a33d03..5a373ba4d9e404c064bc158718d02c0c
|
||||
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 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d76fd285e9 100644
|
||||
index cd4a14bd5d13b41d02ad68ddf31fd3648f933850..bab1a72f8a165ba9df57187296f242287d57f300 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -568,11 +568,13 @@ public class PurpurWorldConfig {
|
||||
@@ -2011,7 +2011,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean snowGolemRidable = false;
|
||||
@@ -1693,6 +1797,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1692,6 +1796,7 @@ public class PurpurWorldConfig {
|
||||
public float snowGolemSnowBallModifier = 10.0F;
|
||||
public double snowGolemAttackDistance = 1.25D;
|
||||
public boolean snowGolemBypassMobGriefing = false;
|
||||
@@ -2019,7 +2019,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void snowGolemSettings() {
|
||||
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
|
||||
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
|
||||
@@ -1711,6 +1816,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1709,6 +1814,7 @@ public class PurpurWorldConfig {
|
||||
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
|
||||
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
|
||||
snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing);
|
||||
@@ -2027,7 +2027,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean snifferRidable = false;
|
||||
@@ -1732,6 +1838,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1730,6 +1836,7 @@ public class PurpurWorldConfig {
|
||||
public boolean squidImmuneToEAR = true;
|
||||
public double squidOffsetWaterCheck = 0.0D;
|
||||
public boolean squidsCanFly = false;
|
||||
@@ -2035,7 +2035,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void squidSettings() {
|
||||
squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
|
||||
squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
|
||||
@@ -1744,12 +1851,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1742,12 +1849,14 @@ public class PurpurWorldConfig {
|
||||
squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
|
||||
squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);
|
||||
squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly);
|
||||
@@ -2050,7 +2050,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void spiderSettings() {
|
||||
spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable);
|
||||
spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater);
|
||||
@@ -1760,12 +1869,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1758,12 +1867,14 @@ public class PurpurWorldConfig {
|
||||
set("mobs.spider.attributes.max_health", oldValue);
|
||||
}
|
||||
spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth);
|
||||
@@ -2065,7 +2065,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void straySettings() {
|
||||
strayRidable = getBoolean("mobs.stray.ridable", strayRidable);
|
||||
strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater);
|
||||
@@ -1776,6 +1887,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1774,6 +1885,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.stray.attributes.max_health", oldValue);
|
||||
}
|
||||
strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth);
|
||||
@@ -2073,7 +2073,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean striderRidable = false;
|
||||
@@ -1784,6 +1896,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1782,6 +1894,7 @@ public class PurpurWorldConfig {
|
||||
public double striderMaxHealth = 20.0D;
|
||||
public int striderBreedingTicks = 6000;
|
||||
public boolean striderGiveSaddleBack = false;
|
||||
@@ -2081,7 +2081,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void striderSettings() {
|
||||
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
|
||||
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
|
||||
@@ -1796,6 +1909,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1794,6 +1907,7 @@ public class PurpurWorldConfig {
|
||||
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
|
||||
striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks);
|
||||
striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack);
|
||||
@@ -2089,7 +2089,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean tadpoleRidable = false;
|
||||
@@ -1817,6 +1931,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1815,6 +1929,7 @@ public class PurpurWorldConfig {
|
||||
public double traderLlamaMovementSpeedMin = 0.175D;
|
||||
public double traderLlamaMovementSpeedMax = 0.175D;
|
||||
public int traderLlamaBreedingTicks = 6000;
|
||||
@@ -2097,7 +2097,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void traderLlamaSettings() {
|
||||
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
|
||||
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
|
||||
@@ -1835,11 +1950,13 @@ public class PurpurWorldConfig {
|
||||
@@ -1833,11 +1948,13 @@ public class PurpurWorldConfig {
|
||||
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
|
||||
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
|
||||
traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks);
|
||||
@@ -2111,7 +2111,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void tropicalFishSettings() {
|
||||
tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable);
|
||||
tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable);
|
||||
@@ -1849,6 +1966,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1847,6 +1964,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.tropical_fish.attributes.max_health", oldValue);
|
||||
}
|
||||
tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth);
|
||||
@@ -2119,7 +2119,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean turtleRidable = false;
|
||||
@@ -1856,6 +1974,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1854,6 +1972,7 @@ public class PurpurWorldConfig {
|
||||
public boolean turtleControllable = true;
|
||||
public double turtleMaxHealth = 30.0D;
|
||||
public int turtleBreedingTicks = 6000;
|
||||
@@ -2127,7 +2127,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void turtleSettings() {
|
||||
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
|
||||
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
|
||||
@@ -1867,6 +1986,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1865,6 +1984,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
|
||||
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
|
||||
@@ -2135,7 +2135,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean vexRidable = false;
|
||||
@@ -1874,6 +1994,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1872,6 +1992,7 @@ public class PurpurWorldConfig {
|
||||
public boolean vexControllable = true;
|
||||
public double vexMaxY = 320D;
|
||||
public double vexMaxHealth = 14.0D;
|
||||
@@ -2143,7 +2143,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void vexSettings() {
|
||||
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
|
||||
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
|
||||
@@ -1885,6 +2006,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1883,6 +2004,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.vex.attributes.max_health", oldValue);
|
||||
}
|
||||
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
|
||||
@@ -2151,7 +2151,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean villagerRidable = false;
|
||||
@@ -1898,6 +2020,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1896,6 +2018,7 @@ public class PurpurWorldConfig {
|
||||
public boolean villagerClericsFarmWarts = false;
|
||||
public boolean villagerClericFarmersThrowWarts = true;
|
||||
public boolean villagerBypassMobGriefing = false;
|
||||
@@ -2159,7 +2159,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1915,6 +2038,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1913,6 +2036,7 @@ public class PurpurWorldConfig {
|
||||
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
|
||||
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
|
||||
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
|
||||
@@ -2167,7 +2167,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1922,6 +2046,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1920,6 +2044,7 @@ public class PurpurWorldConfig {
|
||||
public boolean vindicatorControllable = true;
|
||||
public double vindicatorMaxHealth = 24.0D;
|
||||
public double vindicatorJohnnySpawnChance = 0D;
|
||||
@@ -2175,7 +2175,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void vindicatorSettings() {
|
||||
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
|
||||
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
|
||||
@@ -1933,6 +2058,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1931,6 +2056,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
|
||||
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
|
||||
@@ -2183,7 +2183,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean wanderingTraderRidable = false;
|
||||
@@ -1941,6 +2067,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1939,6 +2065,7 @@ public class PurpurWorldConfig {
|
||||
public double wanderingTraderMaxHealth = 20.0D;
|
||||
public boolean wanderingTraderFollowEmeraldBlock = false;
|
||||
public boolean wanderingTraderCanBeLeashed = false;
|
||||
@@ -2191,7 +2191,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void wanderingTraderSettings() {
|
||||
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
|
||||
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
|
||||
@@ -1953,6 +2080,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1951,6 +2078,7 @@ public class PurpurWorldConfig {
|
||||
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
|
||||
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
|
||||
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
|
||||
@@ -2199,7 +2199,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean wardenRidable = false;
|
||||
@@ -1968,6 +2096,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1966,6 +2094,7 @@ public class PurpurWorldConfig {
|
||||
public boolean witchRidableInWater = true;
|
||||
public boolean witchControllable = true;
|
||||
public double witchMaxHealth = 26.0D;
|
||||
@@ -2207,7 +2207,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void witchSettings() {
|
||||
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
|
||||
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
|
||||
@@ -1978,6 +2107,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1976,6 +2105,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.witch.attributes.max_health", oldValue);
|
||||
}
|
||||
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
|
||||
@@ -2215,7 +2215,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean witherRidable = false;
|
||||
@@ -1988,6 +2118,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1986,6 +2116,7 @@ public class PurpurWorldConfig {
|
||||
public float witherHealthRegenAmount = 1.0f;
|
||||
public int witherHealthRegenDelay = 20;
|
||||
public boolean witherBypassMobGriefing = false;
|
||||
@@ -2223,7 +2223,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void witherSettings() {
|
||||
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
|
||||
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
|
||||
@@ -2006,12 +2137,14 @@ public class PurpurWorldConfig {
|
||||
@@ -2004,12 +2135,14 @@ public class PurpurWorldConfig {
|
||||
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
|
||||
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
|
||||
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
|
||||
@@ -2238,7 +2238,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void witherSkeletonSettings() {
|
||||
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
|
||||
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
|
||||
@@ -2022,6 +2155,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2020,6 +2153,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wither_skeleton.attributes.max_health", oldValue);
|
||||
}
|
||||
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
|
||||
@@ -2246,7 +2246,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean wolfRidable = false;
|
||||
@@ -2032,6 +2166,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2030,6 +2164,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wolfMilkCuresRabies = true;
|
||||
public double wolfNaturalRabid = 0.0D;
|
||||
public int wolfBreedingTicks = 6000;
|
||||
@@ -2254,7 +2254,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void wolfSettings() {
|
||||
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
|
||||
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
|
||||
@@ -2050,12 +2185,14 @@ public class PurpurWorldConfig {
|
||||
@@ -2048,12 +2183,14 @@ public class PurpurWorldConfig {
|
||||
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
|
||||
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
|
||||
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
|
||||
@@ -2269,7 +2269,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void zoglinSettings() {
|
||||
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
|
||||
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
|
||||
@@ -2066,6 +2203,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2064,6 +2201,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.zoglin.attributes.max_health", oldValue);
|
||||
}
|
||||
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
|
||||
@@ -2277,7 +2277,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean zombieRidable = false;
|
||||
@@ -2078,6 +2216,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2076,6 +2214,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieJockeyTryExistingChickens = true;
|
||||
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
|
||||
public boolean zombieBypassMobGriefing = false;
|
||||
@@ -2285,7 +2285,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void zombieSettings() {
|
||||
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
|
||||
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
|
||||
@@ -2094,6 +2233,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2092,6 +2231,7 @@ public class PurpurWorldConfig {
|
||||
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
|
||||
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
|
||||
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
|
||||
@@ -2293,7 +2293,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean zombieHorseRidable = false;
|
||||
@@ -2106,6 +2246,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2104,6 +2244,7 @@ public class PurpurWorldConfig {
|
||||
public double zombieHorseMovementSpeedMin = 0.2D;
|
||||
public double zombieHorseMovementSpeedMax = 0.2D;
|
||||
public double zombieHorseSpawnChance = 0.0D;
|
||||
@@ -2301,7 +2301,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void zombieHorseSettings() {
|
||||
zombieHorseRidable = getBoolean("mobs.zombie_horse.ridable", zombieHorseRidable);
|
||||
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
|
||||
@@ -2123,6 +2264,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2121,6 +2262,7 @@ public class PurpurWorldConfig {
|
||||
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
|
||||
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
|
||||
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
|
||||
@@ -2309,7 +2309,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean zombieVillagerRidable = false;
|
||||
@@ -2133,6 +2275,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2131,6 +2273,7 @@ public class PurpurWorldConfig {
|
||||
public boolean zombieVillagerJockeyOnlyBaby = true;
|
||||
public double zombieVillagerJockeyChance = 0.05D;
|
||||
public boolean zombieVillagerJockeyTryExistingChickens = true;
|
||||
@@ -2317,7 +2317,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void zombieVillagerSettings() {
|
||||
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
|
||||
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
|
||||
@@ -2147,6 +2290,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2145,6 +2288,7 @@ public class PurpurWorldConfig {
|
||||
zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
|
||||
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
|
||||
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
|
||||
@@ -2325,7 +2325,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
}
|
||||
|
||||
public boolean zombifiedPiglinRidable = false;
|
||||
@@ -2158,6 +2302,7 @@ public class PurpurWorldConfig {
|
||||
@@ -2156,6 +2300,7 @@ public class PurpurWorldConfig {
|
||||
public double zombifiedPiglinJockeyChance = 0.05D;
|
||||
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
|
||||
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
|
||||
@@ -2333,7 +2333,7 @@ index 7d576796981ce7b6a292499ed755d86c86bf51db..e8d642f0bffb2a12b91b125d3f0536d7
|
||||
private void zombifiedPiglinSettings() {
|
||||
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
|
||||
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
|
||||
@@ -2173,5 +2318,6 @@ public class PurpurWorldConfig {
|
||||
@@ -2171,5 +2316,6 @@ public class PurpurWorldConfig {
|
||||
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
|
||||
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
|
||||
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
|
||||
|
||||
Reference in New Issue
Block a user