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

missed a couple

Browse Source
This commit is contained in:
Ben Kerllenevich
2023-06-09 00:11:59 -04:00
parent 8768f54932
commit d20403a6d0
25 changed files with 207 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/server/0126-Toggle-for-water-sensitive-mob-damage.patch
View File

@@ -1197,7 +1197,7 @@ index 41ddf073ecb8ea97cca8021390500d65866488a5..e2a9179bb7a5ecbc31d98a2410a09f5e
protected void registerGoals() {
this.goalSelector.addGoal(0, new FloatGoal(this));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c7225378527c 100644
index 64b28e4a4baf3db33c03e674dc4cb6ffa5a7238f..1445199626a1bec0a90349b6a5e1773e7bf35a14 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -569,11 +569,13 @@ public class PurpurWorldConfig {
@@ -1261,8 +1261,8 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
+ blazeTakeDamageFromWater = getBoolean("mobs.blaze.takes-damage-from-water", blazeTakeDamageFromWater);
}
public boolean catRidable = false;
@@ -655,6 +663,7 @@ public class PurpurWorldConfig {
public double camelMaxHealthMin = 32.0D;
@@ -672,6 +680,7 @@ public class PurpurWorldConfig {
public int catSpawnVillageScanRange = 48;
public int catBreedingTicks = 6000;
public DyeColor catDefaultCollarColor = DyeColor.RED;
@@ -1270,7 +1270,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -674,12 +683,14 @@ public class PurpurWorldConfig {
@@ -691,12 +700,14 @@ public class PurpurWorldConfig {
} catch (IllegalArgumentException ignore) {
catDefaultCollarColor = DyeColor.RED;
}
@@ -1285,7 +1285,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void caveSpiderSettings() {
caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable);
caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater);
@@ -690,6 +701,7 @@ public class PurpurWorldConfig {
@@ -707,6 +718,7 @@ public class PurpurWorldConfig {
set("mobs.cave_spider.attributes.max_health", oldValue);
}
caveSpiderMaxHealth = getDouble("mobs.cave_spider.attributes.max_health", caveSpiderMaxHealth);
@@ -1293,7 +1293,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean chickenRidable = false;
@@ -698,6 +710,7 @@ public class PurpurWorldConfig {
@@ -715,6 +727,7 @@ public class PurpurWorldConfig {
public double chickenMaxHealth = 4.0D;
public boolean chickenRetaliate = false;
public int chickenBreedingTicks = 6000;
@@ -1301,7 +1301,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -710,11 +723,13 @@ public class PurpurWorldConfig {
@@ -727,11 +740,13 @@ public class PurpurWorldConfig {
chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth);
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
chickenBreedingTicks = getInt("mobs.chicken.breeding-delay-ticks", chickenBreedingTicks);
@@ -1315,7 +1315,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void codSettings() {
codRidable = getBoolean("mobs.cod.ridable", codRidable);
codControllable = getBoolean("mobs.cod.controllable", codControllable);
@@ -724,6 +739,7 @@ public class PurpurWorldConfig {
@@ -741,6 +756,7 @@ public class PurpurWorldConfig {
set("mobs.cod.attributes.max_health", oldValue);
}
codMaxHealth = getDouble("mobs.cod.attributes.max_health", codMaxHealth);
@@ -1323,7 +1323,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean cowRidable = false;
@@ -732,6 +748,7 @@ public class PurpurWorldConfig {
@@ -749,6 +765,7 @@ public class PurpurWorldConfig {
public double cowMaxHealth = 10.0D;
public int cowFeedMushrooms = 0;
public int cowBreedingTicks = 6000;
@@ -1331,7 +1331,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -744,6 +761,7 @@ public class PurpurWorldConfig {
@@ -761,6 +778,7 @@ public class PurpurWorldConfig {
cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth);
cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms);
cowBreedingTicks = getInt("mobs.cow.breeding-delay-ticks", cowBreedingTicks);
@@ -1339,7 +1339,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean creeperRidable = false;
@@ -753,6 +771,7 @@ public class PurpurWorldConfig {
@@ -770,6 +788,7 @@ public class PurpurWorldConfig {
public double creeperChargedChance = 0.0D;
public boolean creeperAllowGriefing = true;
public boolean creeperBypassMobGriefing = false;
@@ -1347,7 +1347,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -766,6 +785,7 @@ public class PurpurWorldConfig {
@@ -783,6 +802,7 @@ public class PurpurWorldConfig {
creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance);
creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing);
creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing);
@@ -1355,7 +1355,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean dolphinRidable = false;
@@ -775,6 +795,7 @@ public class PurpurWorldConfig {
@@ -792,6 +812,7 @@ public class PurpurWorldConfig {
public float dolphinSpitDamage = 2.0F;
public double dolphinMaxHealth = 10.0D;
public boolean dolphinDisableTreasureSearching = false;
@@ -1363,7 +1363,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -788,6 +809,7 @@ public class PurpurWorldConfig {
@@ -805,6 +826,7 @@ public class PurpurWorldConfig {
}
dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth);
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
@@ -1371,7 +1371,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean donkeyRidableInWater = false;
@@ -798,6 +820,7 @@ public class PurpurWorldConfig {
@@ -815,6 +837,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMin = 0.175D;
public double donkeyMovementSpeedMax = 0.175D;
public int donkeyBreedingTicks = 6000;
@@ -1379,7 +1379,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -814,6 +837,7 @@ public class PurpurWorldConfig {
@@ -831,6 +854,7 @@ public class PurpurWorldConfig {
donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin);
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
donkeyBreedingTicks = getInt("mobs.donkey.breeding-delay-ticks", donkeyBreedingTicks);
@@ -1387,7 +1387,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean drownedRidable = false;
@@ -824,6 +848,7 @@ public class PurpurWorldConfig {
@@ -841,6 +865,7 @@ public class PurpurWorldConfig {
public boolean drownedJockeyOnlyBaby = true;
public double drownedJockeyChance = 0.05D;
public boolean drownedJockeyTryExistingChickens = true;
@@ -1395,15 +1395,13 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -838,6 +863,7 @@ public class PurpurWorldConfig {
@@ -855,11 +880,13 @@ public class PurpurWorldConfig {
drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby);
drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance);
drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
+ drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
}
public double camelMaxHealthMin = 32.0D;
@@ -860,6 +886,7 @@ public class PurpurWorldConfig {
public boolean elderGuardianRidable = false;
public boolean elderGuardianControllable = true;
public double elderGuardianMaxHealth = 80.0D;
@@ -2295,7 +2293,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean zombieHorseRidableInWater = false;
@@ -2097,6 +2237,7 @@ public class PurpurWorldConfig {
@@ -2095,6 +2235,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMin = 0.2D;
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
@@ -2303,7 +2301,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2115,6 +2256,7 @@ public class PurpurWorldConfig {
@@ -2111,6 +2252,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);
@@ -2311,7 +2309,7 @@ index 705c6b3ae0db79d0ef0a9eaea504381145b4af21..a902a1fff34382032fd56a6672b2c722
}
public boolean zombieVillagerRidable = false;
@@ -2123,6 +2265,7 @@ public class PurpurWorldConfig {
@@ -2121,6 +2263,7 @@ public class PurpurWorldConfig {
public boolean zombieVillagerJockeyOnlyBaby = true;
public double zombieVillagerJockeyChance = 0.05D;
public boolean zombieVillagerJockeyTryExistingChickens = true;