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

Fix #462 - also renamed option for clarity

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-03 08:00:18 -05:00
parent 1ca029cdcc
commit c69c0bcadf
46 changed files with 225 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -393,7 +393,7 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89
return true;
// Purpur end
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d092fb96cc 100644
index 17eea406df45207d54aa401b826827673883114b..4008773fb5d87e8322e1a7bd426fa73759e8b656 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -363,9 +363,12 @@ public class PurpurWorldConfig {
@@ -434,7 +434,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -477,6 +485,11 @@ public class PurpurWorldConfig {
@@ -483,6 +491,11 @@ public class PurpurWorldConfig {
kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge);
}
@@ -446,7 +446,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
public boolean respawnAnchorExplode = true;
public double respawnAnchorExplosionPower = 5.0D;
public boolean respawnAnchorExplosionFire = true;
@@ -510,6 +523,11 @@ public class PurpurWorldConfig {
@@ -516,6 +529,11 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -458,7 +458,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
public double twistingVinesGrowthModifier = 0.10D;
public int twistingVinesMaxGrowthAge = 25;
private void twistingVinesSettings() {
@@ -688,6 +706,7 @@ public class PurpurWorldConfig {
@@ -694,6 +712,7 @@ public class PurpurWorldConfig {
public double creeperMaxHealth = 20.0D;
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
@@ -466,7 +466,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -699,6 +718,7 @@ public class PurpurWorldConfig {
@@ -705,6 +724,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);
@@ -474,7 +474,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean dolphinRidable = false;
@@ -786,6 +806,7 @@ public class PurpurWorldConfig {
@@ -792,6 +812,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public double enderDragonMaxHealth = 200.0D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -482,7 +482,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater);
@@ -801,6 +822,7 @@ public class PurpurWorldConfig {
@@ -807,6 +828,7 @@ public class PurpurWorldConfig {
}
enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -490,7 +490,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean endermanRidable = false;
@@ -808,6 +830,7 @@ public class PurpurWorldConfig {
@@ -814,6 +836,7 @@ public class PurpurWorldConfig {
public double endermanMaxHealth = 40.0D;
public boolean endermanAllowGriefing = true;
public boolean endermanDespawnEvenWithBlock = false;
@@ -498,7 +498,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void endermanSettings() {
endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable);
endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater);
@@ -819,6 +842,7 @@ public class PurpurWorldConfig {
@@ -825,6 +848,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);
@@ -506,7 +506,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean endermiteRidable = false;
@@ -838,6 +862,7 @@ public class PurpurWorldConfig {
@@ -844,6 +868,7 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
public double evokerMaxHealth = 24.0D;
@@ -514,7 +514,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void evokerSettings() {
evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable);
evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater);
@@ -847,6 +872,7 @@ public class PurpurWorldConfig {
@@ -853,6 +878,7 @@ public class PurpurWorldConfig {
set("mobs.evoker.attributes.max_health", oldValue);
}
evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth);
@@ -522,7 +522,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean foxRidable = false;
@@ -854,6 +880,7 @@ public class PurpurWorldConfig {
@@ -860,6 +886,7 @@ public class PurpurWorldConfig {
public double foxMaxHealth = 10.0D;
public boolean foxTypeChangesWithTulips = false;
public int foxBreedingTicks = 6000;
@@ -530,7 +530,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void foxSettings() {
foxRidable = getBoolean("mobs.fox.ridable", foxRidable);
foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater);
@@ -865,6 +892,7 @@ public class PurpurWorldConfig {
@@ -871,6 +898,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);
@@ -538,7 +538,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean ghastRidable = false;
@@ -1260,6 +1288,7 @@ public class PurpurWorldConfig {
@@ -1266,6 +1294,7 @@ public class PurpurWorldConfig {
public boolean piglinRidable = false;
public boolean piglinRidableInWater = false;
public double piglinMaxHealth = 16.0D;
@@ -546,7 +546,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void piglinSettings() {
piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable);
piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater);
@@ -1269,6 +1298,7 @@ public class PurpurWorldConfig {
@@ -1275,6 +1304,7 @@ public class PurpurWorldConfig {
set("mobs.piglin.attributes.max_health", oldValue);
}
piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth);
@@ -554,7 +554,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean piglinBruteRidable = false;
@@ -1288,6 +1318,7 @@ public class PurpurWorldConfig {
@@ -1294,6 +1324,7 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
public double pillagerMaxHealth = 24.0D;
@@ -562,7 +562,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void pillagerSettings() {
pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable);
pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater);
@@ -1297,6 +1328,7 @@ public class PurpurWorldConfig {
@@ -1303,6 +1334,7 @@ public class PurpurWorldConfig {
set("mobs.pillager.attributes.max_health", oldValue);
}
pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth);
@@ -570,7 +570,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean polarBearRidable = false;
@@ -1338,6 +1370,7 @@ public class PurpurWorldConfig {
@@ -1344,6 +1376,7 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -578,7 +578,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -1350,11 +1383,13 @@ public class PurpurWorldConfig {
@@ -1356,11 +1389,13 @@ 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);
@@ -592,7 +592,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void ravagerSettings() {
ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable);
ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater);
@@ -1364,6 +1399,7 @@ public class PurpurWorldConfig {
@@ -1370,6 +1405,7 @@ public class PurpurWorldConfig {
set("mobs.ravager.attributes.max_health", oldValue);
}
ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth);
@@ -600,7 +600,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean salmonRidable = false;
@@ -1382,6 +1418,7 @@ public class PurpurWorldConfig {
@@ -1388,6 +1424,7 @@ public class PurpurWorldConfig {
public boolean sheepRidableInWater = false;
public double sheepMaxHealth = 8.0D;
public int sheepBreedingTicks = 6000;
@@ -608,7 +608,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void sheepSettings() {
sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable);
sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater);
@@ -1392,6 +1429,7 @@ public class PurpurWorldConfig {
@@ -1398,6 +1435,7 @@ public class PurpurWorldConfig {
}
sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth);
sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks);
@@ -616,7 +616,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean shulkerRidable = false;
@@ -1411,6 +1449,7 @@ public class PurpurWorldConfig {
@@ -1417,6 +1455,7 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
public double silverfishMaxHealth = 8.0D;
@@ -624,7 +624,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void silverfishSettings() {
silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable);
silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater);
@@ -1420,6 +1459,7 @@ public class PurpurWorldConfig {
@@ -1426,6 +1465,7 @@ public class PurpurWorldConfig {
set("mobs.silverfish.attributes.max_health", oldValue);
}
silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth);
@@ -632,7 +632,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean skeletonRidable = false;
@@ -1487,6 +1527,7 @@ public class PurpurWorldConfig {
@@ -1493,6 +1533,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -640,7 +640,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1503,6 +1544,7 @@ public class PurpurWorldConfig {
@@ -1509,6 +1550,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);
@@ -648,7 +648,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean squidRidable = false;
@@ -1662,6 +1704,7 @@ public class PurpurWorldConfig {
@@ -1668,6 +1710,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -656,7 +656,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1688,6 +1731,7 @@ public class PurpurWorldConfig {
@@ -1694,6 +1737,7 @@ public class PurpurWorldConfig {
villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck);
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
@@ -664,7 +664,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean vindicatorRidable = false;
@@ -1744,6 +1788,7 @@ public class PurpurWorldConfig {
@@ -1750,6 +1794,7 @@ public class PurpurWorldConfig {
public double witherMaxHealth = 300.0D;
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
@@ -672,7 +672,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1760,6 +1805,7 @@ public class PurpurWorldConfig {
@@ -1766,6 +1811,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);
@@ -680,7 +680,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
}
public boolean witherSkeletonRidable = false;
@@ -1827,6 +1873,7 @@ public class PurpurWorldConfig {
@@ -1833,6 +1879,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD;
@@ -688,7 +688,7 @@ index 72f5c4cff712bad9a82ddbd84656dd1ef426b116..4f05a6242af095627d85ac34003208d0
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1846,6 +1893,7 @@ public class PurpurWorldConfig {
@@ -1852,6 +1899,7 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = Difficulty.HARD;
}