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

40
patches/server/0122-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -374,7 +374,7 @@ index 1942649e868fc985a488034c411a6721595ecc67..7495e0e8beedad59fff24ebf189b58b3
}
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207abcc5e38 100644
index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c366eb863 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -117,8 +117,11 @@ public class PurpurWorldConfig {
@@ -518,7 +518,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean frogRidable = false;
@@ -1380,6 +1405,7 @@ public class PurpurWorldConfig {
@@ -1377,6 +1402,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = true;
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
@@ -526,7 +526,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1390,6 +1416,7 @@ public class PurpurWorldConfig {
@@ -1387,6 +1413,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -534,7 +534,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean piglinBruteRidable = false;
@@ -1412,6 +1439,7 @@ public class PurpurWorldConfig {
@@ -1409,6 +1436,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidableInWater = true;
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
@@ -542,7 +542,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1422,6 +1450,7 @@ public class PurpurWorldConfig {
@@ -1419,6 +1447,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -550,7 +550,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean polarBearRidable = false;
@@ -1468,6 +1497,7 @@ public class PurpurWorldConfig {
@@ -1465,6 +1494,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -558,7 +558,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1481,12 +1511,14 @@ public class PurpurWorldConfig {
@@ -1478,12 +1508,14 @@ public class PurpurWorldConfig {
rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast);
rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller);
rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks);
@@ -573,7 +573,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1497,6 +1529,7 @@ public class PurpurWorldConfig {
@@ -1494,6 +1526,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -581,7 +581,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean salmonRidable = false;
@@ -1518,6 +1551,7 @@ public class PurpurWorldConfig {
@@ -1515,6 +1548,7 @@ public class PurpurWorldConfig {
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -589,7 +589,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1529,6 +1563,7 @@ public class PurpurWorldConfig {
@@ -1526,6 +1560,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -597,7 +597,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean shulkerRidable = false;
@@ -1551,6 +1586,7 @@ public class PurpurWorldConfig {
@@ -1548,6 +1583,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidableInWater = true;
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
@@ -605,7 +605,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1561,6 +1597,7 @@ public class PurpurWorldConfig {
@@ -1558,6 +1594,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -613,7 +613,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean skeletonRidable = false;
@@ -1637,6 +1674,7 @@ public class PurpurWorldConfig {
@@ -1634,6 +1671,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -621,7 +621,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1654,6 +1692,7 @@ public class PurpurWorldConfig {
@@ -1651,6 +1689,7 @@ public class PurpurWorldConfig {
snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax);
snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier);
snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance);
@@ -629,7 +629,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean snifferRidable = false;
@@ -1840,6 +1879,7 @@ public class PurpurWorldConfig {
@@ -1837,6 +1876,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -637,7 +637,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1856,6 +1896,7 @@ public class PurpurWorldConfig {
@@ -1853,6 +1893,7 @@ public class PurpurWorldConfig {
villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -645,7 +645,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean vindicatorRidable = false;
@@ -1928,6 +1969,7 @@ public class PurpurWorldConfig {
@@ -1925,6 +1966,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -653,7 +653,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1945,6 +1987,7 @@ public class PurpurWorldConfig {
@@ -1942,6 +1984,7 @@ public class PurpurWorldConfig {
witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
@@ -661,7 +661,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
}
public boolean witherSkeletonRidable = false;
@@ -2016,6 +2059,7 @@ public class PurpurWorldConfig {
@@ -2013,6 +2056,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,7 +669,7 @@ index 2d521598a6c02f8c64bf64e5abb0a23b65efb73a..dfe8c4e6c904e0153e7874392098b207
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2031,6 +2075,7 @@ public class PurpurWorldConfig {
@@ -2028,6 +2072,7 @@ public class PurpurWorldConfig {
zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);