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

fix config options in patches

Browse Source
This commit is contained in:
granny
2023-06-09 04:33:41 -07:00
parent 91b9a1a0ce
commit 9bed3af997
94 changed files with 603 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -525,7 +525,7 @@ 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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2b5a1681b 100644
index a3a6f6fc0e74586c476d28793bbf1ec51d6cfbe4..702e31b206c430d5b055eecd93bce0a7c25454a8 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 {
@@ -557,14 +557,14 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean blazeRidable = false;
@@ -582,6 +586,7 @@ public class PurpurWorldConfig {
public double camelJumpStrengthMax = 0.42D;
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
@@ -576,6 +580,7 @@ public class PurpurWorldConfig {
blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth);
}
+ public int camelBreedingTicks = 6000;
private void camelSettings() {
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
public double camelMaxHealthMin = 32.0D;
public double camelMaxHealthMax = 32.0D;
public double camelJumpStrengthMin = 0.42D;
@@ -589,6 +594,7 @@ public class PurpurWorldConfig {
camelJumpStrengthMax = getDouble("mobs.camel.attributes.jump_strength.max", camelJumpStrengthMax);
camelMovementSpeedMin = getDouble("mobs.camel.attributes.movement_speed.min", camelMovementSpeedMin);
@@ -720,7 +720,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void llamaSettings() {
llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable);
llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater);
@@ -1107,6 +1132,7 @@ public class PurpurWorldConfig {
@@ -1104,6 +1129,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean magmaCubeRidable = false;
@@ -1135,6 +1161,7 @@ public class PurpurWorldConfig {
@@ -1132,6 +1158,7 @@ public class PurpurWorldConfig {
public boolean mooshroomRidableInWater = true;
public boolean mooshroomControllable = true;
public double mooshroomMaxHealth = 10.0D;
@@ -736,7 +736,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void mooshroomSettings() {
mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable);
mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater);
@@ -1145,6 +1172,7 @@ public class PurpurWorldConfig {
@@ -1142,6 +1169,7 @@ public class PurpurWorldConfig {
set("mobs.mooshroom.attributes.max_health", oldValue);
}
mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth);
@@ -744,7 +744,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean muleRidableInWater = false;
@@ -1154,6 +1182,7 @@ public class PurpurWorldConfig {
@@ -1151,6 +1179,7 @@ public class PurpurWorldConfig {
public double muleJumpStrengthMax = 0.5D;
public double muleMovementSpeedMin = 0.175D;
public double muleMovementSpeedMax = 0.175D;
@@ -752,7 +752,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void muleSettings() {
muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1169,12 +1198,14 @@ public class PurpurWorldConfig {
@@ -1166,12 +1195,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void ocelotSettings() {
ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable);
ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater);
@@ -1185,12 +1216,14 @@ public class PurpurWorldConfig {
@@ -1182,12 +1213,14 @@ public class PurpurWorldConfig {
set("mobs.ocelot.attributes.max_health", oldValue);
}
ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth);
@@ -782,7 +782,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void pandaSettings() {
pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable);
pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater);
@@ -1201,6 +1234,7 @@ public class PurpurWorldConfig {
@@ -1198,6 +1231,7 @@ public class PurpurWorldConfig {
set("mobs.panda.attributes.max_health", oldValue);
}
pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth);
@@ -790,7 +790,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean parrotRidable = false;
@@ -1284,6 +1318,7 @@ public class PurpurWorldConfig {
@@ -1281,6 +1315,7 @@ public class PurpurWorldConfig {
public boolean pigControllable = true;
public double pigMaxHealth = 10.0D;
public boolean pigGiveSaddleBack = false;
@@ -798,7 +798,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void pigSettings() {
pigRidable = getBoolean("mobs.pig.ridable", pigRidable);
pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater);
@@ -1295,6 +1330,7 @@ public class PurpurWorldConfig {
@@ -1292,6 +1327,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean piglinRidable = false;
@@ -1351,6 +1387,7 @@ public class PurpurWorldConfig {
@@ -1348,6 +1384,7 @@ public class PurpurWorldConfig {
public double polarBearMaxHealth = 30.0D;
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
@@ -814,7 +814,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -1364,6 +1401,7 @@ public class PurpurWorldConfig {
@@ -1361,6 +1398,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean pufferfishRidable = false;
@@ -1386,6 +1424,7 @@ public class PurpurWorldConfig {
@@ -1383,6 +1421,7 @@ public class PurpurWorldConfig {
public double rabbitMaxHealth = 3.0D;
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
@@ -830,7 +830,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1398,6 +1437,7 @@ public class PurpurWorldConfig {
@@ -1395,6 +1434,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean ravagerRidable = false;
@@ -1434,6 +1474,7 @@ public class PurpurWorldConfig {
@@ -1431,6 +1471,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = true;
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
@@ -846,7 +846,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1444,6 +1485,7 @@ public class PurpurWorldConfig {
@@ -1441,6 +1482,7 @@ public class PurpurWorldConfig {
set("mobs.sheep.attributes.max_health", oldValue);
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
@@ -854,7 +854,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean shulkerRidable = false;
@@ -1567,11 +1609,13 @@ public class PurpurWorldConfig {
@@ -1564,11 +1606,13 @@ public class PurpurWorldConfig {
public boolean snifferRidableInWater = true;
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
@@ -868,7 +868,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean squidRidable = false;
@@ -1630,6 +1674,7 @@ public class PurpurWorldConfig {
@@ -1627,6 +1671,7 @@ public class PurpurWorldConfig {
public boolean striderRidableInWater = false;
public boolean striderControllable = true;
public double striderMaxHealth = 20.0D;
@@ -876,7 +876,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void striderSettings() {
striderRidable = getBoolean("mobs.strider.ridable", striderRidable);
striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater);
@@ -1640,6 +1685,7 @@ public class PurpurWorldConfig {
@@ -1637,6 +1682,7 @@ public class PurpurWorldConfig {
set("mobs.strider.attributes.max_health", oldValue);
}
striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth);
@@ -884,7 +884,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean tadpoleRidable = false;
@@ -1660,6 +1706,7 @@ public class PurpurWorldConfig {
@@ -1657,6 +1703,7 @@ public class PurpurWorldConfig {
public double traderLlamaJumpStrengthMax = 0.5D;
public double traderLlamaMovementSpeedMin = 0.175D;
public double traderLlamaMovementSpeedMax = 0.175D;
@@ -892,7 +892,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void traderLlamaSettings() {
traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable);
traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater);
@@ -1677,6 +1724,7 @@ public class PurpurWorldConfig {
@@ -1674,6 +1721,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean tropicalFishRidable = false;
@@ -1697,6 +1745,7 @@ public class PurpurWorldConfig {
@@ -1694,6 +1742,7 @@ public class PurpurWorldConfig {
public boolean turtleRidableInWater = true;
public boolean turtleControllable = true;
public double turtleMaxHealth = 30.0D;
@@ -908,7 +908,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void turtleSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1707,6 +1756,7 @@ public class PurpurWorldConfig {
@@ -1704,6 +1753,7 @@ public class PurpurWorldConfig {
set("mobs.turtle.attributes.max_health", oldValue);
}
turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth);
@@ -916,7 +916,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean vexRidable = false;
@@ -1734,6 +1784,7 @@ public class PurpurWorldConfig {
@@ -1731,6 +1781,7 @@ public class PurpurWorldConfig {
public boolean villagerFollowEmeraldBlock = false;
public boolean villagerCanBeLeashed = false;
public boolean villagerCanBreed = true;
@@ -924,7 +924,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1747,6 +1798,7 @@ public class PurpurWorldConfig {
@@ -1744,6 +1795,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 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
}
public boolean vindicatorRidable = false;
@@ -1858,6 +1910,7 @@ public class PurpurWorldConfig {
@@ -1855,6 +1907,7 @@ public class PurpurWorldConfig {
public boolean wolfRidableInWater = true;
public boolean wolfControllable = true;
public double wolfMaxHealth = 8.0D;
@@ -940,7 +940,7 @@ index 39c8e6f7bf012e94c653c12383d2a7cf856e1123..e0074e78a66eb425d45d1d17da6663b2
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1868,6 +1921,7 @@ public class PurpurWorldConfig {
@@ -1865,6 +1918,7 @@ public class PurpurWorldConfig {
set("mobs.wolf.attributes.max_health", oldValue);
}
wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth);