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

fix compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-12-05 18:18:14 -05:00
parent 7fe89b5a84
commit 0ae1daa043
12 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -1174,7 +1174,7 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff96e77afac 100644
index bf1ea467a0be5a0c231413b91d6a644205816141..0bcba16d116d307d329ddbcf6d8948774cf16959 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -543,6 +543,7 @@ public class PurpurWorldConfig {
@@ -2064,8 +2064,8 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
+ tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater);
}
public boolean turtleRidable = false;
@@ -1656,6 +1774,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBypassMobGriefing = false;
@@ -1661,6 +1779,7 @@ public class PurpurWorldConfig {
public boolean turtleEggsBreakFromItems = true;
public boolean turtleEggsBreakFromMinecarts = true;
public int turtleBreedingTicks = 6000;
@@ -2073,7 +2073,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void turtleEggSettings() {
turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable);
turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater);
@@ -1669,12 +1788,14 @@ public class PurpurWorldConfig {
@@ -1674,12 +1793,14 @@ public class PurpurWorldConfig {
turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems);
turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts);
turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks);
@@ -2088,7 +2088,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void vexSettings() {
vexRidable = getBoolean("mobs.vex.ridable", vexRidable);
vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater);
@@ -1685,6 +1806,7 @@ public class PurpurWorldConfig {
@@ -1690,6 +1811,7 @@ public class PurpurWorldConfig {
set("mobs.vex.attributes.max_health", oldValue);
}
vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth);
@@ -2096,7 +2096,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean villagerRidable = false;
@@ -1701,6 +1823,7 @@ public class PurpurWorldConfig {
@@ -1706,6 +1828,7 @@ public class PurpurWorldConfig {
public boolean villagerClericsFarmWarts = false;
public boolean villagerClericFarmersThrowWarts = true;
public boolean villagerBypassMobGriefing = false;
@@ -2104,7 +2104,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void villagerSettings() {
villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable);
villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater);
@@ -1721,12 +1844,14 @@ public class PurpurWorldConfig {
@@ -1726,12 +1849,14 @@ public class PurpurWorldConfig {
villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts);
villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts);
villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing);
@@ -2119,7 +2119,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void vindicatorSettings() {
vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable);
vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater);
@@ -1737,6 +1862,7 @@ public class PurpurWorldConfig {
@@ -1742,6 +1867,7 @@ public class PurpurWorldConfig {
}
vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth);
vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance);
@@ -2127,7 +2127,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean wanderingTraderRidable = false;
@@ -1744,6 +1870,7 @@ public class PurpurWorldConfig {
@@ -1749,6 +1875,7 @@ public class PurpurWorldConfig {
public double wanderingTraderMaxHealth = 20.0D;
public boolean wanderingTraderFollowEmeraldBlock = false;
public boolean wanderingTraderCanBeLeashed = false;
@@ -2135,7 +2135,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void wanderingTraderSettings() {
wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable);
wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater);
@@ -1755,11 +1882,13 @@ public class PurpurWorldConfig {
@@ -1760,11 +1887,13 @@ public class PurpurWorldConfig {
wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth);
wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock);
wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed);
@@ -2149,7 +2149,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void witchSettings() {
witchRidable = getBoolean("mobs.witch.ridable", witchRidable);
witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater);
@@ -1769,6 +1898,7 @@ public class PurpurWorldConfig {
@@ -1774,6 +1903,7 @@ public class PurpurWorldConfig {
set("mobs.witch.attributes.max_health", oldValue);
}
witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth);
@@ -2157,7 +2157,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean witherRidable = false;
@@ -1778,6 +1908,7 @@ public class PurpurWorldConfig {
@@ -1783,6 +1913,7 @@ public class PurpurWorldConfig {
public float witherHealthRegenAmount = 1.0f;
public int witherHealthRegenDelay = 20;
public boolean witherBypassMobGriefing = false;
@@ -2165,7 +2165,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void witherSettings() {
witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
@@ -1795,11 +1926,13 @@ public class PurpurWorldConfig {
@@ -1800,11 +1931,13 @@ public class PurpurWorldConfig {
witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount);
witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay);
witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing);
@@ -2179,7 +2179,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void witherSkeletonSettings() {
witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable);
witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater);
@@ -1809,6 +1942,7 @@ public class PurpurWorldConfig {
@@ -1814,6 +1947,7 @@ public class PurpurWorldConfig {
set("mobs.wither_skeleton.attributes.max_health", oldValue);
}
witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth);
@@ -2187,7 +2187,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean wolfRidable = false;
@@ -1818,6 +1952,7 @@ public class PurpurWorldConfig {
@@ -1823,6 +1957,7 @@ public class PurpurWorldConfig {
public boolean wolfMilkCuresRabies = true;
public double wolfNaturalRabid = 0.0D;
public int wolfBreedingTicks = 6000;
@@ -2195,7 +2195,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void wolfSettings() {
wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable);
wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater);
@@ -1835,11 +1970,13 @@ public class PurpurWorldConfig {
@@ -1840,11 +1975,13 @@ 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);
@@ -2209,7 +2209,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void zoglinSettings() {
zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable);
zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater);
@@ -1849,6 +1986,7 @@ public class PurpurWorldConfig {
@@ -1854,6 +1991,7 @@ public class PurpurWorldConfig {
set("mobs.zoglin.attributes.max_health", oldValue);
}
zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth);
@@ -2217,7 +2217,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean zombieRidable = false;
@@ -1860,6 +1998,7 @@ public class PurpurWorldConfig {
@@ -1865,6 +2003,7 @@ public class PurpurWorldConfig {
public boolean zombieJockeyTryExistingChickens = true;
public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
public boolean zombieBypassMobGriefing = false;
@@ -2225,7 +2225,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void zombieSettings() {
zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
@@ -1875,6 +2014,7 @@ public class PurpurWorldConfig {
@@ -1880,6 +2019,7 @@ public class PurpurWorldConfig {
zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);
zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging);
zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing);
@@ -2233,7 +2233,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean zombieHorseRidableInWater = false;
@@ -1886,6 +2026,7 @@ public class PurpurWorldConfig {
@@ -1891,6 +2031,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
@@ -2241,7 +2241,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -1902,6 +2043,7 @@ public class PurpurWorldConfig {
@@ -1907,6 +2048,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin);
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
@@ -2249,7 +2249,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean zombieVillagerRidable = false;
@@ -1911,6 +2053,7 @@ public class PurpurWorldConfig {
@@ -1916,6 +2058,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;
@@ -2257,7 +2257,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void zombieVillagerSettings() {
zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable);
zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater);
@@ -1924,6 +2067,7 @@ public class PurpurWorldConfig {
@@ -1929,6 +2072,7 @@ public class PurpurWorldConfig {
zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby);
zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance);
zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens);
@@ -2265,7 +2265,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
}
public boolean zombifiedPiglinRidable = false;
@@ -1934,6 +2078,7 @@ public class PurpurWorldConfig {
@@ -1939,6 +2083,7 @@ public class PurpurWorldConfig {
public double zombifiedPiglinJockeyChance = 0.05D;
public boolean zombifiedPiglinJockeyTryExistingChickens = true;
public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true;
@@ -2273,7 +2273,7 @@ index 1f53d91397fdd6903fe0b9e2d7805c4a08c3f27d..7937bad1b6e9c62f23bcdccc11824ff9
private void zombifiedPiglinSettings() {
zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable);
zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater);
@@ -1948,5 +2093,6 @@ public class PurpurWorldConfig {
@@ -1953,5 +2098,6 @@ 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);