Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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

47
patches/server/0224-Mobs-always-drop-experience.patch
View File

@@ -1157,7 +1157,7 @@ index 8fd8778e918566504666213a102a7ee2d1ed8b14..7fa248b2d1b73e20085f0d3cdfead385
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 b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799ccf127ffd 100644
index 409837a25e073ed6c3cfe0748ce8c018d8a16fdf..9560dd80f7e979faf13a2c0fa00a7e8aac18a873 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1058,12 +1058,14 @@ public class PurpurWorldConfig {
@@ -1222,8 +1222,8 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
+ blazeAlwaysDropExp = getBoolean("mobs.blaze.always-drop-exp", blazeAlwaysDropExp);
}
public boolean catRidable = false;
@@ -1156,6 +1164,7 @@ public class PurpurWorldConfig {
public double camelMaxHealthMin = 32.0D;
@@ -1173,6 +1181,7 @@ public class PurpurWorldConfig {
public int catBreedingTicks = 6000;
public DyeColor catDefaultCollarColor = DyeColor.RED;
public boolean catTakeDamageFromWater = false;
@@ -1231,7 +1231,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void catSettings() {
catRidable = getBoolean("mobs.cat.ridable", catRidable);
catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater);
@@ -1176,6 +1185,7 @@ public class PurpurWorldConfig {
@@ -1193,6 +1202,7 @@ public class PurpurWorldConfig {
catDefaultCollarColor = DyeColor.RED;
}
catTakeDamageFromWater = getBoolean("mobs.cat.takes-damage-from-water", catTakeDamageFromWater);
@@ -1239,7 +1239,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean caveSpiderRidable = false;
@@ -1183,6 +1193,7 @@ public class PurpurWorldConfig {
@@ -1200,6 +1210,7 @@ public class PurpurWorldConfig {
public boolean caveSpiderControllable = true;
public double caveSpiderMaxHealth = 12.0D;
public boolean caveSpiderTakeDamageFromWater = false;
@@ -1247,7 +1247,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void caveSpiderSettings() {
caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable);
caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater);
@@ -1194,6 +1205,7 @@ public class PurpurWorldConfig {
@@ -1211,6 +1222,7 @@ public class PurpurWorldConfig {
}
caveSpiderMaxHealth = getDouble("mobs.cave_spider.attributes.max_health", caveSpiderMaxHealth);
caveSpiderTakeDamageFromWater = getBoolean("mobs.cave_spider.takes-damage-from-water", caveSpiderTakeDamageFromWater);
@@ -1255,7 +1255,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean chickenRidable = false;
@@ -1203,6 +1215,7 @@ public class PurpurWorldConfig {
@@ -1220,6 +1232,7 @@ public class PurpurWorldConfig {
public boolean chickenRetaliate = false;
public int chickenBreedingTicks = 6000;
public boolean chickenTakeDamageFromWater = false;
@@ -1263,7 +1263,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void chickenSettings() {
chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable);
chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater);
@@ -1216,12 +1229,14 @@ public class PurpurWorldConfig {
@@ -1233,12 +1246,14 @@ public class PurpurWorldConfig {
chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate);
chickenBreedingTicks = getInt("mobs.chicken.breeding-delay-ticks", chickenBreedingTicks);
chickenTakeDamageFromWater = getBoolean("mobs.chicken.takes-damage-from-water", chickenTakeDamageFromWater);
@@ -1278,7 +1278,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void codSettings() {
codRidable = getBoolean("mobs.cod.ridable", codRidable);
codControllable = getBoolean("mobs.cod.controllable", codControllable);
@@ -1232,6 +1247,7 @@ public class PurpurWorldConfig {
@@ -1249,6 +1264,7 @@ public class PurpurWorldConfig {
}
codMaxHealth = getDouble("mobs.cod.attributes.max_health", codMaxHealth);
codTakeDamageFromWater = getBoolean("mobs.cod.takes-damage-from-water", codTakeDamageFromWater);
@@ -1286,7 +1286,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean cowRidable = false;
@@ -1243,6 +1259,7 @@ public class PurpurWorldConfig {
@@ -1260,6 +1276,7 @@ public class PurpurWorldConfig {
public boolean cowTakeDamageFromWater = false;
public double cowNaturallyAggressiveToPlayersChance = 0.0D;
public double cowNaturallyAggressiveToPlayersDamage = 2.0D;
@@ -1294,7 +1294,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void cowSettings() {
cowRidable = getBoolean("mobs.cow.ridable", cowRidable);
cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater);
@@ -1263,6 +1280,7 @@ public class PurpurWorldConfig {
@@ -1280,6 +1297,7 @@ public class PurpurWorldConfig {
cowTakeDamageFromWater = getBoolean("mobs.cow.takes-damage-from-water", cowTakeDamageFromWater);
cowNaturallyAggressiveToPlayersChance = getDouble("mobs.cow.naturally-aggressive-to-players.chance", cowNaturallyAggressiveToPlayersChance);
cowNaturallyAggressiveToPlayersDamage = getDouble("mobs.cow.naturally-aggressive-to-players.damage", cowNaturallyAggressiveToPlayersDamage);
@@ -1302,7 +1302,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean creeperRidable = false;
@@ -1275,6 +1293,7 @@ public class PurpurWorldConfig {
@@ -1292,6 +1310,7 @@ public class PurpurWorldConfig {
public boolean creeperTakeDamageFromWater = false;
public boolean creeperExplodeWhenKilled = false;
public boolean creeperHealthRadius = false;
@@ -1310,7 +1310,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void creeperSettings() {
creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable);
creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater);
@@ -1291,6 +1310,7 @@ public class PurpurWorldConfig {
@@ -1308,6 +1327,7 @@ public class PurpurWorldConfig {
creeperTakeDamageFromWater = getBoolean("mobs.creeper.takes-damage-from-water", creeperTakeDamageFromWater);
creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled);
creeperHealthRadius = getBoolean("mobs.creeper.health-impacts-explosion", creeperHealthRadius);
@@ -1318,7 +1318,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean dolphinRidable = false;
@@ -1302,6 +1322,7 @@ public class PurpurWorldConfig {
@@ -1319,6 +1339,7 @@ public class PurpurWorldConfig {
public boolean dolphinDisableTreasureSearching = false;
public boolean dolphinTakeDamageFromWater = false;
public double dolphinNaturallyAggressiveToPlayersChance = 0.0D;
@@ -1326,7 +1326,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void dolphinSettings() {
dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable);
dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable);
@@ -1317,6 +1338,7 @@ public class PurpurWorldConfig {
@@ -1334,6 +1355,7 @@ public class PurpurWorldConfig {
dolphinDisableTreasureSearching = getBoolean("mobs.dolphin.disable-treasure-searching", dolphinDisableTreasureSearching);
dolphinTakeDamageFromWater = getBoolean("mobs.dolphin.takes-damage-from-water", dolphinTakeDamageFromWater);
dolphinNaturallyAggressiveToPlayersChance = getDouble("mobs.dolphin.naturally-aggressive-to-players-chance", dolphinNaturallyAggressiveToPlayersChance);
@@ -1334,7 +1334,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean donkeyRidableInWater = false;
@@ -1328,6 +1350,7 @@ public class PurpurWorldConfig {
@@ -1345,6 +1367,7 @@ public class PurpurWorldConfig {
public double donkeyMovementSpeedMax = 0.175D;
public int donkeyBreedingTicks = 6000;
public boolean donkeyTakeDamageFromWater = false;
@@ -1342,7 +1342,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void donkeySettings() {
donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater);
if (PurpurConfig.version < 10) {
@@ -1345,6 +1368,7 @@ public class PurpurWorldConfig {
@@ -1362,6 +1385,7 @@ public class PurpurWorldConfig {
donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax);
donkeyBreedingTicks = getInt("mobs.donkey.breeding-delay-ticks", donkeyBreedingTicks);
donkeyTakeDamageFromWater = getBoolean("mobs.donkey.takes-damage-from-water", donkeyTakeDamageFromWater);
@@ -1350,7 +1350,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean drownedRidable = false;
@@ -1357,6 +1381,7 @@ public class PurpurWorldConfig {
@@ -1374,6 +1398,7 @@ public class PurpurWorldConfig {
public boolean drownedJockeyTryExistingChickens = true;
public boolean drownedTakeDamageFromWater = false;
public boolean drownedBreakDoors = false;
@@ -1358,15 +1358,14 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void drownedSettings() {
drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable);
drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater);
@@ -1373,6 +1398,7 @@ public class PurpurWorldConfig {
@@ -1390,12 +1415,14 @@ public class PurpurWorldConfig {
drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens);
drownedTakeDamageFromWater = getBoolean("mobs.drowned.takes-damage-from-water", drownedTakeDamageFromWater);
drownedBreakDoors = getBoolean("mobs.drowned.can-break-doors", drownedBreakDoors);
+ drownedAlwaysDropExp = getBoolean("mobs.drowned.always-drop-exp", drownedAlwaysDropExp);
}
public double camelMaxHealthMin = 32.0D;
@@ -1396,6 +1422,7 @@ public class PurpurWorldConfig {
public boolean elderGuardianRidable = false;
public boolean elderGuardianControllable = true;
public double elderGuardianMaxHealth = 80.0D;
public boolean elderGuardianTakeDamageFromWater = false;
@@ -2257,7 +2256,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean zombieHorseRidableInWater = false;
@@ -2813,6 +2951,7 @@ public class PurpurWorldConfig {
@@ -2811,6 +2949,7 @@ public class PurpurWorldConfig {
public double zombieHorseMovementSpeedMax = 0.2D;
public double zombieHorseSpawnChance = 0.0D;
public boolean zombieHorseTakeDamageFromWater = false;
@@ -2265,7 +2264,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
private void zombieHorseSettings() {
zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater);
zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim);
@@ -2832,6 +2971,7 @@ public class PurpurWorldConfig {
@@ -2828,6 +2967,7 @@ public class PurpurWorldConfig {
zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax);
zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
zombieHorseTakeDamageFromWater = getBoolean("mobs.zombie_horse.takes-damage-from-water", zombieHorseTakeDamageFromWater);
@@ -2273,7 +2272,7 @@ index b7f89a97abf9d5d7c01ba300299b919a4b7b4a7c..ef620d81a4e58ad7fa3c3184b216799c
}
public boolean zombieVillagerRidable = false;
@@ -2844,6 +2984,7 @@ public class PurpurWorldConfig {
@@ -2842,6 +2982,7 @@ public class PurpurWorldConfig {
public int zombieVillagerCuringTimeMin = 3600;
public int zombieVillagerCuringTimeMax = 6000;
public boolean zombieVillagerCureEnabled = true;