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

synchronize patches

Browse Source
This commit is contained in:
granny
2023-06-09 05:07:46 -07:00
parent 9bed3af997
commit e4edcee766
113 changed files with 703 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
patches/server/0102-Make-entity-breeding-times-configurable.patch
View File

@@ -525,10 +525,10 @@ index 853fe631a7d665e2379296c89e433e761495a814..ae4d404b837da202e52d246dabfc00c8
public boolean canBeLeashed(Player player) {
return !this.isLeashed();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7c25454a8 100644
index 79f951f6275612234a26bff758ef3b0a67be9e52..510ab470e6d3c49f209277732e78c2ebe20d8f5a 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -502,10 +502,12 @@ public class PurpurWorldConfig {
@@ -507,10 +507,12 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public boolean axolotlControllable = true;
public double axolotlMaxHealth = 14.0D;
@@ -541,7 +541,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean batRidable = false;
@@ -545,6 +547,7 @@ public class PurpurWorldConfig {
@@ -550,6 +552,7 @@ public class PurpurWorldConfig {
public boolean beeControllable = true;
public double beeMaxY = 320D;
public double beeMaxHealth = 10.0D;
@@ -549,7 +549,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -556,6 +559,7 @@ public class PurpurWorldConfig {
@@ -561,6 +564,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -557,7 +557,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean blazeRidable = false;
@@ -576,6 +580,7 @@ public class PurpurWorldConfig {
@@ -581,6 +585,7 @@ public class PurpurWorldConfig {
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
}
@@ -565,7 +565,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
public double camelMaxHealthMin = 32.0D;
public double camelMaxHealthMax = 32.0D;
public double camelJumpStrengthMin = 0.42D;
@@ -589,6 +594,7 @@ public class PurpurWorldConfig {
@@ -594,6 +599,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
camelMovementSpeedMax = getDouble("mobs.camel.attributes.movement_speed.max", camelMovementSpeedMax);
@@ -573,7 +573,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean catRidable = false;
@@ -598,6 +604,7 @@ public class PurpurWorldConfig {
@@ -603,6 +609,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -581,7 +581,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -611,6 +618,7 @@ public class PurpurWorldConfig {
@@ -616,6 +623,7 @@ public class PurpurWorldConfig {
catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay);
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
@@ -589,7 +589,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean caveSpiderRidable = false;
@@ -634,6 +642,7 @@ public class PurpurWorldConfig {
@@ -639,6 +647,7 @@ public class PurpurWorldConfig {
public boolean chickenControllable = true;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -597,7 +597,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -645,6 +654,7 @@ public class PurpurWorldConfig {
@@ -650,6 +659,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -605,7 +605,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean codRidable = false;
@@ -666,6 +676,7 @@ public class PurpurWorldConfig {
@@ -671,6 +681,7 @@ public class PurpurWorldConfig {
public boolean cowControllable = true;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -613,7 +613,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -677,6 +688,7 @@ public class PurpurWorldConfig {
@@ -682,6 +693,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -621,7 +621,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean creeperRidable = false;
@@ -728,6 +740,7 @@ public class PurpurWorldConfig {
@@ -733,6 +745,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -629,7 +629,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -743,6 +756,7 @@ public class PurpurWorldConfig {
@@ -748,6 +761,7 @@ public class PurpurWorldConfig {
donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax);
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
@@ -637,7 +637,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean drownedRidable = false;
@@ -862,6 +876,7 @@ public class PurpurWorldConfig {
@@ -867,6 +881,7 @@ public class PurpurWorldConfig {
public boolean foxControllable = true;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -645,7 +645,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -873,17 +888,20 @@ public class PurpurWorldConfig {
@@ -878,17 +893,20 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -666,7 +666,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean ghastRidable = false;
@@ -951,11 +969,13 @@ public class PurpurWorldConfig {
@@ -956,11 +974,13 @@ public class PurpurWorldConfig {
public boolean goatRidableInWater = true;
public boolean goatControllable = true;
public double goatMaxHealth = 10.0D;
@@ -680,7 +680,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean guardianRidable = false;
@@ -976,6 +996,7 @@ public class PurpurWorldConfig {
@@ -981,6 +1001,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidableInWater = true;
public boolean hoglinControllable = true;
public double hoglinMaxHealth = 40.0D;
@@ -688,7 +688,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -986,6 +1007,7 @@ public class PurpurWorldConfig {
@@ -991,6 +1012,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -696,7 +696,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean horseRidableInWater = false;
@@ -995,6 +1017,7 @@ public class PurpurWorldConfig {
@@ -1000,6 +1022,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -704,7 +704,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1010,6 +1033,7 @@ public class PurpurWorldConfig {
@@ -1015,6 +1038,7 @@ public class PurpurWorldConfig {
horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax);
horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin);
horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax);
@@ -712,7 +712,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean huskRidable = false;
@@ -1087,6 +1111,7 @@ public class PurpurWorldConfig {
@@ -1092,6 +1116,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -720,7 +720,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1104,6 +1129,7 @@ public class PurpurWorldConfig {
@@ -1109,6 +1134,7 @@ public class PurpurWorldConfig {
llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax);
llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin);
llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax);
@@ -728,7 +728,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean magmaCubeRidable = false;
@@ -1132,6 +1158,7 @@ public class PurpurWorldConfig {
@@ -1137,6 +1163,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = true;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
@@ -736,7 +736,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1142,6 +1169,7 @@ public class PurpurWorldConfig {
@@ -1147,6 +1174,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -744,7 +744,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean muleRidableInWater = false;
@@ -1151,6 +1179,7 @@ public class PurpurWorldConfig {
@@ -1156,6 +1184,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -752,7 +752,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1166,12 +1195,14 @@ public class PurpurWorldConfig {
@@ -1171,12 +1200,14 @@ public class PurpurWorldConfig {
muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax);
muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin);
muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax);
@@ -767,7 +767,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1182,12 +1213,14 @@ public class PurpurWorldConfig {
@@ -1187,12 +1218,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -782,7 +782,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1198,6 +1231,7 @@ public class PurpurWorldConfig {
@@ -1203,6 +1236,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -790,7 +790,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean parrotRidable = false;
@@ -1281,6 +1315,7 @@ public class PurpurWorldConfig {
@@ -1286,6 +1320,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -798,7 +798,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1292,6 +1327,7 @@ public class PurpurWorldConfig {
@@ -1297,6 +1332,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -806,7 +806,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean piglinRidable = false;
@@ -1348,6 +1384,7 @@ public class PurpurWorldConfig {
@@ -1353,6 +1389,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -814,7 +814,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1361,6 +1398,7 @@ public class PurpurWorldConfig {
@@ -1366,6 +1403,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = BuiltInRegistries.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -822,7 +822,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean pufferfishRidable = false;
@@ -1383,6 +1421,7 @@ public class PurpurWorldConfig {
@@ -1388,6 +1426,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -830,7 +830,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1395,6 +1434,7 @@ public class PurpurWorldConfig {
@@ -1400,6 +1439,7 @@ public class PurpurWorldConfig {
rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth);
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
@@ -838,7 +838,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean ravagerRidable = false;
@@ -1431,6 +1471,7 @@ public class PurpurWorldConfig {
@@ -1436,6 +1476,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -846,7 +846,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1441,6 +1482,7 @@ public class PurpurWorldConfig {
@@ -1446,6 +1487,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -854,7 +854,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean shulkerRidable = false;
@@ -1564,11 +1606,13 @@ public class PurpurWorldConfig {
@@ -1569,11 +1611,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
@@ -868,7 +868,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean squidRidable = false;
@@ -1627,6 +1671,7 @@ public class PurpurWorldConfig {
@@ -1632,6 +1676,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -876,7 +876,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1637,6 +1682,7 @@ public class PurpurWorldConfig {
@@ -1642,6 +1687,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -884,7 +884,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean tadpoleRidable = false;
@@ -1657,6 +1703,7 @@ public class PurpurWorldConfig {
@@ -1662,6 +1708,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -892,7 +892,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1674,6 +1721,7 @@ public class PurpurWorldConfig {
@@ -1679,6 +1726,7 @@ public class PurpurWorldConfig {
traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax);
traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin);
traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax);
@@ -900,7 +900,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean tropicalFishRidable = false;
@@ -1694,6 +1742,7 @@ public class PurpurWorldConfig {
@@ -1699,6 +1747,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -908,7 +908,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1704,6 +1753,7 @@ public class PurpurWorldConfig {
@@ -1709,6 +1758,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -916,7 +916,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean vexRidable = false;
@@ -1731,6 +1781,7 @@ public class PurpurWorldConfig {
@@ -1736,6 +1786,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -924,7 +924,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1744,6 +1795,7 @@ public class PurpurWorldConfig {
@@ -1749,6 +1800,7 @@ public class PurpurWorldConfig {
villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock);
villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -932,7 +932,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
}
public boolean vindicatorRidable = false;
@@ -1855,6 +1907,7 @@ public class PurpurWorldConfig {
@@ -1860,6 +1912,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -940,7 +940,7 @@ index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1865,6 +1918,7 @@ public class PurpurWorldConfig {
@@ -1870,6 +1923,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);