mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Drop projectile despawn rates patch in favor of pufferfish's
Fixes elBukkit/MagicPlugin#1042 Fixes elBukkit/MagicPlugin#816
This commit is contained in:
@@ -491,10 +491,10 @@ index e99ffbf30652e188e88f8e17ed41d39ff25c9f73..c335a32832c6eef95658fbf632b943bb
|
||||
|
||||
@Override
|
||||
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda87a4d776 100644
|
||||
index 101c8ea510343c9f5c4742721a5622190d17358b..2d5c235b27417b02a1bf3da6a95277fe1574907d 100644
|
||||
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
|
||||
@@ -490,10 +490,12 @@ public class PurpurWorldConfig {
|
||||
@@ -497,10 +497,12 @@ public class PurpurWorldConfig {
|
||||
public boolean axolotlRidable = false;
|
||||
public boolean axolotlControllable = true;
|
||||
public double axolotlMaxHealth = 14.0D;
|
||||
@@ -507,7 +507,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean batRidable = false;
|
||||
@@ -526,6 +528,7 @@ public class PurpurWorldConfig {
|
||||
@@ -533,6 +535,7 @@ public class PurpurWorldConfig {
|
||||
public boolean beeControllable = true;
|
||||
public double beeMaxY = 320D;
|
||||
public double beeMaxHealth = 10.0D;
|
||||
@@ -515,7 +515,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void beeSettings() {
|
||||
beeRidable = getBoolean("mobs.bee.ridable", beeRidable);
|
||||
beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater);
|
||||
@@ -537,6 +540,7 @@ public class PurpurWorldConfig {
|
||||
@@ -544,6 +547,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.bee.attributes.max_health", oldValue);
|
||||
}
|
||||
beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth);
|
||||
@@ -523,7 +523,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean blazeRidable = false;
|
||||
@@ -564,6 +568,7 @@ public class PurpurWorldConfig {
|
||||
@@ -571,6 +575,7 @@ public class PurpurWorldConfig {
|
||||
public int catSpawnDelay = 1200;
|
||||
public int catSpawnSwampHutScanRange = 16;
|
||||
public int catSpawnVillageScanRange = 48;
|
||||
@@ -531,7 +531,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void catSettings() {
|
||||
catRidable = getBoolean("mobs.cat.ridable", catRidable);
|
||||
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
|
||||
@@ -577,6 +582,7 @@ public class PurpurWorldConfig {
|
||||
@@ -584,6 +589,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);
|
||||
@@ -539,7 +539,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean caveSpiderRidable = false;
|
||||
@@ -600,6 +606,7 @@ public class PurpurWorldConfig {
|
||||
@@ -607,6 +613,7 @@ public class PurpurWorldConfig {
|
||||
public boolean chickenControllable = true;
|
||||
public double chickenMaxHealth = 4.0D;
|
||||
public boolean chickenRetaliate = false;
|
||||
@@ -547,7 +547,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void chickenSettings() {
|
||||
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
|
||||
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
|
||||
@@ -611,6 +618,7 @@ public class PurpurWorldConfig {
|
||||
@@ -618,6 +625,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
|
||||
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
|
||||
@@ -555,7 +555,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean codRidable = false;
|
||||
@@ -632,6 +640,7 @@ public class PurpurWorldConfig {
|
||||
@@ -639,6 +647,7 @@ public class PurpurWorldConfig {
|
||||
public boolean cowControllable = true;
|
||||
public double cowMaxHealth = 10.0D;
|
||||
public int cowFeedMushrooms = 0;
|
||||
@@ -563,7 +563,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void cowSettings() {
|
||||
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
|
||||
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
|
||||
@@ -643,6 +652,7 @@ public class PurpurWorldConfig {
|
||||
@@ -650,6 +659,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
|
||||
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
|
||||
@@ -571,7 +571,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean creeperRidable = false;
|
||||
@@ -694,6 +704,7 @@ public class PurpurWorldConfig {
|
||||
@@ -701,6 +711,7 @@ public class PurpurWorldConfig {
|
||||
public double donkeyJumpStrengthMax = 0.5D;
|
||||
public double donkeyMovementSpeedMin = 0.175D;
|
||||
public double donkeyMovementSpeedMax = 0.175D;
|
||||
@@ -579,7 +579,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void donkeySettings() {
|
||||
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -709,6 +720,7 @@ public class PurpurWorldConfig {
|
||||
@@ -716,6 +727,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);
|
||||
@@ -587,7 +587,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean drownedRidable = false;
|
||||
@@ -828,6 +840,7 @@ public class PurpurWorldConfig {
|
||||
@@ -835,6 +847,7 @@ public class PurpurWorldConfig {
|
||||
public boolean foxControllable = true;
|
||||
public double foxMaxHealth = 10.0D;
|
||||
public boolean foxTypeChangesWithTulips = false;
|
||||
@@ -595,7 +595,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void foxSettings() {
|
||||
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
|
||||
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
|
||||
@@ -839,17 +852,20 @@ public class PurpurWorldConfig {
|
||||
@@ -846,17 +859,20 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
|
||||
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
|
||||
@@ -616,7 +616,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean ghastRidable = false;
|
||||
@@ -917,11 +933,13 @@ public class PurpurWorldConfig {
|
||||
@@ -924,11 +940,13 @@ public class PurpurWorldConfig {
|
||||
public boolean goatRidableInWater = false;
|
||||
public boolean goatControllable = true;
|
||||
public double goatMaxHealth = 10.0D;
|
||||
@@ -630,7 +630,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean guardianRidable = false;
|
||||
@@ -942,6 +960,7 @@ public class PurpurWorldConfig {
|
||||
@@ -949,6 +967,7 @@ public class PurpurWorldConfig {
|
||||
public boolean hoglinRidableInWater = false;
|
||||
public boolean hoglinControllable = true;
|
||||
public double hoglinMaxHealth = 40.0D;
|
||||
@@ -638,7 +638,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void hoglinSettings() {
|
||||
hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable);
|
||||
hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater);
|
||||
@@ -952,6 +971,7 @@ public class PurpurWorldConfig {
|
||||
@@ -959,6 +978,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.hoglin.attributes.max_health", oldValue);
|
||||
}
|
||||
hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth);
|
||||
@@ -646,7 +646,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean horseRidableInWater = false;
|
||||
@@ -961,6 +981,7 @@ public class PurpurWorldConfig {
|
||||
@@ -968,6 +988,7 @@ public class PurpurWorldConfig {
|
||||
public double horseJumpStrengthMax = 1.0D;
|
||||
public double horseMovementSpeedMin = 0.1125D;
|
||||
public double horseMovementSpeedMax = 0.3375D;
|
||||
@@ -654,7 +654,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void horseSettings() {
|
||||
horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -976,6 +997,7 @@ public class PurpurWorldConfig {
|
||||
@@ -983,6 +1004,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);
|
||||
@@ -662,7 +662,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean huskRidable = false;
|
||||
@@ -1053,6 +1075,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1060,6 +1082,7 @@ public class PurpurWorldConfig {
|
||||
public double llamaJumpStrengthMax = 0.5D;
|
||||
public double llamaMovementSpeedMin = 0.175D;
|
||||
public double llamaMovementSpeedMax = 0.175D;
|
||||
@@ -670,7 +670,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void llamaSettings() {
|
||||
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
|
||||
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
|
||||
@@ -1070,6 +1093,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1077,6 +1100,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);
|
||||
@@ -678,7 +678,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean magmaCubeRidable = false;
|
||||
@@ -1098,6 +1122,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1105,6 +1129,7 @@ public class PurpurWorldConfig {
|
||||
public boolean mooshroomRidableInWater = false;
|
||||
public boolean mooshroomControllable = true;
|
||||
public double mooshroomMaxHealth = 10.0D;
|
||||
@@ -686,7 +686,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void mooshroomSettings() {
|
||||
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
|
||||
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
|
||||
@@ -1108,6 +1133,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1115,6 +1140,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.mooshroom.attributes.max_health", oldValue);
|
||||
}
|
||||
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
|
||||
@@ -694,7 +694,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean muleRidableInWater = false;
|
||||
@@ -1117,6 +1143,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1124,6 +1150,7 @@ public class PurpurWorldConfig {
|
||||
public double muleJumpStrengthMax = 0.5D;
|
||||
public double muleMovementSpeedMin = 0.175D;
|
||||
public double muleMovementSpeedMax = 0.175D;
|
||||
@@ -702,7 +702,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void muleSettings() {
|
||||
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
|
||||
if (PurpurConfig.version < 10) {
|
||||
@@ -1132,12 +1159,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1139,12 +1166,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);
|
||||
@@ -717,7 +717,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void ocelotSettings() {
|
||||
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
|
||||
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
|
||||
@@ -1148,12 +1177,14 @@ public class PurpurWorldConfig {
|
||||
@@ -1155,12 +1184,14 @@ public class PurpurWorldConfig {
|
||||
set("mobs.ocelot.attributes.max_health", oldValue);
|
||||
}
|
||||
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
|
||||
@@ -732,7 +732,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void pandaSettings() {
|
||||
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
|
||||
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
|
||||
@@ -1164,6 +1195,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1171,6 +1202,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.panda.attributes.max_health", oldValue);
|
||||
}
|
||||
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
|
||||
@@ -740,7 +740,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean parrotRidable = false;
|
||||
@@ -1259,6 +1291,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1266,6 +1298,7 @@ public class PurpurWorldConfig {
|
||||
public boolean pigControllable = true;
|
||||
public double pigMaxHealth = 10.0D;
|
||||
public boolean pigGiveSaddleBack = false;
|
||||
@@ -748,7 +748,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void pigSettings() {
|
||||
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
|
||||
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
|
||||
@@ -1270,6 +1303,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1277,6 +1310,7 @@ public class PurpurWorldConfig {
|
||||
}
|
||||
pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth);
|
||||
pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack);
|
||||
@@ -756,7 +756,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean piglinRidable = false;
|
||||
@@ -1326,6 +1360,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1333,6 +1367,7 @@ public class PurpurWorldConfig {
|
||||
public double polarBearMaxHealth = 30.0D;
|
||||
public String polarBearBreedableItemString = "";
|
||||
public Item polarBearBreedableItem = null;
|
||||
@@ -764,7 +764,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void polarBearSettings() {
|
||||
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
|
||||
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
|
||||
@@ -1339,6 +1374,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1346,6 +1381,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;
|
||||
@@ -772,7 +772,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean pufferfishRidable = false;
|
||||
@@ -1361,6 +1397,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1368,6 +1404,7 @@ public class PurpurWorldConfig {
|
||||
public double rabbitMaxHealth = 3.0D;
|
||||
public double rabbitNaturalToast = 0.0D;
|
||||
public double rabbitNaturalKiller = 0.0D;
|
||||
@@ -780,7 +780,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void rabbitSettings() {
|
||||
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
|
||||
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
|
||||
@@ -1373,6 +1410,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1380,6 +1417,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);
|
||||
@@ -788,7 +788,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean ravagerRidable = false;
|
||||
@@ -1409,6 +1447,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1416,6 +1454,7 @@ public class PurpurWorldConfig {
|
||||
public boolean sheepRidableInWater = false;
|
||||
public boolean sheepControllable = true;
|
||||
public double sheepMaxHealth = 8.0D;
|
||||
@@ -796,7 +796,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void sheepSettings() {
|
||||
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
|
||||
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
|
||||
@@ -1419,6 +1458,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1426,6 +1465,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.sheep.attributes.max_health", oldValue);
|
||||
}
|
||||
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
|
||||
@@ -804,7 +804,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean shulkerRidable = false;
|
||||
@@ -1594,6 +1634,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1601,6 +1641,7 @@ public class PurpurWorldConfig {
|
||||
public boolean striderRidableInWater = false;
|
||||
public boolean striderControllable = true;
|
||||
public double striderMaxHealth = 20.0D;
|
||||
@@ -812,7 +812,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void striderSettings() {
|
||||
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
|
||||
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
|
||||
@@ -1604,6 +1645,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1611,6 +1652,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.strider.attributes.max_health", oldValue);
|
||||
}
|
||||
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
|
||||
@@ -820,7 +820,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean tadpoleRidable = false;
|
||||
@@ -1624,6 +1666,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1631,6 +1673,7 @@ public class PurpurWorldConfig {
|
||||
public double traderLlamaJumpStrengthMax = 0.5D;
|
||||
public double traderLlamaMovementSpeedMin = 0.175D;
|
||||
public double traderLlamaMovementSpeedMax = 0.175D;
|
||||
@@ -828,7 +828,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void traderLlamaSettings() {
|
||||
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
|
||||
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
|
||||
@@ -1641,6 +1684,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1648,6 +1691,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);
|
||||
@@ -836,7 +836,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean tropicalFishRidable = false;
|
||||
@@ -1661,6 +1705,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1668,6 +1712,7 @@ public class PurpurWorldConfig {
|
||||
public boolean turtleRidableInWater = false;
|
||||
public boolean turtleControllable = true;
|
||||
public double turtleMaxHealth = 30.0D;
|
||||
@@ -844,7 +844,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void turtleSettings() {
|
||||
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
|
||||
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
|
||||
@@ -1671,6 +1716,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1678,6 +1723,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.turtle.attributes.max_health", oldValue);
|
||||
}
|
||||
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
|
||||
@@ -852,7 +852,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean vexRidable = false;
|
||||
@@ -1700,6 +1746,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1707,6 +1753,7 @@ public class PurpurWorldConfig {
|
||||
public boolean villagerFollowEmeraldBlock = false;
|
||||
public boolean villagerCanBeLeashed = false;
|
||||
public boolean villagerCanBreed = true;
|
||||
@@ -860,7 +860,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void villagerSettings() {
|
||||
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
|
||||
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
|
||||
@@ -1715,6 +1762,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1722,6 +1769,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);
|
||||
@@ -868,7 +868,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
}
|
||||
|
||||
public boolean vindicatorRidable = false;
|
||||
@@ -1826,6 +1874,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1833,6 +1881,7 @@ public class PurpurWorldConfig {
|
||||
public boolean wolfRidableInWater = false;
|
||||
public boolean wolfControllable = true;
|
||||
public double wolfMaxHealth = 8.0D;
|
||||
@@ -876,7 +876,7 @@ index 5236d3bc8acb317d819f59cd5873c6e0d14f091f..4a2c5afda4f59542412b0ef54bfa4cda
|
||||
private void wolfSettings() {
|
||||
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
|
||||
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
|
||||
@@ -1836,6 +1885,7 @@ public class PurpurWorldConfig {
|
||||
@@ -1843,6 +1892,7 @@ public class PurpurWorldConfig {
|
||||
set("mobs.wolf.attributes.max_health", oldValue);
|
||||
}
|
||||
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);
|
||||
|
||||
Reference in New Issue
Block a user