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

synchronize patches

Browse Source
This commit is contained in:
granny
2023-06-09 05:07:46 -07:00
parent 9bed3af997
commit e4edcee766
113 changed files with 703 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
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 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c366eb863 100644
index 787116225cc5a21576a3854c481f963b19c63cc4..2d358654a518d3dfa663d079fc522f8bafd2b456 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 {
@@ -437,8 +437,8 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
+ turtleEggsBypassMobGriefing = getBoolean("blocks.turtle_egg.bypass-mob-griefing", turtleEggsBypassMobGriefing);
}
public boolean babiesAreRidable = true;
@@ -736,6 +751,7 @@ public class PurpurWorldConfig {
public int waterInfiniteRequiredSources = 2;
@@ -741,6 +756,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -446,7 +446,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -748,6 +764,7 @@ public class PurpurWorldConfig {
@@ -753,6 +769,7 @@ public class PurpurWorldConfig {
creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth);
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
@@ -454,7 +454,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean dolphinRidable = false;
@@ -842,6 +859,7 @@ public class PurpurWorldConfig {
@@ -847,6 +864,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 320D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -462,7 +462,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -858,6 +876,7 @@ public class PurpurWorldConfig {
@@ -863,6 +881,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -470,7 +470,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean endermanRidable = false;
@@ -866,6 +885,7 @@ public class PurpurWorldConfig {
@@ -871,6 +890,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -478,7 +478,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -878,6 +898,7 @@ public class PurpurWorldConfig {
@@ -883,6 +903,7 @@ public class PurpurWorldConfig {
endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth);
endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing);
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
@@ -486,7 +486,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean endermiteRidable = false;
@@ -900,6 +921,7 @@ public class PurpurWorldConfig {
@@ -905,6 +926,7 @@ public class PurpurWorldConfig {
public boolean evokerRidableInWater = true;
public boolean evokerControllable = true;
public double evokerMaxHealth = 24.0D;
@@ -494,7 +494,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -910,6 +932,7 @@ public class PurpurWorldConfig {
@@ -915,6 +937,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -502,7 +502,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean foxRidable = false;
@@ -918,6 +941,7 @@ public class PurpurWorldConfig {
@@ -923,6 +946,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -510,7 +510,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -930,6 +954,7 @@ public class PurpurWorldConfig {
@@ -935,6 +959,7 @@ public class PurpurWorldConfig {
foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth);
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
@@ -518,7 +518,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean frogRidable = false;
@@ -1377,6 +1402,7 @@ public class PurpurWorldConfig {
@@ -1382,6 +1407,7 @@ public class PurpurWorldConfig {
public boolean piglinRidableInWater = true;
public boolean piglinControllable = true;
public double piglinMaxHealth = 16.0D;
@@ -526,7 +526,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1387,6 +1413,7 @@ public class PurpurWorldConfig {
@@ -1392,6 +1418,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -534,7 +534,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean piglinBruteRidable = false;
@@ -1409,6 +1436,7 @@ public class PurpurWorldConfig {
@@ -1414,6 +1441,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidableInWater = true;
public boolean pillagerControllable = true;
public double pillagerMaxHealth = 24.0D;
@@ -542,7 +542,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1419,6 +1447,7 @@ public class PurpurWorldConfig {
@@ -1424,6 +1452,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -550,7 +550,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean polarBearRidable = false;
@@ -1465,6 +1494,7 @@ public class PurpurWorldConfig {
@@ -1470,6 +1499,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -558,7 +558,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1478,12 +1508,14 @@ public class PurpurWorldConfig {
@@ -1483,12 +1513,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 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1494,6 +1526,7 @@ public class PurpurWorldConfig {
@@ -1499,6 +1531,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -581,7 +581,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean salmonRidable = false;
@@ -1515,6 +1548,7 @@ public class PurpurWorldConfig {
@@ -1520,6 +1553,7 @@ public class PurpurWorldConfig {
public boolean sheepControllable = true;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -589,7 +589,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1526,6 +1560,7 @@ public class PurpurWorldConfig {
@@ -1531,6 +1565,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 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean shulkerRidable = false;
@@ -1548,6 +1583,7 @@ public class PurpurWorldConfig {
@@ -1553,6 +1588,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidableInWater = true;
public boolean silverfishControllable = true;
public double silverfishMaxHealth = 8.0D;
@@ -605,7 +605,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1558,6 +1594,7 @@ public class PurpurWorldConfig {
@@ -1563,6 +1599,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -613,7 +613,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean skeletonRidable = false;
@@ -1634,6 +1671,7 @@ public class PurpurWorldConfig {
@@ -1639,6 +1676,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -621,7 +621,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1651,6 +1689,7 @@ public class PurpurWorldConfig {
@@ -1656,6 +1694,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 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean snifferRidable = false;
@@ -1837,6 +1876,7 @@ public class PurpurWorldConfig {
@@ -1842,6 +1881,7 @@ public class PurpurWorldConfig {
public int villagerBreedingTicks = 6000;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -637,7 +637,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1853,6 +1893,7 @@ public class PurpurWorldConfig {
@@ -1858,6 +1898,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 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean vindicatorRidable = false;
@@ -1925,6 +1966,7 @@ public class PurpurWorldConfig {
@@ -1930,6 +1971,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -653,7 +653,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1942,6 +1984,7 @@ public class PurpurWorldConfig {
@@ -1947,6 +1989,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 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
}
public boolean witherSkeletonRidable = false;
@@ -2013,6 +2056,7 @@ public class PurpurWorldConfig {
@@ -2018,6 +2061,7 @@ public class PurpurWorldConfig {
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
@@ -669,7 +669,7 @@ index 170df9668cb7efc61988f89a271b60c2fa268965..837f15b2435ad4a0824fd1ff2f71ed5c
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -2028,6 +2072,7 @@ public class PurpurWorldConfig {
@@ -2033,6 +2077,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);