Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +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

52
patches/server/0155-Configurable-entity-base-attributes.patch
View File

@@ -1314,10 +1314,10 @@ index 0c47477b416980d2e932321730525bf5a8feda4f..dc850677c29c16805f28af00b2a63363
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e11324417e8f3 100644
index 2d177f9583798d56fae2d08ad2b4805a91585698..555121ff9f3b6b666a5e1396d04870d6d725df75 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -472,30 +472,58 @@ public class PurpurWorldConfig {
@@ -484,30 +484,58 @@ public class PurpurWorldConfig {
public boolean batRidable = false;
public boolean batRidableInWater = false;
public double batMaxY = 256D;
@@ -1376,7 +1376,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean catRidable = false;
@@ -504,6 +532,7 @@ public class PurpurWorldConfig {
@@ -516,6 +544,7 @@ public class PurpurWorldConfig {
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -1384,7 +1384,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -511,51 +540,92 @@ public class PurpurWorldConfig {
@@ -523,51 +552,92 @@ public class PurpurWorldConfig {
catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange);
catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange);
catBreedingTicks = getInt("mobs.cat.breeding-delay-ticks", catBreedingTicks);
@@ -1477,7 +1477,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean dolphinRidable = false;
@@ -563,19 +633,45 @@ public class PurpurWorldConfig {
@@ -575,19 +645,45 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public boolean dolphinDisableTreasureSearching = false;
@@ -1523,7 +1523,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean drownedRidable = false;
@@ -583,73 +679,135 @@ public class PurpurWorldConfig {
@@ -595,73 +691,135 @@ public class PurpurWorldConfig {
public boolean drownedJockeyOnlyBaby = true;
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
@@ -1659,7 +1659,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean giantRidable = false;
@@ -672,31 +830,68 @@ public class PurpurWorldConfig {
@@ -684,31 +842,68 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.giant.max-health", giantMaxHealth);
@@ -1730,7 +1730,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean huskRidable = false;
@@ -704,12 +899,21 @@ public class PurpurWorldConfig {
@@ -716,12 +911,21 @@ public class PurpurWorldConfig {
public boolean huskJockeyOnlyBaby = true;
public double huskJockeyChance = 0.05D;
public boolean huskJockeyTryExistingChickens = true;
@@ -1752,7 +1752,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean illusionerRidable = false;
@@ -724,85 +928,188 @@ public class PurpurWorldConfig {
@@ -736,85 +940,188 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.illusioner.max-health", illusionerMaxHealth);
@@ -1943,7 +1943,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean phantomRidable = false;
@@ -828,6 +1135,7 @@ public class PurpurWorldConfig {
@@ -840,6 +1147,7 @@ public class PurpurWorldConfig {
public int phantomBurnInLight = 0;
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
@@ -1951,7 +1951,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -852,38 +1160,72 @@ public class PurpurWorldConfig {
@@ -864,38 +1172,72 @@ public class PurpurWorldConfig {
phantomBurnInLight = getInt("mobs.phantom.burn-in-light", phantomBurnInLight);
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
@@ -2024,7 +2024,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean polarBearRidable = false;
@@ -891,6 +1233,7 @@ public class PurpurWorldConfig {
@@ -903,6 +1245,7 @@ public class PurpurWorldConfig {
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
@@ -2032,7 +2032,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -898,11 +1241,24 @@ public class PurpurWorldConfig {
@@ -910,11 +1253,24 @@ public class PurpurWorldConfig {
Item item = IRegistry.ITEM.get(new MinecraftKey(polarBearBreedableItemString));
if (item != Items.AIR) polarBearBreedableItem = item;
polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks);
@@ -2057,7 +2057,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean rabbitRidable = false;
@@ -910,68 +1266,142 @@ public class PurpurWorldConfig {
@@ -922,68 +1278,142 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -2200,7 +2200,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean snowGolemRidable = false;
@@ -983,6 +1413,7 @@ public class PurpurWorldConfig {
@@ -995,6 +1425,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -2208,7 +2208,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -993,63 +1424,118 @@ public class PurpurWorldConfig {
@@ -1005,63 +1436,118 @@ 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);
@@ -2327,7 +2327,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean villagerRidable = false;
@@ -1066,6 +1552,7 @@ public class PurpurWorldConfig {
@@ -1078,6 +1564,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -2335,7 +2335,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1086,33 +1573,60 @@ public class PurpurWorldConfig {
@@ -1098,33 +1585,60 @@ 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);
@@ -2396,7 +2396,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean witherRidable = false;
@@ -1129,19 +1643,30 @@ public class PurpurWorldConfig {
@@ -1141,19 +1655,30 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.wither.max-health", witherMaxHealth);
@@ -2429,7 +2429,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean wolfRidable = false;
@@ -1150,6 +1675,7 @@ public class PurpurWorldConfig {
@@ -1162,6 +1687,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2437,7 +2437,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1161,13 +1687,26 @@ public class PurpurWorldConfig {
@@ -1173,13 +1699,26 @@ public class PurpurWorldConfig {
wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies);
wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid);
wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks);
@@ -2464,7 +2464,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean zombieRidable = false;
@@ -1177,6 +1716,8 @@ public class PurpurWorldConfig {
@@ -1189,6 +1728,8 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public EnumDifficulty zombieBreakDoorMinDifficulty = EnumDifficulty.HARD;
@@ -2473,7 +2473,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1189,15 +1730,40 @@ public class PurpurWorldConfig {
@@ -1201,15 +1742,40 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = EnumDifficulty.HARD;
}
@@ -2514,7 +2514,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean zombifiedPiglinRidable = false;
@@ -1206,6 +1772,8 @@ public class PurpurWorldConfig {
@@ -1218,6 +1784,8 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2523,7 +2523,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1213,6 +1781,13 @@ public class PurpurWorldConfig {
@@ -1225,6 +1793,13 @@ public class PurpurWorldConfig {
zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance);
zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens);
zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry);
@@ -2537,7 +2537,7 @@ index 7850a2e674d9c016c02ea5bbf41aaf998a21cbb5..983210d8ee7a89c5d2d7abdf4a6e1132
}
public boolean zombieVillagerRidable = false;
@@ -1220,11 +1795,20 @@ public class PurpurWorldConfig {
@@ -1232,11 +1807,20 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;