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

Rebase on latest Purpur (#230)

Browse Source
This commit is contained in:
Encode42
2021-03-24 20:26:18 -04:00
committed by GitHub
parent 754948e524
commit b6235af624
94 changed files with 261 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1402,10 +1402,10 @@ index 90cbef7fe8803295f82bddd6709fdf303aedcaba..b84916c0c58fd208ef5547299f8db846
@Nullable
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3fb7d20ccc 100644
index 6f1ea7f760bd3a4ab6ba0787776b4017f9e6d52e..894c0e86dbbd7bcbdbd7af48cd50d38d4507787f 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -484,30 +484,58 @@ public class PurpurWorldConfig {
@@ -496,30 +496,58 @@ public class PurpurWorldConfig {
public boolean batRidable = false;
public boolean batRidableInWater = false;
public double batMaxY = 256D;
@@ -1464,7 +1464,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean catRidable = false;
@@ -516,6 +544,7 @@ public class PurpurWorldConfig {
@@ -528,6 +556,7 @@ public class PurpurWorldConfig {
public int catSpawnSwampHutScanRange = 16;
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
@@ -1472,7 +1472,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -523,51 +552,92 @@ public class PurpurWorldConfig {
@@ -535,51 +564,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);
@@ -1565,7 +1565,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean dolphinRidable = false;
@@ -575,19 +645,45 @@ public class PurpurWorldConfig {
@@ -587,19 +657,45 @@ public class PurpurWorldConfig {
public float dolphinSpitSpeed = 1.0F;
public float dolphinSpitDamage = 2.0F;
public boolean dolphinDisableTreasureSearching = false;
@@ -1611,7 +1611,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean drownedRidable = false;
@@ -595,73 +691,135 @@ public class PurpurWorldConfig {
@@ -607,73 +703,135 @@ public class PurpurWorldConfig {
public boolean drownedJockeyOnlyBaby = true;
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
@@ -1747,7 +1747,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean giantRidable = false;
@@ -684,31 +842,68 @@ public class PurpurWorldConfig {
@@ -696,31 +854,68 @@ public class PurpurWorldConfig {
giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.giant.max-health", giantMaxHealth);
@@ -1818,7 +1818,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean huskRidable = false;
@@ -716,12 +911,21 @@ public class PurpurWorldConfig {
@@ -728,12 +923,21 @@ public class PurpurWorldConfig {
public boolean huskJockeyOnlyBaby = true;
public double huskJockeyChance = 0.05D;
public boolean huskJockeyTryExistingChickens = true;
@@ -1840,7 +1840,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean illusionerRidable = false;
@@ -736,85 +940,188 @@ public class PurpurWorldConfig {
@@ -748,85 +952,188 @@ public class PurpurWorldConfig {
illusionerFollowRange = getDouble("mobs.illusioner.follow-range", illusionerFollowRange);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.illusioner.max-health", illusionerMaxHealth);
@@ -2031,7 +2031,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean phantomRidable = false;
@@ -841,6 +1148,7 @@ public class PurpurWorldConfig {
@@ -853,6 +1160,7 @@ public class PurpurWorldConfig {
public boolean phantomIgnorePlayersWithTorch = false;
public boolean phantomBurnInDaylight = true;
public boolean phantomAllowGriefing = false;
@@ -2039,7 +2039,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void phantomSettings() {
phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable);
phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater);
@@ -866,38 +1174,72 @@ public class PurpurWorldConfig {
@@ -878,38 +1186,72 @@ public class PurpurWorldConfig {
phantomBurnInDaylight = getBoolean("mobs.phantom.burn-in-daylight", phantomBurnInDaylight);
phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch);
phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing);
@@ -2112,7 +2112,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean polarBearRidable = false;
@@ -905,6 +1247,7 @@ public class PurpurWorldConfig {
@@ -917,6 +1259,7 @@ public class PurpurWorldConfig {
public String polarBearBreedableItemString = "";
public Item polarBearBreedableItem = null;
public int polarBearBreedingTicks = 6000;
@@ -2120,7 +2120,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void polarBearSettings() {
polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable);
polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater);
@@ -912,11 +1255,24 @@ public class PurpurWorldConfig {
@@ -924,11 +1267,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);
@@ -2145,7 +2145,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean rabbitRidable = false;
@@ -924,68 +1280,142 @@ public class PurpurWorldConfig {
@@ -936,68 +1292,142 @@ public class PurpurWorldConfig {
public double rabbitNaturalToast = 0.0D;
public double rabbitNaturalKiller = 0.0D;
public int rabbitBreedingTicks = 6000;
@@ -2288,7 +2288,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean snowGolemRidable = false;
@@ -997,6 +1427,7 @@ public class PurpurWorldConfig {
@@ -1009,6 +1439,7 @@ public class PurpurWorldConfig {
public int snowGolemSnowBallMax = 20;
public float snowGolemSnowBallModifier = 10.0F;
public double snowGolemAttackDistance = 1.25D;
@@ -2296,7 +2296,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void snowGolemSettings() {
snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable);
snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater);
@@ -1007,63 +1438,118 @@ public class PurpurWorldConfig {
@@ -1019,63 +1450,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);
@@ -2415,7 +2415,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean villagerRidable = false;
@@ -1081,6 +1567,7 @@ public class PurpurWorldConfig {
@@ -1093,6 +1579,7 @@ public class PurpurWorldConfig {
public int villagerLobotomizeCheck = 60;
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
@@ -2423,7 +2423,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1102,33 +1589,60 @@ public class PurpurWorldConfig {
@@ -1114,33 +1601,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);
@@ -2484,7 +2484,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean witherRidable = false;
@@ -1145,19 +1659,30 @@ public class PurpurWorldConfig {
@@ -1157,19 +1671,30 @@ public class PurpurWorldConfig {
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
if (PurpurConfig.version < 8) {
double oldValue = getDouble("mobs.wither.max-health", witherMaxHealth);
@@ -2517,7 +2517,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean wolfRidable = false;
@@ -1166,6 +1691,7 @@ public class PurpurWorldConfig {
@@ -1178,6 +1703,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2525,7 +2525,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1177,13 +1703,26 @@ public class PurpurWorldConfig {
@@ -1189,13 +1715,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);
@@ -2552,7 +2552,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean zombieRidable = false;
@@ -1193,6 +1732,8 @@ public class PurpurWorldConfig {
@@ -1205,6 +1744,8 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public EnumDifficulty zombieBreakDoorMinDifficulty = EnumDifficulty.HARD;
@@ -2561,7 +2561,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1205,15 +1746,40 @@ public class PurpurWorldConfig {
@@ -1217,15 +1758,40 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
zombieBreakDoorMinDifficulty = EnumDifficulty.HARD;
}
@@ -2602,7 +2602,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean zombifiedPiglinRidable = false;
@@ -1222,6 +1788,8 @@ public class PurpurWorldConfig {
@@ -1234,6 +1800,8 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2611,7 +2611,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1229,6 +1797,13 @@ public class PurpurWorldConfig {
@@ -1241,6 +1809,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);
@@ -2625,7 +2625,7 @@ index 5c5aa1ab859c836945294cfdb06589639006a307..d0473f64fbb743f12eb7c98a59231b3f
}
public boolean zombieVillagerRidable = false;
@@ -1236,11 +1811,20 @@ public class PurpurWorldConfig {
@@ -1248,11 +1823,20 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;