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

Add item immunities option for cactus

Browse Source
This commit is contained in:
BillyGalbreath
2021-01-15 10:18:43 -06:00
parent 7356e48485
commit adcd1d2847
65 changed files with 239 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/server/0165-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -338,10 +338,10 @@ index c03ebbc933197be3e7097ea3f7b7cd08c90db7bb..37c1d1ac1bfcaf84d00135ad3c9d9e9b
} else if (this.c > 0) {
--this.c;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6fea28d033 100644
index cd2a585afc338f92e717613f956d8c49192d93fd..8df2d112f3d030754309710f7c05bf2612ea0528 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -234,6 +234,7 @@ public class PurpurWorldConfig {
@@ -240,6 +240,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean entitiesCanUsePortals = true;
@@ -349,7 +349,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
@@ -248,6 +249,7 @@ public class PurpurWorldConfig {
@@ -254,6 +255,7 @@ public class PurpurWorldConfig {
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals);
@@ -357,7 +357,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames);
persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames);
@@ -388,9 +390,11 @@ public class PurpurWorldConfig {
@@ -394,9 +396,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -369,7 +369,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -449,10 +453,12 @@ public class PurpurWorldConfig {
@@ -455,10 +459,12 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -382,7 +382,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs);
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
@@ -725,6 +731,7 @@ public class PurpurWorldConfig {
@@ -731,6 +737,7 @@ public class PurpurWorldConfig {
public double enderDragonMaxY = 256D;
public boolean enderDragonAlwaysDropsEggBlock = false;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -390,7 +390,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
public double enderDragonMaxHealth = 200.0D;
private void enderDragonSettings() {
enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable);
@@ -732,6 +739,7 @@ public class PurpurWorldConfig {
@@ -738,6 +745,7 @@ public class PurpurWorldConfig {
enderDragonMaxY = getDouble("mobs.ender_dragon.ridable-max-y", enderDragonMaxY);
enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender_dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp);
@@ -398,7 +398,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth);
set("mobs.ender_dragon.max-health", null);
@@ -747,12 +755,14 @@ public class PurpurWorldConfig {
@@ -753,12 +761,14 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public boolean endermanAllowGriefing = true;
@@ -413,7 +413,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.enderman.attributes.max-health", endermanMaxHealth);
@@ -778,10 +788,12 @@ public class PurpurWorldConfig {
@@ -784,10 +794,12 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
@@ -426,7 +426,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.evoker.attributes.max-health", evokerMaxHealth);
set("mobs.evoker.attributes.max-health", null);
@@ -792,12 +804,14 @@ public class PurpurWorldConfig {
@@ -798,12 +810,14 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
@@ -441,7 +441,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
if (PurpurConfig.version < 10) {
@@ -1232,10 +1246,12 @@ public class PurpurWorldConfig {
@@ -1238,10 +1252,12 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
@@ -454,7 +454,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.pillager.attributes.max-health", pillagerMaxHealth);
set("mobs.pillager.attributes.max-health", null);
@@ -1279,6 +1295,7 @@ public class PurpurWorldConfig {
@@ -1285,6 +1301,7 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
@@ -462,7 +462,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -1286,6 +1303,7 @@ public class PurpurWorldConfig {
@@ -1292,6 +1309,7 @@ public class PurpurWorldConfig {
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -470,7 +470,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
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);
@@ -1299,10 +1317,12 @@ public class PurpurWorldConfig {
@@ -1305,10 +1323,12 @@ public class PurpurWorldConfig {
public boolean ravagerRidable = false;
public boolean ravagerRidableInWater = false;
@@ -483,7 +483,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.ravager.attributes.max-health", ravagerMaxHealth);
set("mobs.ravager.attributes.max-health", null);
@@ -1326,11 +1346,13 @@ public class PurpurWorldConfig {
@@ -1332,11 +1352,13 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public int sheepBreedingTicks = 6000;
@@ -497,7 +497,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.sheep.attributes.max-health", sheepMaxHealth);
set("mobs.sheep.attributes.max-health", null);
@@ -1355,10 +1377,12 @@ public class PurpurWorldConfig {
@@ -1361,10 +1383,12 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
@@ -510,7 +510,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.silverfish.attributes.max-health", silverfishMaxHealth);
set("mobs.silverfish.attributes.max-health", null);
@@ -1423,6 +1447,7 @@ public class PurpurWorldConfig {
@@ -1429,6 +1453,7 @@ public class PurpurWorldConfig {
public boolean snowGolemRidable = false;
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
@@ -518,7 +518,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemPutPumpkinBack = false;
public int snowGolemSnowBallMin = 20;
@@ -1434,6 +1459,7 @@ public class PurpurWorldConfig {
@@ -1440,6 +1465,7 @@ public class PurpurWorldConfig {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
snowGolemLeaveTrailWhenRidden = getBoolean("mobs.snow_golem.leave-trail-when-ridden", snowGolemLeaveTrailWhenRidden);
@@ -526,7 +526,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin);
snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack);
snowGolemSnowBallMin = getInt("mobs.snow_golem.min-shoot-interval-ticks", snowGolemSnowBallMin);
@@ -1650,6 +1676,7 @@ public class PurpurWorldConfig {
@@ -1656,6 +1682,7 @@ public class PurpurWorldConfig {
public boolean witherRidable = false;
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
@@ -534,7 +534,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public double witherMaxHealth = 300.0D;
@@ -1657,6 +1684,7 @@ public class PurpurWorldConfig {
@@ -1663,6 +1690,7 @@ public class PurpurWorldConfig {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
witherMaxY = getDouble("mobs.wither.ridable-max-y", witherMaxY);
@@ -542,7 +542,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
@@ -1729,6 +1757,7 @@ public class PurpurWorldConfig {
@@ -1735,6 +1763,7 @@ public class PurpurWorldConfig {
public boolean zombieRidable = false;
public boolean zombieRidableInWater = false;
@@ -550,7 +550,7 @@ index dfac03988f3f6bc12f4d48941b3bcde1f2819593..c1ece0add6f186a6aa8b462d47e05a6f
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -1739,6 +1768,7 @@ public class PurpurWorldConfig {
@@ -1745,6 +1774,7 @@ public class PurpurWorldConfig {
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);