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

Add '*' as an option to item immunities

Browse Source
This commit is contained in:
BillyGalbreath
2021-01-25 12:39:40 -06:00
parent df9bd08c65
commit 7b0b3f74e1
64 changed files with 213 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patches/server/0164-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 fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d06943ce81 100644
index abea37ca263b718f08ad3dd1f931acfb366962b8..6a63ea0dbc48c69ebb12bb19e2e832e78fea2726 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -240,6 +240,7 @@ public class PurpurWorldConfig {
@@ -252,6 +252,7 @@ public class PurpurWorldConfig {
public boolean disableDropsOnCrammingDeath = false;
public boolean entitiesPickUpLootBypassMobGriefing = false;
public boolean entitiesCanUsePortals = true;
@@ -349,7 +349,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public boolean milkCuresBadOmen = true;
public boolean persistentTileEntityDisplayNames = false;
public boolean persistentDroppableEntityDisplayNames = false;
@@ -254,6 +255,7 @@ public class PurpurWorldConfig {
@@ -266,6 +267,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 fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -394,9 +396,11 @@ public class PurpurWorldConfig {
@@ -406,9 +408,11 @@ public class PurpurWorldConfig {
dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
}
@@ -369,7 +369,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow);
farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha);
}
@@ -455,10 +459,12 @@ public class PurpurWorldConfig {
@@ -467,10 +471,12 @@ public class PurpurWorldConfig {
stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage);
}
@@ -382,7 +382,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -730,12 +736,14 @@ public class PurpurWorldConfig {
@@ -742,12 +748,14 @@ public class PurpurWorldConfig {
public boolean enderDragonRidableInWater = false;
public double enderDragonMaxY = 256D;
public boolean enderDragonAlwaysDropsFullExp = false;
@@ -397,7 +397,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.ender_dragon.max-health", enderDragonMaxHealth);
set("mobs.ender_dragon.max-health", null);
@@ -751,12 +759,14 @@ public class PurpurWorldConfig {
@@ -763,12 +771,14 @@ public class PurpurWorldConfig {
public boolean endermanRidable = false;
public boolean endermanRidableInWater = false;
public boolean endermanAllowGriefing = true;
@@ -412,7 +412,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock);
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.enderman.attributes.max-health", endermanMaxHealth);
@@ -782,10 +792,12 @@ public class PurpurWorldConfig {
@@ -794,10 +804,12 @@ public class PurpurWorldConfig {
public boolean evokerRidable = false;
public boolean evokerRidableInWater = false;
@@ -425,7 +425,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.evoker.attributes.max-health", evokerMaxHealth);
set("mobs.evoker.attributes.max-health", null);
@@ -796,12 +808,14 @@ public class PurpurWorldConfig {
@@ -808,12 +820,14 @@ public class PurpurWorldConfig {
public boolean foxRidable = false;
public boolean foxRidableInWater = false;
@@ -440,7 +440,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips);
foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks);
if (PurpurConfig.version < 10) {
@@ -1236,10 +1250,12 @@ public class PurpurWorldConfig {
@@ -1248,10 +1262,12 @@ public class PurpurWorldConfig {
public boolean pillagerRidable = false;
public boolean pillagerRidableInWater = false;
@@ -453,7 +453,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.pillager.attributes.max-health", pillagerMaxHealth);
set("mobs.pillager.attributes.max-health", null);
@@ -1283,6 +1299,7 @@ public class PurpurWorldConfig {
@@ -1295,6 +1311,7 @@ public class PurpurWorldConfig {
public boolean rabbitRidable = false;
public boolean rabbitRidableInWater = false;
@@ -461,7 +461,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -1290,6 +1307,7 @@ public class PurpurWorldConfig {
@@ -1302,6 +1319,7 @@ public class PurpurWorldConfig {
private void rabbitSettings() {
rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable);
rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater);
@@ -469,7 +469,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -1303,10 +1321,12 @@ public class PurpurWorldConfig {
@@ -1315,10 +1333,12 @@ public class PurpurWorldConfig {
public boolean ravagerRidable = false;
public boolean ravagerRidableInWater = false;
@@ -482,7 +482,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.ravager.attributes.max-health", ravagerMaxHealth);
set("mobs.ravager.attributes.max-health", null);
@@ -1330,11 +1350,13 @@ public class PurpurWorldConfig {
@@ -1342,11 +1362,13 @@ public class PurpurWorldConfig {
public boolean sheepRidable = false;
public boolean sheepRidableInWater = false;
public int sheepBreedingTicks = 6000;
@@ -496,7 +496,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.sheep.attributes.max-health", sheepMaxHealth);
set("mobs.sheep.attributes.max-health", null);
@@ -1359,10 +1381,12 @@ public class PurpurWorldConfig {
@@ -1371,10 +1393,12 @@ public class PurpurWorldConfig {
public boolean silverfishRidable = false;
public boolean silverfishRidableInWater = false;
@@ -509,7 +509,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
if (PurpurConfig.version < 10) {
double oldValue = getDouble("mobs.silverfish.attributes.max-health", silverfishMaxHealth);
set("mobs.silverfish.attributes.max-health", null);
@@ -1427,6 +1451,7 @@ public class PurpurWorldConfig {
@@ -1439,6 +1463,7 @@ public class PurpurWorldConfig {
public boolean snowGolemRidable = false;
public boolean snowGolemRidableInWater = false;
public boolean snowGolemLeaveTrailWhenRidden = false;
@@ -517,7 +517,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public boolean snowGolemDropsPumpkin = false;
public boolean snowGolemPutPumpkinBack = false;
public int snowGolemSnowBallMin = 20;
@@ -1438,6 +1463,7 @@ public class PurpurWorldConfig {
@@ -1450,6 +1475,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);
@@ -525,7 +525,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
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);
@@ -1654,6 +1680,7 @@ public class PurpurWorldConfig {
@@ -1666,6 +1692,7 @@ public class PurpurWorldConfig {
public boolean witherRidable = false;
public boolean witherRidableInWater = false;
public double witherMaxY = 256D;
@@ -533,7 +533,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public double witherMaxHealth = 300.0D;
@@ -1661,6 +1688,7 @@ public class PurpurWorldConfig {
@@ -1673,6 +1700,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);
@@ -541,7 +541,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
@@ -1733,6 +1761,7 @@ public class PurpurWorldConfig {
@@ -1745,6 +1773,7 @@ public class PurpurWorldConfig {
public boolean zombieRidable = false;
public boolean zombieRidableInWater = false;
@@ -549,7 +549,7 @@ index fc83177160b4c598e5e4101f4ffce33ce1c34e5f..338073e3fe84c3b8fbf2b3d4d69ae0d0
public boolean zombieJockeyOnlyBaby = true;
public double zombieJockeyChance = 0.05D;
public boolean zombieJockeyTryExistingChickens = true;
@@ -1743,6 +1772,7 @@ public class PurpurWorldConfig {
@@ -1755,6 +1784,7 @@ public class PurpurWorldConfig {
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);