Fix silk-touch spawners dropping xp and add config for minimal enchantment level (#454)

This commit is contained in:
Bierque Jason
2021-07-01 06:06:52 +02:00
committed by GitHub
parent 139f2f5d07
commit 247b99f433
112 changed files with 410 additions and 400 deletions

View File

@@ -362,7 +362,7 @@ index 6c6d2ac7551ae24dec88bd9e6bce7aeafd900e8c..b077b3d389e3439cf1115009a0edb4ed
@Override
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
index 92069543fd8f19ee037af59edd84c61f5216463f..873e1d64b917e961c9d9b5217fe664a91d0ab5bc 100644
index 5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d..93a05b945ac248df0ea7a0b9d7264a9c129c3bcf 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
@@ -123,6 +123,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob {
@@ -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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e7e8938ae 100644
index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa3b3cbef3 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -467,9 +467,11 @@ public class PurpurWorldConfig {
@@ -469,9 +469,11 @@ public class PurpurWorldConfig {
public boolean axolotlRidable = false;
public double axolotlMaxHealth = 14.0D;
@@ -489,7 +489,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean batRidable = false;
@@ -499,6 +501,7 @@ public class PurpurWorldConfig {
@@ -501,6 +503,7 @@ public class PurpurWorldConfig {
public boolean beeRidableInWater = false;
public double beeMaxY = 256D;
public double beeMaxHealth = 10.0D;
@@ -497,7 +497,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void beeSettings() {
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
@@ -509,6 +512,7 @@ public class PurpurWorldConfig {
@@ -511,6 +514,7 @@ public class PurpurWorldConfig {
set("mobs.bee.attributes.max_health", oldValue);
}
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
@@ -505,7 +505,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean blazeRidable = false;
@@ -533,6 +537,7 @@ public class PurpurWorldConfig {
@@ -535,6 +539,7 @@ public class PurpurWorldConfig {
public int catSpawnDelay = 1200;
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
@@ -513,7 +513,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -545,6 +550,7 @@ public class PurpurWorldConfig {
@@ -547,6 +552,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean caveSpiderRidable = false;
@@ -565,6 +571,7 @@ public class PurpurWorldConfig {
@@ -567,6 +573,7 @@ public class PurpurWorldConfig {
public boolean chickenRidableInWater = false;
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
@@ -529,7 +529,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -575,6 +582,7 @@ public class PurpurWorldConfig {
@@ -577,6 +584,7 @@ public class PurpurWorldConfig {
}
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
@@ -537,7 +537,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean codRidable = false;
@@ -593,6 +601,7 @@ public class PurpurWorldConfig {
@@ -595,6 +603,7 @@ public class PurpurWorldConfig {
public boolean cowRidableInWater = false;
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
@@ -545,7 +545,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -603,6 +612,7 @@ public class PurpurWorldConfig {
@@ -605,6 +614,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean creeperRidable = false;
@@ -650,6 +660,7 @@ public class PurpurWorldConfig {
@@ -652,6 +662,7 @@ public class PurpurWorldConfig {
public double donkeyJumpStrengthMax = 0.5D;
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
@@ -561,7 +561,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -665,6 +676,7 @@ public class PurpurWorldConfig {
@@ -667,6 +678,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean drownedRidable = false;
@@ -771,6 +783,7 @@ public class PurpurWorldConfig {
@@ -773,6 +785,7 @@ public class PurpurWorldConfig {
public boolean foxRidableInWater = false;
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
@@ -577,7 +577,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -781,6 +794,7 @@ public class PurpurWorldConfig {
@@ -783,6 +796,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean ghastRidable = false;
@@ -841,10 +855,12 @@ public class PurpurWorldConfig {
@@ -843,10 +857,12 @@ public class PurpurWorldConfig {
public boolean goatRidable = false;
public boolean goatRidableInWater = false;
public double goatMaxHealth = 10.0D;
@@ -598,7 +598,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean guardianRidable = false;
@@ -862,6 +878,7 @@ public class PurpurWorldConfig {
@@ -864,6 +880,7 @@ public class PurpurWorldConfig {
public boolean hoglinRidable = false;
public boolean hoglinRidableInWater = false;
public double hoglinMaxHealth = 40.0D;
@@ -606,7 +606,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void hoglinSettings() {
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
@@ -871,6 +888,7 @@ public class PurpurWorldConfig {
@@ -873,6 +890,7 @@ public class PurpurWorldConfig {
set("mobs.hoglin.attributes.max_health", oldValue);
}
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
@@ -614,7 +614,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean horseRidableInWater = false;
@@ -880,6 +898,7 @@ public class PurpurWorldConfig {
@@ -882,6 +900,7 @@ public class PurpurWorldConfig {
public double horseJumpStrengthMax = 1.0D;
public double horseMovementSpeedMin = 0.1125D;
public double horseMovementSpeedMax = 0.3375D;
@@ -622,7 +622,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void horseSettings() {
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
if (PurpurConfig.version < 10) {
@@ -895,6 +914,7 @@ public class PurpurWorldConfig {
@@ -897,6 +916,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean huskRidable = false;
@@ -965,6 +985,7 @@ public class PurpurWorldConfig {
@@ -967,6 +987,7 @@ public class PurpurWorldConfig {
public double llamaJumpStrengthMax = 0.5D;
public double llamaMovementSpeedMin = 0.175D;
public double llamaMovementSpeedMax = 0.175D;
@@ -638,7 +638,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -981,6 +1002,7 @@ public class PurpurWorldConfig {
@@ -983,6 +1004,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean magmaCubeRidable = false;
@@ -1000,6 +1022,7 @@ public class PurpurWorldConfig {
@@ -1002,6 +1024,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidable = false;
public boolean mooshroomRidableInWater = false;
public double mooshroomMaxHealth = 10.0D;
@@ -654,7 +654,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1009,6 +1032,7 @@ public class PurpurWorldConfig {
@@ -1011,6 +1034,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -662,7 +662,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean muleRidableInWater = false;
@@ -1018,6 +1042,7 @@ public class PurpurWorldConfig {
@@ -1020,6 +1044,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -670,7 +670,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1033,11 +1058,13 @@ public class PurpurWorldConfig {
@@ -1035,11 +1060,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1047,11 +1074,13 @@ public class PurpurWorldConfig {
@@ -1049,11 +1076,13 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -698,7 +698,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1061,6 +1090,7 @@ public class PurpurWorldConfig {
@@ -1063,6 +1092,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -706,7 +706,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean parrotRidable = false;
@@ -1141,6 +1171,7 @@ public class PurpurWorldConfig {
@@ -1143,6 +1173,7 @@ public class PurpurWorldConfig {
public boolean pigRidableInWater = false;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -714,7 +714,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1151,6 +1182,7 @@ public class PurpurWorldConfig {
@@ -1153,6 +1184,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean piglinRidable = false;
@@ -1200,6 +1232,7 @@ public class PurpurWorldConfig {
@@ -1202,6 +1234,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -730,7 +730,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1212,6 +1245,7 @@ public class PurpurWorldConfig {
@@ -1214,6 +1247,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean pufferfishRidable = false;
@@ -1231,6 +1265,7 @@ public class PurpurWorldConfig {
@@ -1233,6 +1267,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -746,7 +746,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1242,6 +1277,7 @@ public class PurpurWorldConfig {
@@ -1244,6 +1279,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean ravagerRidable = false;
@@ -1273,6 +1309,7 @@ public class PurpurWorldConfig {
@@ -1275,6 +1311,7 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
@@ -762,7 +762,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1282,6 +1319,7 @@ public class PurpurWorldConfig {
@@ -1284,6 +1321,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -770,7 +770,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean shulkerRidable = false;
@@ -1436,6 +1474,7 @@ public class PurpurWorldConfig {
@@ -1438,6 +1476,7 @@ public class PurpurWorldConfig {
public boolean striderRidable = false;
public boolean striderRidableInWater = false;
public double striderMaxHealth = 20.0D;
@@ -778,7 +778,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1445,6 +1484,7 @@ public class PurpurWorldConfig {
@@ -1447,6 +1486,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -786,7 +786,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean traderLlamaRidable = false;
@@ -1455,6 +1495,7 @@ public class PurpurWorldConfig {
@@ -1457,6 +1497,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -794,7 +794,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1471,6 +1512,7 @@ public class PurpurWorldConfig {
@@ -1473,6 +1514,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean tropicalFishRidable = false;
@@ -1491,6 +1533,7 @@ public class PurpurWorldConfig {
@@ -1493,6 +1535,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromExpOrbs = true;
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
@@ -810,7 +810,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1503,6 +1546,7 @@ public class PurpurWorldConfig {
@@ -1505,6 +1548,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean vexRidable = false;
@@ -1531,6 +1575,7 @@ public class PurpurWorldConfig {
@@ -1533,6 +1577,7 @@ public class PurpurWorldConfig {
public int villagerSpawnIronGolemRadius = 0;
public int villagerSpawnIronGolemLimit = 0;
public boolean villagerCanBreed = true;
@@ -826,7 +826,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1547,6 +1592,7 @@ public class PurpurWorldConfig {
@@ -1549,6 +1594,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 dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
}
public boolean vindicatorRidable = false;
@@ -1640,6 +1686,7 @@ public class PurpurWorldConfig {
@@ -1642,6 +1688,7 @@ public class PurpurWorldConfig {
public boolean wolfRidable = false;
public boolean wolfRidableInWater = false;
public double wolfMaxHealth = 8.0D;
@@ -842,7 +842,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1649,6 +1696,7 @@ public class PurpurWorldConfig {
@@ -1651,6 +1698,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);