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

Preliminary update to 1.17.1

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 16:25:46 -05:00
parent 89c9c902b1
commit 471d6bf4c1
202 changed files with 994 additions and 20192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
patches/server/0120-Make-entity-breeding-times-configurable.patch
View File

@@ -266,7 +266,7 @@ index 497be3182c72b5a0f3bc42088c4168702119b527..607823661ba942ec03b1f61dac5a786b
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
index 66c01b8300bc09ace27e4d1a30ee9274c69fcc9a..3e8c90c2d44d906fae3dfc068a30c81a494a3268 100644
index 31568adcf4a89b11e61f455a15326c7f72bf487e..c1202540383ef991d7b8c3767132c4fc54d4c570 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java
@@ -105,6 +105,11 @@ public class Turtle extends Animal {
@@ -298,7 +298,7 @@ index ae416b70109c959980b3115da6e97df1610996ca..ef4abaf68de01b0879f7d0b330d2d57c
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
index 15a0aeb1131618ea27620c5893a7448af624b6dd..a75d7da8278b5a0671d85708898731d9bd3344e2 100644
index cdc8e548ea48efd481ad6495cab6d8e9f77cfb15..c9056e16015f6e0ed9e5da03ad036162dbab4d09 100644
--- a/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
+++ b/src/main/java/net/minecraft/world/entity/animal/axolotl/Axolotl.java
@@ -110,6 +110,11 @@ public class Axolotl extends Animal implements LerpingModel, Bucketable {
@@ -314,10 +314,10 @@ index 15a0aeb1131618ea27620c5893a7448af624b6dd..a75d7da8278b5a0671d85708898731d9
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
index 9092eac3e7e15845d14175cad8030f4ea60d43ad..93439e518b071cc19eeabe4c8db7676e5a31cfff 100644
index 26d8b59dd385cc89af64fbbf3f8e09c2e9b41b8c..ca62d4adafc3195541665192888feac91312d71a 100644
--- a/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/goat/Goat.java
@@ -85,6 +85,11 @@ public class Goat extends Animal {
@@ -87,6 +87,11 @@ public class Goat extends Animal {
public void initAttributes() {
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue(this.level.purpurConfig.goatMaxHealth);
}
@@ -442,7 +442,7 @@ index 6ca7b168a1ea26102922d9377e52662f16c1e725..74321ed51b25617bac25e3497ba908cd
public static AttributeSupplier.Builder createAttributes() {
diff --git a/src/main/java/net/minecraft/world/entity/monster/Strider.java b/src/main/java/net/minecraft/world/entity/monster/Strider.java
index 6b9316536e09c52be2cd1e9cdc71529f4ddb69c6..294f276fa8d2d754abde11ebc3d39e5e68996b05 100644
index 2d7b83ce2e0e26ef3976514ec8921a718ccc28bd..9d314470361b2e17afdadc355c084254e5b03aff 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Strider.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Strider.java
@@ -112,6 +112,11 @@ public class Strider extends Animal implements ItemSteerable, Saddleable {
@@ -474,10 +474,10 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527d46d65b1 100644
index f7a73173585239c90ae55f49eed3cd40e0f8e1e8..a1e135e7813c31dbb0508ebb0bee1a2c453e5b4e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -487,9 +487,11 @@ public class PurpurWorldConfig {
@@ -486,9 +486,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean batRidable = false;
@@ -519,6 +521,7 @@ public class PurpurWorldConfig {
@@ -518,6 +520,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -529,6 +532,7 @@ public class PurpurWorldConfig {
@@ -528,6 +531,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean blazeRidable = false;
@@ -553,6 +557,7 @@ public class PurpurWorldConfig {
@@ -552,6 +556,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -565,6 +570,7 @@ public class PurpurWorldConfig {
@@ -564,6 +569,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);
@@ -521,7 +521,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean caveSpiderRidable = false;
@@ -585,6 +591,7 @@ public class PurpurWorldConfig {
@@ -584,6 +590,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -595,6 +602,7 @@ public class PurpurWorldConfig {
@@ -594,6 +601,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean codRidable = false;
@@ -613,6 +621,7 @@ public class PurpurWorldConfig {
@@ -612,6 +620,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -623,6 +632,7 @@ public class PurpurWorldConfig {
@@ -622,6 +631,7 @@ public class PurpurWorldConfig {
}
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
@@ -553,7 +553,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean creeperRidable = false;
@@ -670,6 +680,7 @@ public class PurpurWorldConfig {
@@ -669,6 +679,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -685,6 +696,7 @@ public class PurpurWorldConfig {
@@ -684,6 +695,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);
@@ -569,7 +569,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean drownedRidable = false;
@@ -791,6 +803,7 @@ public class PurpurWorldConfig {
@@ -790,6 +802,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -801,6 +814,7 @@ public class PurpurWorldConfig {
@@ -800,6 +813,7 @@ public class PurpurWorldConfig {
}
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
@@ -585,7 +585,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean ghastRidable = false;
@@ -861,10 +875,12 @@ public class PurpurWorldConfig {
@@ -860,10 +874,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean guardianRidable = false;
@@ -882,6 +898,7 @@ public class PurpurWorldConfig {
@@ -881,6 +897,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -891,6 +908,7 @@ public class PurpurWorldConfig {
@@ -890,6 +907,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean horseRidableInWater = false;
@@ -900,6 +918,7 @@ public class PurpurWorldConfig {
@@ -899,6 +917,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -915,6 +934,7 @@ public class PurpurWorldConfig {
@@ -914,6 +933,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);
@@ -630,7 +630,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean huskRidable = false;
@@ -985,6 +1005,7 @@ public class PurpurWorldConfig {
@@ -984,6 +1004,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1001,6 +1022,7 @@ public class PurpurWorldConfig {
@@ -1000,6 +1021,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);
@@ -646,7 +646,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean magmaCubeRidable = false;
@@ -1020,6 +1042,7 @@ public class PurpurWorldConfig {
@@ -1019,6 +1041,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1029,6 +1052,7 @@ public class PurpurWorldConfig {
@@ -1028,6 +1051,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean muleRidableInWater = false;
@@ -1038,6 +1062,7 @@ public class PurpurWorldConfig {
@@ -1037,6 +1061,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1053,11 +1078,13 @@ public class PurpurWorldConfig {
@@ -1052,11 +1077,13 @@ 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);
@@ -684,7 +684,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1067,11 +1094,13 @@ public class PurpurWorldConfig {
@@ -1066,11 +1093,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1081,6 +1110,7 @@ public class PurpurWorldConfig {
@@ -1080,6 +1109,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean parrotRidable = false;
@@ -1161,6 +1191,7 @@ public class PurpurWorldConfig {
@@ -1160,6 +1190,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1171,6 +1202,7 @@ public class PurpurWorldConfig {
@@ -1170,6 +1201,7 @@ public class PurpurWorldConfig {
}
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
@@ -722,7 +722,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean piglinRidable = false;
@@ -1220,6 +1252,7 @@ public class PurpurWorldConfig {
@@ -1219,6 +1251,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1232,6 +1265,7 @@ public class PurpurWorldConfig {
@@ -1231,6 +1264,7 @@ public class PurpurWorldConfig {
polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString);
Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
@@ -738,7 +738,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean pufferfishRidable = false;
@@ -1251,6 +1285,7 @@ public class PurpurWorldConfig {
@@ -1250,6 +1284,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1262,6 +1297,7 @@ public class PurpurWorldConfig {
@@ -1261,6 +1296,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);
@@ -754,7 +754,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean ravagerRidable = false;
@@ -1293,6 +1329,7 @@ public class PurpurWorldConfig {
@@ -1292,6 +1328,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1302,6 +1339,7 @@ public class PurpurWorldConfig {
@@ -1301,6 +1338,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean shulkerRidable = false;
@@ -1456,6 +1494,7 @@ public class PurpurWorldConfig {
@@ -1455,6 +1493,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1465,6 +1504,7 @@ public class PurpurWorldConfig {
@@ -1464,6 +1503,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean traderLlamaRidable = false;
@@ -1475,6 +1515,7 @@ public class PurpurWorldConfig {
@@ -1474,6 +1514,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1491,6 +1532,7 @@ public class PurpurWorldConfig {
@@ -1490,6 +1531,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);
@@ -802,7 +802,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean tropicalFishRidable = false;
@@ -1511,6 +1553,7 @@ public class PurpurWorldConfig {
@@ -1510,6 +1552,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1523,6 +1566,7 @@ public class PurpurWorldConfig {
@@ -1522,6 +1565,7 @@ public class PurpurWorldConfig {
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -818,7 +818,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean vexRidable = false;
@@ -1551,6 +1595,7 @@ public class PurpurWorldConfig {
@@ -1550,6 +1594,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1567,6 +1612,7 @@ public class PurpurWorldConfig {
@@ -1566,6 +1611,7 @@ public class PurpurWorldConfig {
villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius);
villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit);
villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed);
@@ -834,7 +834,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
}
public boolean vindicatorRidable = false;
@@ -1660,6 +1706,7 @@ public class PurpurWorldConfig {
@@ -1659,6 +1705,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index 965ab0b3d77fa8a46fa64a149aed4308d38ee1dd..4c03174509c6638ab3cf0f796b27a527
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1669,6 +1716,7 @@ public class PurpurWorldConfig {
@@ -1668,6 +1715,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);