From 91b9a1a0cea85fd2d2467edd324941cdcf77c671 Mon Sep 17 00:00:00 2001 From: granny Date: Fri, 9 Jun 2023 03:22:44 -0700 Subject: [PATCH] reorganize patches --- ...d-to-crystals-and-crystals-shoot-ph.patch} | 18 +- ...> 0066-Add-phantom-spawning-options.patch} | 18 +- ...067-Implement-bed-explosion-options.patch} | 2 +- ...nt-respawn-anchor-explosion-options.patch} | 2 +- ...Add-allow-water-in-end-world-option.patch} | 0 ...illager-Clerics-to-farm-Nether-Wart.patch} | 6 +- ...ied-Piglin-death-always-counting-as.patch} | 6 +- ...le-chance-for-wolves-to-spawn-rabid.patch} | 6 +- ...4-Configurable-default-collar-color.patch} | 6 +- ...0153-Configurable-sponge-absorption.patch} | 4 +- ...ch => 0154-Projectile-offset-config.patch} | 2 +- ...or-powered-rail-activation-distance.patch} | 2 +- ...> 0156-Piglin-portal-spawn-modifier.patch} | 6 +- ...Config-to-change-max-number-of-bees.patch} | 0 ...tch => 0226-Signs-allow-color-codes.patch} | 2 +- ...-and-twisting-vines-configurable-ma.patch} | 0 ...=> 0228-Mobs-always-drop-experience.patch} | 274 +++++++++--------- ....patch => 0229-Potion-NamespacedKey.patch} | 0 ...ne-API.patch => 0230-Grindstone-API.patch} | 0 ...imings.patch => 0272-Remove-Timings.patch} | 8 +- ...atch => 0273-Remove-Mojang-Profiler.patch} | 4 +- ...r-output-for-invalid-movement-kicks.patch} | 2 +- ...d-Bee-API.patch => 0275-Add-Bee-API.patch} | 0 ...-API.patch => 0276-Debug-Marker-API.patch} | 0 ...g-option-to-ignore-creative-players.patch} | 2 +- ...78-Add-skeleton-bow-accuracy-option.patch} | 0 26 files changed, 185 insertions(+), 185 deletions(-) rename patches/server/{0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0065-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (94%) rename patches/server/{0065-Add-phantom-spawning-options.patch => 0066-Add-phantom-spawning-options.patch} (87%) rename patches/server/{0066-Implement-bed-explosion-options.patch => 0067-Implement-bed-explosion-options.patch} (97%) rename patches/server/{0067-Implement-respawn-anchor-explosion-options.patch => 0068-Implement-respawn-anchor-explosion-options.patch} (97%) rename patches/server/{0068-Add-allow-water-in-end-world-option.patch => 0069-Add-allow-water-in-end-world-option.patch} (100%) rename patches/server/{0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (98%) rename patches/server/{0111-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (94%) rename patches/server/{0112-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0113-Configurable-chance-for-wolves-to-spawn-rabid.patch} (98%) rename patches/server/{0113-Configurable-default-collar-color.patch => 0114-Configurable-default-collar-color.patch} (95%) rename patches/server/{0157-Configurable-sponge-absorption.patch => 0153-Configurable-sponge-absorption.patch} (93%) rename patches/server/{0153-Projectile-offset-config.patch => 0154-Projectile-offset-config.patch} (99%) rename patches/server/{0154-Config-for-powered-rail-activation-distance.patch => 0155-Config-for-powered-rail-activation-distance.patch} (94%) rename patches/server/{0155-Piglin-portal-spawn-modifier.patch => 0156-Piglin-portal-spawn-modifier.patch} (93%) rename patches/server/{0156-Config-to-change-max-number-of-bees.patch => 0157-Config-to-change-max-number-of-bees.patch} (100%) rename patches/server/{0230-Signs-allow-color-codes.patch => 0226-Signs-allow-color-codes.patch} (98%) rename patches/server/{0226-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch => 0227-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch} (100%) rename patches/server/{0227-Mobs-always-drop-experience.patch => 0228-Mobs-always-drop-experience.patch} (94%) rename patches/server/{0228-Potion-NamespacedKey.patch => 0229-Potion-NamespacedKey.patch} (100%) rename patches/server/{0229-Grindstone-API.patch => 0230-Grindstone-API.patch} (100%) rename patches/server/{0275-Remove-Timings.patch => 0272-Remove-Timings.patch} (99%) rename patches/server/{0278-Remove-Mojang-Profiler.patch => 0273-Remove-Mojang-Profiler.patch} (99%) rename patches/server/{0272-Add-more-logger-output-for-invalid-movement-kicks.patch => 0274-Add-more-logger-output-for-invalid-movement-kicks.patch} (96%) rename patches/server/{0273-Add-Bee-API.patch => 0275-Add-Bee-API.patch} (100%) rename patches/server/{0274-Debug-Marker-API.patch => 0276-Debug-Marker-API.patch} (100%) rename patches/server/{0276-mob-spawning-option-to-ignore-creative-players.patch => 0277-mob-spawning-option-to-ignore-creative-players.patch} (97%) rename patches/server/{0277-Add-skeleton-bow-accuracy-option.patch => 0278-Add-skeleton-bow-accuracy-option.patch} (100%) diff --git a/patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0065-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 94% rename from patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0065-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index a1e074722..b134fad0d 100644 --- a/patches/server/0069-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0065-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -258,26 +258,26 @@ index 2189058a752986179165fb904513796e7220438e..b0aad0632ed2c6004222a4715c2643ef private float speed = 0.1F; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index aacee630b1f7a9c2bbcdf772df204e3d3ec4e52f..70576507db0a84b209729cdd2efa595bd0450042 100644 +index d96d87fd198e54802712b8cfde2a0563812a3136..fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1109,6 +1109,9 @@ public class PurpurWorldConfig { +@@ -1067,6 +1067,9 @@ public class PurpurWorldConfig { public String phantomAttackDamage = "6 + size"; public Map phantomMaxHealthCache = new HashMap<>(); public Map phantomAttackDamageCache = new HashMap<>(); + public double phantomAttackedByCrystalRadius = 0.0D; + public float phantomAttackedByCrystalDamage = 1.0F; + public double phantomOrbitCrystalRadius = 0.0D; - public int phantomSpawnMinSkyDarkness = 5; - public boolean phantomSpawnOnlyAboveSeaLevel = true; - public boolean phantomSpawnOnlyWithVisibleSky = true; -@@ -1136,6 +1139,9 @@ public class PurpurWorldConfig { + private void phantomSettings() { + phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); + phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); +@@ -1088,6 +1091,9 @@ public class PurpurWorldConfig { phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage); phantomMaxHealthCache.clear(); phantomAttackDamageCache.clear(); + phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius); + phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage); + phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius); - phantomSpawnMinSkyDarkness = getInt("mobs.phantom.spawn.min-sky-darkness", phantomSpawnMinSkyDarkness); - phantomSpawnOnlyAboveSeaLevel = getBoolean("mobs.phantom.spawn.only-above-sea-level", phantomSpawnOnlyAboveSeaLevel); - phantomSpawnOnlyWithVisibleSky = getBoolean("mobs.phantom.spawn.only-with-visible-sky", phantomSpawnOnlyWithVisibleSky); + } + + public boolean pigRidable = false; diff --git a/patches/server/0065-Add-phantom-spawning-options.patch b/patches/server/0066-Add-phantom-spawning-options.patch similarity index 87% rename from patches/server/0065-Add-phantom-spawning-options.patch rename to patches/server/0066-Add-phantom-spawning-options.patch index 20e0da98b..b9e943cb5 100644 --- a/patches/server/0065-Add-phantom-spawning-options.patch +++ b/patches/server/0066-Add-phantom-spawning-options.patch @@ -40,13 +40,13 @@ index bc7648dbc132551dc6591ab49a1919a623c30f60..5b880677c895d0e747a1ed6a380ae356 for (int l = 0; l < k; ++l) { // Paper start diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index df8f8dcf6e47710b289df1996b571781009c9c00..930f6267cd90ebaee1a5819bcb67f81528692377 100644 +index fd4c91cba23954d1614ad3d3cdb0b12d6ffdecaa..a6a71ea8dda8a1c42f3e32f9fccb9dc5366d9295 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1067,6 +1067,12 @@ public class PurpurWorldConfig { - public String phantomAttackDamage = "6 + size"; - public Map phantomMaxHealthCache = new HashMap<>(); - public Map phantomAttackDamageCache = new HashMap<>(); +@@ -1070,6 +1070,12 @@ public class PurpurWorldConfig { + public double phantomAttackedByCrystalRadius = 0.0D; + public float phantomAttackedByCrystalDamage = 1.0F; + public double phantomOrbitCrystalRadius = 0.0D; + public int phantomSpawnMinSkyDarkness = 5; + public boolean phantomSpawnOnlyAboveSeaLevel = true; + public boolean phantomSpawnOnlyWithVisibleSky = true; @@ -56,10 +56,10 @@ index df8f8dcf6e47710b289df1996b571781009c9c00..930f6267cd90ebaee1a5819bcb67f815 private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -1088,6 +1094,12 @@ public class PurpurWorldConfig { - phantomAttackDamage = getString("mobs.phantom.attributes.attack_damage", phantomAttackDamage); - phantomMaxHealthCache.clear(); - phantomAttackDamageCache.clear(); +@@ -1094,6 +1100,12 @@ public class PurpurWorldConfig { + phantomAttackedByCrystalRadius = getDouble("mobs.phantom.attacked-by-crystal-range", phantomAttackedByCrystalRadius); + phantomAttackedByCrystalDamage = (float) getDouble("mobs.phantom.attacked-by-crystal-damage", phantomAttackedByCrystalDamage); + phantomOrbitCrystalRadius = getDouble("mobs.phantom.orbit-crystal-radius", phantomOrbitCrystalRadius); + phantomSpawnMinSkyDarkness = getInt("mobs.phantom.spawn.min-sky-darkness", phantomSpawnMinSkyDarkness); + phantomSpawnOnlyAboveSeaLevel = getBoolean("mobs.phantom.spawn.only-above-sea-level", phantomSpawnOnlyAboveSeaLevel); + phantomSpawnOnlyWithVisibleSky = getBoolean("mobs.phantom.spawn.only-with-visible-sky", phantomSpawnOnlyWithVisibleSky); diff --git a/patches/server/0066-Implement-bed-explosion-options.patch b/patches/server/0067-Implement-bed-explosion-options.patch similarity index 97% rename from patches/server/0066-Implement-bed-explosion-options.patch rename to patches/server/0067-Implement-bed-explosion-options.patch index a078deee5..59996386a 100644 --- a/patches/server/0066-Implement-bed-explosion-options.patch +++ b/patches/server/0067-Implement-bed-explosion-options.patch @@ -27,7 +27,7 @@ index d40500f9a807cab0b2fb6fa9032f33f4fb74c895..e8405a57fb88e63b63baaf00645c4176 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fa7bafbba960f987f4dac7a12fd3014efa8eebdb..4a1bd450223323ff04c92a2eac2e789d1e6c8920 100644 +index a6a71ea8dda8a1c42f3e32f9fccb9dc5366d9295..2ff268a9bf92c151e7b0e5f0b075eb9fc72035a7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -290,6 +290,27 @@ public class PurpurWorldConfig { diff --git a/patches/server/0067-Implement-respawn-anchor-explosion-options.patch b/patches/server/0068-Implement-respawn-anchor-explosion-options.patch similarity index 97% rename from patches/server/0067-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0068-Implement-respawn-anchor-explosion-options.patch index a38072ff6..b8aa24368 100644 --- a/patches/server/0067-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0068-Implement-respawn-anchor-explosion-options.patch @@ -18,7 +18,7 @@ index 2ed78cf83c0ae66a6ddba1ff307da89a24b0d0a8..ae17d6a54fad0bd2d71d306f418b5ced public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4a1bd450223323ff04c92a2eac2e789d1e6c8920..fce1ffd5a1d04a2a90d6a6eecc3736c79ef515fb 100644 +index 2ff268a9bf92c151e7b0e5f0b075eb9fc72035a7..70576507db0a84b209729cdd2efa595bd0450042 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -330,6 +330,27 @@ public class PurpurWorldConfig { diff --git a/patches/server/0068-Add-allow-water-in-end-world-option.patch b/patches/server/0069-Add-allow-water-in-end-world-option.patch similarity index 100% rename from patches/server/0068-Add-allow-water-in-end-world-option.patch rename to patches/server/0069-Add-allow-water-in-end-world-option.patch diff --git a/patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 98% rename from patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index 2db8862ca..0e9c85f36 100644 --- a/patches/server/0114-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0111-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -176,10 +176,10 @@ index ac70c2c03241e73943bd517a8c69dd05e0873634..0318663a824d2a9515f867a075d148c3 public static final VillagerProfession FISHERMAN = register("fisherman", PoiTypes.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = register("fletcher", PoiTypes.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index dfb3e53954e7247199427ba8e35a97160af25d55..b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9 100644 +index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..a22eefcf7929f8c36fdac4b96a7cdb70bc67e291 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1816,6 +1816,8 @@ public class PurpurWorldConfig { +@@ -1810,6 +1810,8 @@ public class PurpurWorldConfig { public boolean villagerCanBeLeashed = false; public boolean villagerCanBreed = true; public int villagerBreedingTicks = 6000; @@ -188,7 +188,7 @@ index dfb3e53954e7247199427ba8e35a97160af25d55..b4c1ab716d7428d663ddcaca9bb1a12f private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1830,6 +1832,8 @@ public class PurpurWorldConfig { +@@ -1824,6 +1826,8 @@ public class PurpurWorldConfig { villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); diff --git a/patches/server/0111-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 94% rename from patches/server/0111-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 396d426e8..3cdcf4b81 100644 --- a/patches/server/0111-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0112-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,10 +35,10 @@ index 3d61b27c23d90e87fdfc8c170eafc116716ac047..67fd554cfd6b848ca1f2cf804ad4543a } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..cc3cc85b7119865a622dd61acc1c84708256876b 100644 +index a22eefcf7929f8c36fdac4b96a7cdb70bc67e291..f1b84d4c4e19133e1d9b96c66dea83878469861e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -2045,6 +2045,7 @@ public class PurpurWorldConfig { +@@ -2049,6 +2049,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; @@ -46,7 +46,7 @@ index 45654f3d541a8e66d283f044d20d2d48ee4f40a7..cc3cc85b7119865a622dd61acc1c8470 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -2059,5 +2060,6 @@ public class PurpurWorldConfig { +@@ -2063,5 +2064,6 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyOnlyBaby = getBoolean("mobs.zombified_piglin.jockey.only-babies", zombifiedPiglinJockeyOnlyBaby); zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance); zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); diff --git a/patches/server/0112-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 98% rename from patches/server/0112-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch index 750df78a5..d70c17fcb 100644 --- a/patches/server/0112-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0113-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -221,10 +221,10 @@ index e43fd3e59fd8c74828ae65965fade27f56beef65..b2f133c8baabba1cffa6e92ea0f85453 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cc3cc85b7119865a622dd61acc1c84708256876b..6e656c74019f44b804ea6734139b3859d2a2b1df 100644 +index f1b84d4c4e19133e1d9b96c66dea83878469861e..f30d14be52e736a14f3fde8be1b37e4c20ee80e2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1935,6 +1935,8 @@ public class PurpurWorldConfig { +@@ -1939,6 +1939,8 @@ public class PurpurWorldConfig { public boolean wolfRidableInWater = true; public boolean wolfControllable = true; public double wolfMaxHealth = 8.0D; @@ -233,7 +233,7 @@ index cc3cc85b7119865a622dd61acc1c84708256876b..6e656c74019f44b804ea6734139b3859 public int wolfBreedingTicks = 6000; private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); -@@ -1946,6 +1948,8 @@ public class PurpurWorldConfig { +@@ -1950,6 +1952,8 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0113-Configurable-default-collar-color.patch b/patches/server/0114-Configurable-default-collar-color.patch similarity index 95% rename from patches/server/0113-Configurable-default-collar-color.patch rename to patches/server/0114-Configurable-default-collar-color.patch index 5c20ceada..81f8263b6 100644 --- a/patches/server/0113-Configurable-default-collar-color.patch +++ b/patches/server/0114-Configurable-default-collar-color.patch @@ -43,7 +43,7 @@ index aa484d03ed31f6c60c0b4456a4047bc38a40ea4a..89627025c0b5464900a5ea818c7aaf5d protected void registerGoals() { this.goalSelector.addGoal(1, new FloatGoal(this)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a97160af25d55 100644 +index f30d14be52e736a14f3fde8be1b37e4c20ee80e2..b4c1ab716d7428d663ddcaca9bb1a12ffcea99c9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -620,6 +620,7 @@ public class PurpurWorldConfig { @@ -66,7 +66,7 @@ index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a9716 } public boolean caveSpiderRidable = false; -@@ -1935,6 +1941,7 @@ public class PurpurWorldConfig { +@@ -1939,6 +1945,7 @@ public class PurpurWorldConfig { public boolean wolfRidableInWater = true; public boolean wolfControllable = true; public double wolfMaxHealth = 8.0D; @@ -74,7 +74,7 @@ index 6e656c74019f44b804ea6734139b3859d2a2b1df..dfb3e53954e7247199427ba8e35a9716 public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; -@@ -1948,6 +1955,11 @@ public class PurpurWorldConfig { +@@ -1952,6 +1959,11 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0157-Configurable-sponge-absorption.patch b/patches/server/0153-Configurable-sponge-absorption.patch similarity index 93% rename from patches/server/0157-Configurable-sponge-absorption.patch rename to patches/server/0153-Configurable-sponge-absorption.patch index 73b2582bf..830f1e0ef 100644 --- a/patches/server/0157-Configurable-sponge-absorption.patch +++ b/patches/server/0153-Configurable-sponge-absorption.patch @@ -21,10 +21,10 @@ index 4bce895268542531598a01a1bccd8ac1ed703b7d..e4e926dc89f843886d0df5da31e00053 int i = aenumdirection.length; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a0fd04f892e39805a655216e029bb077847f809c..644652189ca1b173776537fa9d17aa31b38cdfe1 100644 +index 5c53c323296fc264f6a436b78c7def11deb742d2..cbc07c2cc6166293fa2f5af64abf9d20ac57b2d3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -657,6 +657,13 @@ public class PurpurWorldConfig { +@@ -635,6 +635,13 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } diff --git a/patches/server/0153-Projectile-offset-config.patch b/patches/server/0154-Projectile-offset-config.patch similarity index 99% rename from patches/server/0153-Projectile-offset-config.patch rename to patches/server/0154-Projectile-offset-config.patch index 0baae161e..89495818f 100644 --- a/patches/server/0153-Projectile-offset-config.patch +++ b/patches/server/0154-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 06c2f30b77a2c8aecc65e0c305f643d53798f364..6d1573161f0d8c7999f84925ba7bbf53 entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5c53c323296fc264f6a436b78c7def11deb742d2..bf2dc4fe37df03728d711952eeabf3882b61c22e 100644 +index cbc07c2cc6166293fa2f5af64abf9d20ac57b2d3..53a98b4131a84bdcdfa618dd3e11fbe5a3a88e3a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -428,6 +428,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0154-Config-for-powered-rail-activation-distance.patch b/patches/server/0155-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0154-Config-for-powered-rail-activation-distance.patch rename to patches/server/0155-Config-for-powered-rail-activation-distance.patch index 5e6d958de..10f7b48c3 100644 --- a/patches/server/0154-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0155-Config-for-powered-rail-activation-distance.patch @@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b } else { int j = pos.getX(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bf2dc4fe37df03728d711952eeabf3882b61c22e..d2305b276252c76ed90aeef0a0e245261b6be348 100644 +index 53a98b4131a84bdcdfa618dd3e11fbe5a3a88e3a..5e0648856dcb71f218464d8b0b74e00e2d520efa 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -621,6 +621,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Piglin-portal-spawn-modifier.patch b/patches/server/0156-Piglin-portal-spawn-modifier.patch similarity index 93% rename from patches/server/0155-Piglin-portal-spawn-modifier.patch rename to patches/server/0156-Piglin-portal-spawn-modifier.patch index 6b71c4980..54cd4abaa 100644 --- a/patches/server/0155-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0156-Piglin-portal-spawn-modifier.patch @@ -31,10 +31,10 @@ index 2c085c4a154cb0f8a1d38453f43474a764398784..589b437e7c97c846410f293e2f014bdc pos = pos.below(); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d2305b276252c76ed90aeef0a0e245261b6be348..a0fd04f892e39805a655216e029bb077847f809c 100644 +index 5e0648856dcb71f218464d8b0b74e00e2d520efa..644652189ca1b173776537fa9d17aa31b38cdfe1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1642,6 +1642,7 @@ public class PurpurWorldConfig { +@@ -1649,6 +1649,7 @@ public class PurpurWorldConfig { public double piglinMaxHealth = 16.0D; public boolean piglinBypassMobGriefing = false; public boolean piglinTakeDamageFromWater = false; @@ -42,7 +42,7 @@ index d2305b276252c76ed90aeef0a0e245261b6be348..a0fd04f892e39805a655216e029bb077 private void piglinSettings() { piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable); piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater); -@@ -1654,6 +1655,7 @@ public class PurpurWorldConfig { +@@ -1661,6 +1662,7 @@ public class PurpurWorldConfig { piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth); piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing); piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater); diff --git a/patches/server/0156-Config-to-change-max-number-of-bees.patch b/patches/server/0157-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0156-Config-to-change-max-number-of-bees.patch rename to patches/server/0157-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0230-Signs-allow-color-codes.patch b/patches/server/0226-Signs-allow-color-codes.patch similarity index 98% rename from patches/server/0230-Signs-allow-color-codes.patch rename to patches/server/0226-Signs-allow-color-codes.patch index 2b7bda75c..09b62dee8 100644 --- a/patches/server/0230-Signs-allow-color-codes.patch +++ b/patches/server/0226-Signs-allow-color-codes.patch @@ -67,7 +67,7 @@ index 80695b2698d2904cec2c54ebe0ef880d95ed9583..c884b119fd956c3543864f06c1b1cd60 public CompoundTag getUpdateTag() { return this.saveWithoutMetadata(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c70fc012709293fd01d996a55a49d500cd148d33..f00d995a35fe7c33f2c5d1fffeb5d46b12b26e6f 100644 +index 00e147d0097e4797b378310154942a141f6e1298..75e0a56a381e05f0b99e7e7b85d38b4219a5da95 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -958,6 +958,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0226-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/server/0227-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch similarity index 100% rename from patches/server/0226-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch rename to patches/server/0227-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch diff --git a/patches/server/0227-Mobs-always-drop-experience.patch b/patches/server/0228-Mobs-always-drop-experience.patch similarity index 94% rename from patches/server/0227-Mobs-always-drop-experience.patch rename to patches/server/0228-Mobs-always-drop-experience.patch index b4d6d13ff..ffefa82d0 100644 --- a/patches/server/0227-Mobs-always-drop-experience.patch +++ b/patches/server/0228-Mobs-always-drop-experience.patch @@ -1157,10 +1157,10 @@ 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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500cd148d33 100644 +index 75e0a56a381e05f0b99e7e7b85d38b4219a5da95..f00d995a35fe7c33f2c5d1fffeb5d46b12b26e6f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -@@ -1065,12 +1065,14 @@ public class PurpurWorldConfig { +@@ -1070,12 +1070,14 @@ public class PurpurWorldConfig { public double axolotlMaxHealth = 14.0D; public int axolotlBreedingTicks = 6000; public boolean axolotlTakeDamageFromWater = false; @@ -1175,7 +1175,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean batRidable = false; -@@ -1086,6 +1088,7 @@ public class PurpurWorldConfig { +@@ -1091,6 +1093,7 @@ public class PurpurWorldConfig { public double batArmorToughness = 0.0D; public double batAttackKnockback = 0.0D; public boolean batTakeDamageFromWater = false; @@ -1183,7 +1183,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void batSettings() { batRidable = getBoolean("mobs.bat.ridable", batRidable); batRidableInWater = getBoolean("mobs.bat.ridable-in-water", batRidableInWater); -@@ -1105,6 +1108,7 @@ public class PurpurWorldConfig { +@@ -1110,6 +1113,7 @@ public class PurpurWorldConfig { batArmorToughness = getDouble("mobs.bat.attributes.armor_toughness", batArmorToughness); batAttackKnockback = getDouble("mobs.bat.attributes.attack_knockback", batAttackKnockback); batTakeDamageFromWater = getBoolean("mobs.bat.takes-damage-from-water", batTakeDamageFromWater); @@ -1191,7 +1191,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean beeRidable = false; -@@ -1116,6 +1120,7 @@ public class PurpurWorldConfig { +@@ -1121,6 +1125,7 @@ public class PurpurWorldConfig { public boolean beeTakeDamageFromWater = false; public boolean beeCanWorkAtNight = false; public boolean beeCanWorkInRain = false; @@ -1199,7 +1199,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void beeSettings() { beeRidable = getBoolean("mobs.bee.ridable", beeRidable); beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater); -@@ -1131,6 +1136,7 @@ public class PurpurWorldConfig { +@@ -1136,6 +1141,7 @@ public class PurpurWorldConfig { beeTakeDamageFromWater = getBoolean("mobs.bee.takes-damage-from-water", beeTakeDamageFromWater); beeCanWorkAtNight = getBoolean("mobs.bee.can-work-at-night", beeCanWorkAtNight); beeCanWorkInRain = getBoolean("mobs.bee.can-work-in-rain", beeCanWorkInRain); @@ -1207,7 +1207,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean blazeRidable = false; -@@ -1139,6 +1145,7 @@ public class PurpurWorldConfig { +@@ -1144,6 +1150,7 @@ public class PurpurWorldConfig { public double blazeMaxY = 320D; public double blazeMaxHealth = 20.0D; public boolean blazeTakeDamageFromWater = true; @@ -1215,7 +1215,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void blazeSettings() { blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable); blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater); -@@ -1151,6 +1158,7 @@ public class PurpurWorldConfig { +@@ -1156,6 +1163,7 @@ public class PurpurWorldConfig { } blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth); blazeTakeDamageFromWater = getBoolean("mobs.blaze.takes-damage-from-water", blazeTakeDamageFromWater); @@ -1223,7 +1223,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public double camelMaxHealthMin = 32.0D; -@@ -1180,6 +1188,7 @@ public class PurpurWorldConfig { +@@ -1185,6 +1193,7 @@ public class PurpurWorldConfig { public int catBreedingTicks = 6000; public DyeColor catDefaultCollarColor = DyeColor.RED; public boolean catTakeDamageFromWater = false; @@ -1231,7 +1231,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void catSettings() { catRidable = getBoolean("mobs.cat.ridable", catRidable); catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater); -@@ -1200,6 +1209,7 @@ public class PurpurWorldConfig { +@@ -1205,6 +1214,7 @@ public class PurpurWorldConfig { catDefaultCollarColor = DyeColor.RED; } catTakeDamageFromWater = getBoolean("mobs.cat.takes-damage-from-water", catTakeDamageFromWater); @@ -1239,7 +1239,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean caveSpiderRidable = false; -@@ -1207,6 +1217,7 @@ public class PurpurWorldConfig { +@@ -1212,6 +1222,7 @@ public class PurpurWorldConfig { public boolean caveSpiderControllable = true; public double caveSpiderMaxHealth = 12.0D; public boolean caveSpiderTakeDamageFromWater = false; @@ -1247,7 +1247,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void caveSpiderSettings() { caveSpiderRidable = getBoolean("mobs.cave_spider.ridable", caveSpiderRidable); caveSpiderRidableInWater = getBoolean("mobs.cave_spider.ridable-in-water", caveSpiderRidableInWater); -@@ -1218,6 +1229,7 @@ public class PurpurWorldConfig { +@@ -1223,6 +1234,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean chickenRidable = false; -@@ -1227,6 +1239,7 @@ public class PurpurWorldConfig { +@@ -1232,6 +1244,7 @@ public class PurpurWorldConfig { public boolean chickenRetaliate = false; public int chickenBreedingTicks = 6000; public boolean chickenTakeDamageFromWater = false; @@ -1263,7 +1263,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void chickenSettings() { chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable); chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater); -@@ -1240,12 +1253,14 @@ public class PurpurWorldConfig { +@@ -1245,12 +1258,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void codSettings() { codRidable = getBoolean("mobs.cod.ridable", codRidable); codControllable = getBoolean("mobs.cod.controllable", codControllable); -@@ -1256,6 +1271,7 @@ public class PurpurWorldConfig { +@@ -1261,6 +1276,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean cowRidable = false; -@@ -1267,6 +1283,7 @@ public class PurpurWorldConfig { +@@ -1272,6 +1288,7 @@ public class PurpurWorldConfig { public boolean cowTakeDamageFromWater = false; public double cowNaturallyAggressiveToPlayersChance = 0.0D; public double cowNaturallyAggressiveToPlayersDamage = 2.0D; @@ -1294,7 +1294,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void cowSettings() { cowRidable = getBoolean("mobs.cow.ridable", cowRidable); cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater); -@@ -1287,6 +1304,7 @@ public class PurpurWorldConfig { +@@ -1292,6 +1309,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean creeperRidable = false; -@@ -1299,6 +1317,7 @@ public class PurpurWorldConfig { +@@ -1304,6 +1322,7 @@ public class PurpurWorldConfig { public boolean creeperTakeDamageFromWater = false; public boolean creeperExplodeWhenKilled = false; public boolean creeperHealthRadius = false; @@ -1310,7 +1310,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void creeperSettings() { creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); -@@ -1315,6 +1334,7 @@ public class PurpurWorldConfig { +@@ -1320,6 +1339,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean dolphinRidable = false; -@@ -1326,6 +1346,7 @@ public class PurpurWorldConfig { +@@ -1331,6 +1351,7 @@ public class PurpurWorldConfig { public boolean dolphinDisableTreasureSearching = false; public boolean dolphinTakeDamageFromWater = false; public double dolphinNaturallyAggressiveToPlayersChance = 0.0D; @@ -1326,7 +1326,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void dolphinSettings() { dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable); dolphinControllable = getBoolean("mobs.dolphin.controllable", dolphinControllable); -@@ -1341,6 +1362,7 @@ public class PurpurWorldConfig { +@@ -1346,6 +1367,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean donkeyRidableInWater = false; -@@ -1352,6 +1374,7 @@ public class PurpurWorldConfig { +@@ -1357,6 +1379,7 @@ public class PurpurWorldConfig { public double donkeyMovementSpeedMax = 0.175D; public int donkeyBreedingTicks = 6000; public boolean donkeyTakeDamageFromWater = false; @@ -1342,7 +1342,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void donkeySettings() { donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater); if (PurpurConfig.version < 10) { -@@ -1369,6 +1392,7 @@ public class PurpurWorldConfig { +@@ -1374,6 +1397,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 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean drownedRidable = false; -@@ -1381,6 +1405,7 @@ public class PurpurWorldConfig { +@@ -1386,6 +1410,7 @@ public class PurpurWorldConfig { public boolean drownedJockeyTryExistingChickens = true; public boolean drownedTakeDamageFromWater = false; public boolean drownedBreakDoors = false; @@ -1358,7 +1358,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void drownedSettings() { drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable); drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater); -@@ -1397,12 +1422,14 @@ public class PurpurWorldConfig { +@@ -1402,12 +1427,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); @@ -1373,7 +1373,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void elderGuardianSettings() { elderGuardianRidable = getBoolean("mobs.elder_guardian.ridable", elderGuardianRidable); elderGuardianControllable = getBoolean("mobs.elder_guardian.controllable", elderGuardianControllable); -@@ -1413,6 +1440,7 @@ public class PurpurWorldConfig { +@@ -1418,6 +1445,7 @@ public class PurpurWorldConfig { } elderGuardianMaxHealth = getDouble("mobs.elder_guardian.attributes.max_health", elderGuardianMaxHealth); elderGuardianTakeDamageFromWater = getBoolean("mobs.elder_guardian.takes-damage-from-water", elderGuardianTakeDamageFromWater); @@ -1381,7 +1381,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean enderDragonRidable = false; -@@ -1458,6 +1486,7 @@ public class PurpurWorldConfig { +@@ -1463,6 +1491,7 @@ public class PurpurWorldConfig { public boolean endermanIgnorePlayerDragonHead = false; public boolean endermanDisableStareAggro = false; public boolean endermanIgnoreProjectiles = false; @@ -1389,7 +1389,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -1481,6 +1510,7 @@ public class PurpurWorldConfig { +@@ -1486,6 +1515,7 @@ public class PurpurWorldConfig { endermanIgnorePlayerDragonHead = getBoolean("mobs.enderman.ignore-players-wearing-dragon-head", endermanIgnorePlayerDragonHead); endermanDisableStareAggro = getBoolean("mobs.enderman.disable-player-stare-aggression", endermanDisableStareAggro); endermanIgnoreProjectiles = getBoolean("mobs.enderman.ignore-projectiles", endermanIgnoreProjectiles); @@ -1397,7 +1397,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean endermiteRidable = false; -@@ -1488,6 +1518,7 @@ public class PurpurWorldConfig { +@@ -1493,6 +1523,7 @@ public class PurpurWorldConfig { public boolean endermiteControllable = true; public double endermiteMaxHealth = 8.0D; public boolean endermiteTakeDamageFromWater = false; @@ -1405,7 +1405,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void endermiteSettings() { endermiteRidable = getBoolean("mobs.endermite.ridable", endermiteRidable); endermiteRidableInWater = getBoolean("mobs.endermite.ridable-in-water", endermiteRidableInWater); -@@ -1499,6 +1530,7 @@ public class PurpurWorldConfig { +@@ -1504,6 +1535,7 @@ public class PurpurWorldConfig { } endermiteMaxHealth = getDouble("mobs.endermite.attributes.max_health", endermiteMaxHealth); endermiteTakeDamageFromWater = getBoolean("mobs.endermite.takes-damage-from-water", endermiteTakeDamageFromWater); @@ -1413,7 +1413,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean evokerRidable = false; -@@ -1507,6 +1539,7 @@ public class PurpurWorldConfig { +@@ -1512,6 +1544,7 @@ public class PurpurWorldConfig { public double evokerMaxHealth = 24.0D; public boolean evokerBypassMobGriefing = false; public boolean evokerTakeDamageFromWater = false; @@ -1421,7 +1421,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void evokerSettings() { evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable); evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater); -@@ -1519,6 +1552,7 @@ public class PurpurWorldConfig { +@@ -1524,6 +1557,7 @@ public class PurpurWorldConfig { evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth); evokerBypassMobGriefing = getBoolean("mobs.evoker.bypass-mob-griefing", evokerBypassMobGriefing); evokerTakeDamageFromWater = getBoolean("mobs.evoker.takes-damage-from-water", evokerTakeDamageFromWater); @@ -1429,7 +1429,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean foxRidable = false; -@@ -1529,6 +1563,7 @@ public class PurpurWorldConfig { +@@ -1534,6 +1568,7 @@ public class PurpurWorldConfig { public int foxBreedingTicks = 6000; public boolean foxBypassMobGriefing = false; public boolean foxTakeDamageFromWater = false; @@ -1437,7 +1437,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void foxSettings() { foxRidable = getBoolean("mobs.fox.ridable", foxRidable); foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater); -@@ -1543,6 +1578,7 @@ public class PurpurWorldConfig { +@@ -1548,6 +1583,7 @@ public class PurpurWorldConfig { foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks); foxBypassMobGriefing = getBoolean("mobs.fox.bypass-mob-griefing", foxBypassMobGriefing); foxTakeDamageFromWater = getBoolean("mobs.fox.takes-damage-from-water", foxTakeDamageFromWater); @@ -1445,7 +1445,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean frogRidable = false; -@@ -1564,6 +1600,7 @@ public class PurpurWorldConfig { +@@ -1569,6 +1605,7 @@ public class PurpurWorldConfig { public double ghastMaxY = 320D; public double ghastMaxHealth = 10.0D; public boolean ghastTakeDamageFromWater = false; @@ -1453,7 +1453,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void ghastSettings() { ghastRidable = getBoolean("mobs.ghast.ridable", ghastRidable); ghastRidableInWater = getBoolean("mobs.ghast.ridable-in-water", ghastRidableInWater); -@@ -1576,6 +1613,7 @@ public class PurpurWorldConfig { +@@ -1581,6 +1618,7 @@ public class PurpurWorldConfig { } ghastMaxHealth = getDouble("mobs.ghast.attributes.max_health", ghastMaxHealth); ghastTakeDamageFromWater = getBoolean("mobs.ghast.takes-damage-from-water", ghastTakeDamageFromWater); @@ -1461,7 +1461,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean giantRidable = false; -@@ -1589,6 +1627,7 @@ public class PurpurWorldConfig { +@@ -1594,6 +1632,7 @@ public class PurpurWorldConfig { public boolean giantHaveAI = false; public boolean giantHaveHostileAI = false; public boolean giantTakeDamageFromWater = false; @@ -1469,7 +1469,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void giantSettings() { giantRidable = getBoolean("mobs.giant.ridable", giantRidable); giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater); -@@ -1610,6 +1649,7 @@ public class PurpurWorldConfig { +@@ -1615,6 +1654,7 @@ public class PurpurWorldConfig { giantHaveAI = getBoolean("mobs.giant.have-ai", giantHaveAI); giantHaveHostileAI = getBoolean("mobs.giant.have-hostile-ai", giantHaveHostileAI); giantTakeDamageFromWater = getBoolean("mobs.giant.takes-damage-from-water", giantTakeDamageFromWater); @@ -1477,7 +1477,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean glowSquidRidable = false; -@@ -1617,12 +1657,14 @@ public class PurpurWorldConfig { +@@ -1622,12 +1662,14 @@ public class PurpurWorldConfig { public double glowSquidMaxHealth = 10.0D; public boolean glowSquidsCanFly = false; public boolean glowSquidTakeDamageFromWater = false; @@ -1492,7 +1492,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean goatRidable = false; -@@ -1631,6 +1673,7 @@ public class PurpurWorldConfig { +@@ -1636,6 +1678,7 @@ public class PurpurWorldConfig { public double goatMaxHealth = 10.0D; public int goatBreedingTicks = 6000; public boolean goatTakeDamageFromWater = false; @@ -1500,7 +1500,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void goatSettings() { goatRidable = getBoolean("mobs.goat.ridable", goatRidable); goatRidableInWater = getBoolean("mobs.goat.ridable-in-water", goatRidableInWater); -@@ -1638,12 +1681,14 @@ public class PurpurWorldConfig { +@@ -1643,12 +1686,14 @@ public class PurpurWorldConfig { goatMaxHealth = getDouble("mobs.goat.attributes.max_health", goatMaxHealth); goatBreedingTicks = getInt("mobs.goat.breeding-delay-ticks", goatBreedingTicks); goatTakeDamageFromWater = getBoolean("mobs.goat.takes-damage-from-water", goatTakeDamageFromWater); @@ -1515,7 +1515,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void guardianSettings() { guardianRidable = getBoolean("mobs.guardian.ridable", guardianRidable); guardianControllable = getBoolean("mobs.guardian.controllable", guardianControllable); -@@ -1654,6 +1699,7 @@ public class PurpurWorldConfig { +@@ -1659,6 +1704,7 @@ public class PurpurWorldConfig { } guardianMaxHealth = getDouble("mobs.guardian.attributes.max_health", guardianMaxHealth); guardianTakeDamageFromWater = getBoolean("mobs.guardian.takes-damage-from-water", guardianTakeDamageFromWater); @@ -1523,7 +1523,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean hoglinRidable = false; -@@ -1662,6 +1708,7 @@ public class PurpurWorldConfig { +@@ -1667,6 +1713,7 @@ public class PurpurWorldConfig { public double hoglinMaxHealth = 40.0D; public int hoglinBreedingTicks = 6000; public boolean hoglinTakeDamageFromWater = false; @@ -1531,7 +1531,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void hoglinSettings() { hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable); hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater); -@@ -1674,6 +1721,7 @@ public class PurpurWorldConfig { +@@ -1679,6 +1726,7 @@ public class PurpurWorldConfig { hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth); hoglinBreedingTicks = getInt("mobs.hoglin.breeding-delay-ticks", hoglinBreedingTicks); hoglinTakeDamageFromWater = getBoolean("mobs.hoglin.takes-damage-from-water", hoglinTakeDamageFromWater); @@ -1539,7 +1539,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean horseRidableInWater = false; -@@ -1685,6 +1733,7 @@ public class PurpurWorldConfig { +@@ -1690,6 +1738,7 @@ public class PurpurWorldConfig { public double horseMovementSpeedMax = 0.3375D; public int horseBreedingTicks = 6000; public boolean horseTakeDamageFromWater = false; @@ -1547,7 +1547,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void horseSettings() { horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater); if (PurpurConfig.version < 10) { -@@ -1702,6 +1751,7 @@ public class PurpurWorldConfig { +@@ -1707,6 +1756,7 @@ public class PurpurWorldConfig { horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax); horseBreedingTicks = getInt("mobs.horse.breeding-delay-ticks", horseBreedingTicks); horseTakeDamageFromWater = getBoolean("mobs.horse.takes-damage-from-water", horseTakeDamageFromWater); @@ -1555,7 +1555,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean huskRidable = false; -@@ -1713,6 +1763,7 @@ public class PurpurWorldConfig { +@@ -1718,6 +1768,7 @@ public class PurpurWorldConfig { public double huskJockeyChance = 0.05D; public boolean huskJockeyTryExistingChickens = true; public boolean huskTakeDamageFromWater = false; @@ -1563,7 +1563,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void huskSettings() { huskRidable = getBoolean("mobs.husk.ridable", huskRidable); huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater); -@@ -1728,6 +1779,7 @@ public class PurpurWorldConfig { +@@ -1733,6 +1784,7 @@ public class PurpurWorldConfig { huskJockeyChance = getDouble("mobs.husk.jockey.chance", huskJockeyChance); huskJockeyTryExistingChickens = getBoolean("mobs.husk.jockey.try-existing-chickens", huskJockeyTryExistingChickens); huskTakeDamageFromWater = getBoolean("mobs.husk.takes-damage-from-water", huskTakeDamageFromWater); @@ -1571,7 +1571,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean illusionerRidable = false; -@@ -1737,6 +1789,7 @@ public class PurpurWorldConfig { +@@ -1742,6 +1794,7 @@ public class PurpurWorldConfig { public double illusionerFollowRange = 18.0D; public double illusionerMaxHealth = 32.0D; public boolean illusionerTakeDamageFromWater = false; @@ -1579,7 +1579,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void illusionerSettings() { illusionerRidable = getBoolean("mobs.illusioner.ridable", illusionerRidable); illusionerRidableInWater = getBoolean("mobs.illusioner.ridable-in-water", illusionerRidableInWater); -@@ -1754,6 +1807,7 @@ public class PurpurWorldConfig { +@@ -1759,6 +1812,7 @@ public class PurpurWorldConfig { } illusionerMaxHealth = getDouble("mobs.illusioner.attributes.max_health", illusionerMaxHealth); illusionerTakeDamageFromWater = getBoolean("mobs.illusioner.takes-damage-from-water", illusionerTakeDamageFromWater); @@ -1587,7 +1587,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean ironGolemRidable = false; -@@ -1764,6 +1818,7 @@ public class PurpurWorldConfig { +@@ -1769,6 +1823,7 @@ public class PurpurWorldConfig { public boolean ironGolemTakeDamageFromWater = false; public boolean ironGolemPoppyCalm = false; public boolean ironGolemHealCalm = false; @@ -1595,7 +1595,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void ironGolemSettings() { ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable); ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater); -@@ -1778,6 +1833,7 @@ public class PurpurWorldConfig { +@@ -1783,6 +1838,7 @@ public class PurpurWorldConfig { ironGolemTakeDamageFromWater = getBoolean("mobs.iron_golem.takes-damage-from-water", ironGolemTakeDamageFromWater); ironGolemPoppyCalm = getBoolean("mobs.iron_golem.poppy-calms-anger", ironGolemPoppyCalm); ironGolemHealCalm = getBoolean("mobs.iron_golem.healing-calms-anger", ironGolemHealCalm); @@ -1603,7 +1603,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean llamaRidable = false; -@@ -1792,6 +1848,7 @@ public class PurpurWorldConfig { +@@ -1797,6 +1853,7 @@ public class PurpurWorldConfig { public int llamaBreedingTicks = 6000; public boolean llamaTakeDamageFromWater = false; public boolean llamaJoinCaravans = true; @@ -1611,7 +1611,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void llamaSettings() { llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable); llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater); -@@ -1815,6 +1872,7 @@ public class PurpurWorldConfig { +@@ -1820,6 +1877,7 @@ public class PurpurWorldConfig { llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks); llamaTakeDamageFromWater = getBoolean("mobs.llama.takes-damage-from-water", llamaTakeDamageFromWater); llamaJoinCaravans = getBoolean("mobs.llama.join-caravans", llamaJoinCaravans); @@ -1619,7 +1619,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean magmaCubeRidable = false; -@@ -1825,6 +1883,7 @@ public class PurpurWorldConfig { +@@ -1830,6 +1888,7 @@ public class PurpurWorldConfig { public Map magmaCubeMaxHealthCache = new HashMap<>(); public Map magmaCubeAttackDamageCache = new HashMap<>(); public boolean magmaCubeTakeDamageFromWater = false; @@ -1627,7 +1627,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void magmaCubeSettings() { magmaCubeRidable = getBoolean("mobs.magma_cube.ridable", magmaCubeRidable); magmaCubeRidableInWater = getBoolean("mobs.magma_cube.ridable-in-water", magmaCubeRidableInWater); -@@ -1839,6 +1898,7 @@ public class PurpurWorldConfig { +@@ -1844,6 +1903,7 @@ public class PurpurWorldConfig { magmaCubeMaxHealthCache.clear(); magmaCubeAttackDamageCache.clear(); magmaCubeTakeDamageFromWater = getBoolean("mobs.magma_cube.takes-damage-from-water", magmaCubeTakeDamageFromWater); @@ -1635,7 +1635,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean mooshroomRidable = false; -@@ -1847,6 +1907,7 @@ public class PurpurWorldConfig { +@@ -1852,6 +1912,7 @@ public class PurpurWorldConfig { public double mooshroomMaxHealth = 10.0D; public int mooshroomBreedingTicks = 6000; public boolean mooshroomTakeDamageFromWater = false; @@ -1643,7 +1643,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void mooshroomSettings() { mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable); mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater); -@@ -1859,6 +1920,7 @@ public class PurpurWorldConfig { +@@ -1864,6 +1925,7 @@ public class PurpurWorldConfig { mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth); mooshroomBreedingTicks = getInt("mobs.mooshroom.breeding-delay-ticks", mooshroomBreedingTicks); mooshroomTakeDamageFromWater = getBoolean("mobs.mooshroom.takes-damage-from-water", mooshroomTakeDamageFromWater); @@ -1651,7 +1651,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean muleRidableInWater = false; -@@ -1870,6 +1932,7 @@ public class PurpurWorldConfig { +@@ -1875,6 +1937,7 @@ public class PurpurWorldConfig { public double muleMovementSpeedMax = 0.175D; public int muleBreedingTicks = 6000; public boolean muleTakeDamageFromWater = false; @@ -1659,7 +1659,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void muleSettings() { muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater); if (PurpurConfig.version < 10) { -@@ -1887,6 +1950,7 @@ public class PurpurWorldConfig { +@@ -1892,6 +1955,7 @@ public class PurpurWorldConfig { muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax); muleBreedingTicks = getInt("mobs.mule.breeding-delay-ticks", muleBreedingTicks); muleTakeDamageFromWater = getBoolean("mobs.mule.takes-damage-from-water", muleTakeDamageFromWater); @@ -1667,7 +1667,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean ocelotRidable = false; -@@ -1895,6 +1959,7 @@ public class PurpurWorldConfig { +@@ -1900,6 +1964,7 @@ public class PurpurWorldConfig { public double ocelotMaxHealth = 10.0D; public int ocelotBreedingTicks = 6000; public boolean ocelotTakeDamageFromWater = false; @@ -1675,7 +1675,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void ocelotSettings() { ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable); ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater); -@@ -1907,6 +1972,7 @@ public class PurpurWorldConfig { +@@ -1912,6 +1977,7 @@ public class PurpurWorldConfig { ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth); ocelotBreedingTicks = getInt("mobs.ocelot.breeding-delay-ticks", ocelotBreedingTicks); ocelotTakeDamageFromWater = getBoolean("mobs.ocelot.takes-damage-from-water", ocelotTakeDamageFromWater); @@ -1683,7 +1683,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean pandaRidable = false; -@@ -1915,6 +1981,7 @@ public class PurpurWorldConfig { +@@ -1920,6 +1986,7 @@ public class PurpurWorldConfig { public double pandaMaxHealth = 20.0D; public int pandaBreedingTicks = 6000; public boolean pandaTakeDamageFromWater = false; @@ -1691,7 +1691,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void pandaSettings() { pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable); pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater); -@@ -1927,6 +1994,7 @@ public class PurpurWorldConfig { +@@ -1932,6 +1999,7 @@ public class PurpurWorldConfig { pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth); pandaBreedingTicks = getInt("mobs.panda.breeding-delay-ticks", pandaBreedingTicks); pandaTakeDamageFromWater = getBoolean("mobs.panda.takes-damage-from-water", pandaTakeDamageFromWater); @@ -1699,7 +1699,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean parrotRidable = false; -@@ -1936,6 +2004,7 @@ public class PurpurWorldConfig { +@@ -1941,6 +2009,7 @@ public class PurpurWorldConfig { public double parrotMaxHealth = 6.0D; public boolean parrotTakeDamageFromWater = false; public boolean parrotBreedable = false; @@ -1707,7 +1707,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void parrotSettings() { parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable); parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater); -@@ -1949,6 +2018,7 @@ public class PurpurWorldConfig { +@@ -1954,6 +2023,7 @@ public class PurpurWorldConfig { parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth); parrotTakeDamageFromWater = getBoolean("mobs.parrot.takes-damage-from-water", parrotTakeDamageFromWater); parrotBreedable = getBoolean("mobs.parrot.can-breed", parrotBreedable); @@ -1715,7 +1715,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean phantomRidable = false; -@@ -1976,6 +2046,7 @@ public class PurpurWorldConfig { +@@ -1981,6 +2051,7 @@ public class PurpurWorldConfig { public boolean phantomBurnInDaylight = true; public boolean phantomFlamesOnSwoop = false; public boolean phantomTakeDamageFromWater = false; @@ -1723,7 +1723,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -2011,6 +2082,7 @@ public class PurpurWorldConfig { +@@ -2016,6 +2087,7 @@ public class PurpurWorldConfig { phantomIgnorePlayersWithTorch = getBoolean("mobs.phantom.ignore-players-with-torch", phantomIgnorePlayersWithTorch); phantomFlamesOnSwoop = getBoolean("mobs.phantom.flames-on-swoop", phantomFlamesOnSwoop); phantomTakeDamageFromWater = getBoolean("mobs.phantom.takes-damage-from-water", phantomTakeDamageFromWater); @@ -1731,7 +1731,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean pigRidable = false; -@@ -2020,6 +2092,7 @@ public class PurpurWorldConfig { +@@ -2025,6 +2097,7 @@ public class PurpurWorldConfig { public boolean pigGiveSaddleBack = false; public int pigBreedingTicks = 6000; public boolean pigTakeDamageFromWater = false; @@ -1739,7 +1739,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void pigSettings() { pigRidable = getBoolean("mobs.pig.ridable", pigRidable); pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater); -@@ -2033,6 +2106,7 @@ public class PurpurWorldConfig { +@@ -2038,6 +2111,7 @@ public class PurpurWorldConfig { pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack); pigBreedingTicks = getInt("mobs.pig.breeding-delay-ticks", pigBreedingTicks); pigTakeDamageFromWater = getBoolean("mobs.pig.takes-damage-from-water", pigTakeDamageFromWater); @@ -1747,7 +1747,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean piglinRidable = false; -@@ -2042,6 +2116,7 @@ public class PurpurWorldConfig { +@@ -2047,6 +2121,7 @@ public class PurpurWorldConfig { public boolean piglinBypassMobGriefing = false; public boolean piglinTakeDamageFromWater = false; public int piglinPortalSpawnModifier = 2000; @@ -1755,7 +1755,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void piglinSettings() { piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable); piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater); -@@ -2055,6 +2130,7 @@ public class PurpurWorldConfig { +@@ -2060,6 +2135,7 @@ public class PurpurWorldConfig { piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing); piglinTakeDamageFromWater = getBoolean("mobs.piglin.takes-damage-from-water", piglinTakeDamageFromWater); piglinPortalSpawnModifier = getInt("mobs.piglin.portal-spawn-modifier", piglinPortalSpawnModifier); @@ -1763,7 +1763,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean piglinBruteRidable = false; -@@ -2062,6 +2138,7 @@ public class PurpurWorldConfig { +@@ -2067,6 +2143,7 @@ public class PurpurWorldConfig { public boolean piglinBruteControllable = true; public double piglinBruteMaxHealth = 50.0D; public boolean piglinBruteTakeDamageFromWater = false; @@ -1771,7 +1771,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void piglinBruteSettings() { piglinBruteRidable = getBoolean("mobs.piglin_brute.ridable", piglinBruteRidable); piglinBruteRidableInWater = getBoolean("mobs.piglin_brute.ridable-in-water", piglinBruteRidableInWater); -@@ -2073,6 +2150,7 @@ public class PurpurWorldConfig { +@@ -2078,6 +2155,7 @@ public class PurpurWorldConfig { } piglinBruteMaxHealth = getDouble("mobs.piglin_brute.attributes.max_health", piglinBruteMaxHealth); piglinBruteTakeDamageFromWater = getBoolean("mobs.piglin_brute.takes-damage-from-water", piglinBruteTakeDamageFromWater); @@ -1779,7 +1779,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean pillagerRidable = false; -@@ -2081,6 +2159,7 @@ public class PurpurWorldConfig { +@@ -2086,6 +2164,7 @@ public class PurpurWorldConfig { public double pillagerMaxHealth = 24.0D; public boolean pillagerBypassMobGriefing = false; public boolean pillagerTakeDamageFromWater = false; @@ -1787,7 +1787,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void pillagerSettings() { pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable); pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater); -@@ -2093,6 +2172,7 @@ public class PurpurWorldConfig { +@@ -2098,6 +2177,7 @@ public class PurpurWorldConfig { pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth); pillagerBypassMobGriefing = getBoolean("mobs.pillager.bypass-mob-griefing", pillagerBypassMobGriefing); pillagerTakeDamageFromWater = getBoolean("mobs.pillager.takes-damage-from-water", pillagerTakeDamageFromWater); @@ -1795,7 +1795,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean polarBearRidable = false; -@@ -2103,6 +2183,7 @@ public class PurpurWorldConfig { +@@ -2108,6 +2188,7 @@ public class PurpurWorldConfig { public Item polarBearBreedableItem = null; public int polarBearBreedingTicks = 6000; public boolean polarBearTakeDamageFromWater = false; @@ -1803,7 +1803,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void polarBearSettings() { polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable); polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater); -@@ -2118,12 +2199,14 @@ public class PurpurWorldConfig { +@@ -2123,12 +2204,14 @@ public class PurpurWorldConfig { if (item != Items.AIR) polarBearBreedableItem = item; polarBearBreedingTicks = getInt("mobs.polar_bear.breeding-delay-ticks", polarBearBreedingTicks); polarBearTakeDamageFromWater = getBoolean("mobs.polar_bear.takes-damage-from-water", polarBearTakeDamageFromWater); @@ -1818,7 +1818,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void pufferfishSettings() { pufferfishRidable = getBoolean("mobs.pufferfish.ridable", pufferfishRidable); pufferfishControllable = getBoolean("mobs.pufferfish.controllable", pufferfishControllable); -@@ -2134,6 +2217,7 @@ public class PurpurWorldConfig { +@@ -2139,6 +2222,7 @@ public class PurpurWorldConfig { } pufferfishMaxHealth = getDouble("mobs.pufferfish.attributes.max_health", pufferfishMaxHealth); pufferfishTakeDamageFromWater = getBoolean("mobs.pufferfish.takes-damage-from-water", pufferfishTakeDamageFromWater); @@ -1826,7 +1826,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean rabbitRidable = false; -@@ -2145,6 +2229,7 @@ public class PurpurWorldConfig { +@@ -2150,6 +2234,7 @@ public class PurpurWorldConfig { public int rabbitBreedingTicks = 6000; public boolean rabbitBypassMobGriefing = false; public boolean rabbitTakeDamageFromWater = false; @@ -1834,7 +1834,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void rabbitSettings() { rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable); rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater); -@@ -2160,6 +2245,7 @@ public class PurpurWorldConfig { +@@ -2165,6 +2250,7 @@ public class PurpurWorldConfig { rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks); rabbitBypassMobGriefing = getBoolean("mobs.rabbit.bypass-mob-griefing", rabbitBypassMobGriefing); rabbitTakeDamageFromWater = getBoolean("mobs.rabbit.takes-damage-from-water", rabbitTakeDamageFromWater); @@ -1842,7 +1842,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean ravagerRidable = false; -@@ -2169,6 +2255,7 @@ public class PurpurWorldConfig { +@@ -2174,6 +2260,7 @@ public class PurpurWorldConfig { public boolean ravagerBypassMobGriefing = false; public boolean ravagerTakeDamageFromWater = false; public List ravagerGriefableBlocks = new ArrayList<>(); @@ -1850,7 +1850,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void ravagerSettings() { ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable); ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater); -@@ -2198,12 +2285,14 @@ public class PurpurWorldConfig { +@@ -2203,12 +2290,14 @@ public class PurpurWorldConfig { ravagerGriefableBlocks.add(block); } }); @@ -1865,7 +1865,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void salmonSettings() { salmonRidable = getBoolean("mobs.salmon.ridable", salmonRidable); salmonControllable = getBoolean("mobs.salmon.controllable", salmonControllable); -@@ -2214,6 +2303,7 @@ public class PurpurWorldConfig { +@@ -2219,6 +2308,7 @@ public class PurpurWorldConfig { } salmonMaxHealth = getDouble("mobs.salmon.attributes.max_health", salmonMaxHealth); salmonTakeDamageFromWater = getBoolean("mobs.salmon.takes-damage-from-water", salmonTakeDamageFromWater); @@ -1873,7 +1873,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean sheepRidable = false; -@@ -2223,6 +2313,7 @@ public class PurpurWorldConfig { +@@ -2228,6 +2318,7 @@ public class PurpurWorldConfig { public int sheepBreedingTicks = 6000; public boolean sheepBypassMobGriefing = false; public boolean sheepTakeDamageFromWater = false; @@ -1881,7 +1881,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void sheepSettings() { sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable); sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater); -@@ -2236,6 +2327,7 @@ public class PurpurWorldConfig { +@@ -2241,6 +2332,7 @@ public class PurpurWorldConfig { sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks); sheepBypassMobGriefing = getBoolean("mobs.sheep.bypass-mob-griefing", sheepBypassMobGriefing); sheepTakeDamageFromWater = getBoolean("mobs.sheep.takes-damage-from-water", sheepTakeDamageFromWater); @@ -1889,7 +1889,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean shulkerRidable = false; -@@ -2249,6 +2341,7 @@ public class PurpurWorldConfig { +@@ -2254,6 +2346,7 @@ public class PurpurWorldConfig { public String shulkerSpawnFromBulletNearbyEquation = "(nearby - 1) / 5.0"; public boolean shulkerSpawnFromBulletRandomColor = false; public boolean shulkerChangeColorWithDye = false; @@ -1897,7 +1897,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void shulkerSettings() { shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable); shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater); -@@ -2266,6 +2359,7 @@ public class PurpurWorldConfig { +@@ -2271,6 +2364,7 @@ public class PurpurWorldConfig { shulkerSpawnFromBulletNearbyEquation = getString("mobs.shulker.spawn-from-bullet.nearby-equation", shulkerSpawnFromBulletNearbyEquation); shulkerSpawnFromBulletRandomColor = getBoolean("mobs.shulker.spawn-from-bullet.random-color", shulkerSpawnFromBulletRandomColor); shulkerChangeColorWithDye = getBoolean("mobs.shulker.change-color-with-dye", shulkerChangeColorWithDye); @@ -1905,7 +1905,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean silverfishRidable = false; -@@ -2274,6 +2368,7 @@ public class PurpurWorldConfig { +@@ -2279,6 +2373,7 @@ public class PurpurWorldConfig { public double silverfishMaxHealth = 8.0D; public boolean silverfishBypassMobGriefing = false; public boolean silverfishTakeDamageFromWater = false; @@ -1913,7 +1913,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void silverfishSettings() { silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable); silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater); -@@ -2286,6 +2381,7 @@ public class PurpurWorldConfig { +@@ -2291,6 +2386,7 @@ public class PurpurWorldConfig { silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth); silverfishBypassMobGriefing = getBoolean("mobs.silverfish.bypass-mob-griefing", silverfishBypassMobGriefing); silverfishTakeDamageFromWater = getBoolean("mobs.silverfish.takes-damage-from-water", silverfishTakeDamageFromWater); @@ -1921,7 +1921,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean skeletonRidable = false; -@@ -2293,6 +2389,7 @@ public class PurpurWorldConfig { +@@ -2298,6 +2394,7 @@ public class PurpurWorldConfig { public boolean skeletonControllable = true; public double skeletonMaxHealth = 20.0D; public boolean skeletonTakeDamageFromWater = false; @@ -1929,7 +1929,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void skeletonSettings() { skeletonRidable = getBoolean("mobs.skeleton.ridable", skeletonRidable); skeletonRidableInWater = getBoolean("mobs.skeleton.ridable-in-water", skeletonRidableInWater); -@@ -2304,6 +2401,7 @@ public class PurpurWorldConfig { +@@ -2309,6 +2406,7 @@ public class PurpurWorldConfig { } skeletonMaxHealth = getDouble("mobs.skeleton.attributes.max_health", skeletonMaxHealth); skeletonTakeDamageFromWater = getBoolean("mobs.skeleton.takes-damage-from-water", skeletonTakeDamageFromWater); @@ -1937,7 +1937,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean skeletonHorseRidableInWater = true; -@@ -2315,6 +2413,7 @@ public class PurpurWorldConfig { +@@ -2320,6 +2418,7 @@ public class PurpurWorldConfig { public double skeletonHorseMovementSpeedMin = 0.2D; public double skeletonHorseMovementSpeedMax = 0.2D; public boolean skeletonHorseTakeDamageFromWater = false; @@ -1945,7 +1945,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void skeletonHorseSettings() { skeletonHorseRidableInWater = getBoolean("mobs.skeleton_horse.ridable-in-water", skeletonHorseRidableInWater); skeletonHorseCanSwim = getBoolean("mobs.skeleton_horse.can-swim", skeletonHorseCanSwim); -@@ -2331,6 +2430,7 @@ public class PurpurWorldConfig { +@@ -2336,6 +2435,7 @@ public class PurpurWorldConfig { skeletonHorseMovementSpeedMin = getDouble("mobs.skeleton_horse.attributes.movement_speed.min", skeletonHorseMovementSpeedMin); skeletonHorseMovementSpeedMax = getDouble("mobs.skeleton_horse.attributes.movement_speed.max", skeletonHorseMovementSpeedMax); skeletonHorseTakeDamageFromWater = getBoolean("mobs.skeleton_horse.takes-damage-from-water", skeletonHorseTakeDamageFromWater); @@ -1953,7 +1953,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean slimeRidable = false; -@@ -2341,6 +2441,7 @@ public class PurpurWorldConfig { +@@ -2346,6 +2446,7 @@ public class PurpurWorldConfig { public Map slimeMaxHealthCache = new HashMap<>(); public Map slimeAttackDamageCache = new HashMap<>(); public boolean slimeTakeDamageFromWater = false; @@ -1961,7 +1961,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void slimeSettings() { slimeRidable = getBoolean("mobs.slime.ridable", slimeRidable); slimeRidableInWater = getBoolean("mobs.slime.ridable-in-water", slimeRidableInWater); -@@ -2355,6 +2456,7 @@ public class PurpurWorldConfig { +@@ -2360,6 +2461,7 @@ public class PurpurWorldConfig { slimeMaxHealthCache.clear(); slimeAttackDamageCache.clear(); slimeTakeDamageFromWater = getBoolean("mobs.slime.takes-damage-from-water", slimeTakeDamageFromWater); @@ -1969,7 +1969,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean snowGolemRidable = false; -@@ -2370,6 +2472,7 @@ public class PurpurWorldConfig { +@@ -2375,6 +2477,7 @@ public class PurpurWorldConfig { public double snowGolemAttackDistance = 1.25D; public boolean snowGolemBypassMobGriefing = false; public boolean snowGolemTakeDamageFromWater = true; @@ -1977,7 +1977,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -2389,6 +2492,7 @@ public class PurpurWorldConfig { +@@ -2394,6 +2497,7 @@ public class PurpurWorldConfig { snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance); snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing); snowGolemTakeDamageFromWater = getBoolean("mobs.snow_golem.takes-damage-from-water", snowGolemTakeDamageFromWater); @@ -1985,7 +1985,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean snifferRidable = false; -@@ -2411,6 +2515,7 @@ public class PurpurWorldConfig { +@@ -2416,6 +2520,7 @@ public class PurpurWorldConfig { public double squidOffsetWaterCheck = 0.0D; public boolean squidsCanFly = false; public boolean squidTakeDamageFromWater = false; @@ -1993,7 +1993,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void squidSettings() { squidRidable = getBoolean("mobs.squid.ridable", squidRidable); squidControllable = getBoolean("mobs.squid.controllable", squidControllable); -@@ -2424,6 +2529,7 @@ public class PurpurWorldConfig { +@@ -2429,6 +2534,7 @@ public class PurpurWorldConfig { squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck); squidsCanFly = getBoolean("mobs.squid.can-fly", squidsCanFly); squidTakeDamageFromWater = getBoolean("mobs.squid.takes-damage-from-water", squidTakeDamageFromWater); @@ -2001,7 +2001,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean spiderRidable = false; -@@ -2431,6 +2537,7 @@ public class PurpurWorldConfig { +@@ -2436,6 +2542,7 @@ public class PurpurWorldConfig { public boolean spiderControllable = true; public double spiderMaxHealth = 16.0D; public boolean spiderTakeDamageFromWater = false; @@ -2009,7 +2009,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void spiderSettings() { spiderRidable = getBoolean("mobs.spider.ridable", spiderRidable); spiderRidableInWater = getBoolean("mobs.spider.ridable-in-water", spiderRidableInWater); -@@ -2442,6 +2549,7 @@ public class PurpurWorldConfig { +@@ -2447,6 +2554,7 @@ public class PurpurWorldConfig { } spiderMaxHealth = getDouble("mobs.spider.attributes.max_health", spiderMaxHealth); spiderTakeDamageFromWater = getBoolean("mobs.spider.takes-damage-from-water", spiderTakeDamageFromWater); @@ -2017,7 +2017,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean strayRidable = false; -@@ -2449,6 +2557,7 @@ public class PurpurWorldConfig { +@@ -2454,6 +2562,7 @@ public class PurpurWorldConfig { public boolean strayControllable = true; public double strayMaxHealth = 20.0D; public boolean strayTakeDamageFromWater = false; @@ -2025,7 +2025,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void straySettings() { strayRidable = getBoolean("mobs.stray.ridable", strayRidable); strayRidableInWater = getBoolean("mobs.stray.ridable-in-water", strayRidableInWater); -@@ -2460,6 +2569,7 @@ public class PurpurWorldConfig { +@@ -2465,6 +2574,7 @@ public class PurpurWorldConfig { } strayMaxHealth = getDouble("mobs.stray.attributes.max_health", strayMaxHealth); strayTakeDamageFromWater = getBoolean("mobs.stray.takes-damage-from-water", strayTakeDamageFromWater); @@ -2033,7 +2033,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean striderRidable = false; -@@ -2469,6 +2579,7 @@ public class PurpurWorldConfig { +@@ -2474,6 +2584,7 @@ public class PurpurWorldConfig { public int striderBreedingTicks = 6000; public boolean striderGiveSaddleBack = false; public boolean striderTakeDamageFromWater = true; @@ -2041,7 +2041,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void striderSettings() { striderRidable = getBoolean("mobs.strider.ridable", striderRidable); striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater); -@@ -2482,6 +2593,7 @@ public class PurpurWorldConfig { +@@ -2487,6 +2598,7 @@ public class PurpurWorldConfig { striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks); striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack); striderTakeDamageFromWater = getBoolean("mobs.strider.takes-damage-from-water", striderTakeDamageFromWater); @@ -2049,7 +2049,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean tadpoleRidable = false; -@@ -2504,6 +2616,7 @@ public class PurpurWorldConfig { +@@ -2509,6 +2621,7 @@ public class PurpurWorldConfig { public double traderLlamaMovementSpeedMax = 0.175D; public int traderLlamaBreedingTicks = 6000; public boolean traderLlamaTakeDamageFromWater = false; @@ -2057,7 +2057,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void traderLlamaSettings() { traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable); traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater); -@@ -2523,12 +2636,14 @@ public class PurpurWorldConfig { +@@ -2528,12 +2641,14 @@ public class PurpurWorldConfig { traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax); traderLlamaBreedingTicks = getInt("mobs.trader_llama.breeding-delay-ticks", traderLlamaBreedingTicks); traderLlamaTakeDamageFromWater = getBoolean("mobs.trader_llama.takes-damage-from-water", traderLlamaTakeDamageFromWater); @@ -2072,7 +2072,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void tropicalFishSettings() { tropicalFishRidable = getBoolean("mobs.tropical_fish.ridable", tropicalFishRidable); tropicalFishControllable = getBoolean("mobs.tropical_fish.controllable", tropicalFishControllable); -@@ -2539,6 +2654,7 @@ public class PurpurWorldConfig { +@@ -2544,6 +2659,7 @@ public class PurpurWorldConfig { } tropicalFishMaxHealth = getDouble("mobs.tropical_fish.attributes.max_health", tropicalFishMaxHealth); tropicalFishTakeDamageFromWater = getBoolean("mobs.tropical_fish.takes-damage-from-water", tropicalFishTakeDamageFromWater); @@ -2080,7 +2080,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean turtleRidable = false; -@@ -2547,6 +2663,7 @@ public class PurpurWorldConfig { +@@ -2552,6 +2668,7 @@ public class PurpurWorldConfig { public double turtleMaxHealth = 30.0D; public int turtleBreedingTicks = 6000; public boolean turtleTakeDamageFromWater = false; @@ -2088,7 +2088,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void turtleSettings() { turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable); turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater); -@@ -2559,6 +2676,7 @@ public class PurpurWorldConfig { +@@ -2564,6 +2681,7 @@ public class PurpurWorldConfig { turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth); turtleBreedingTicks = getInt("mobs.turtle.breeding-delay-ticks", turtleBreedingTicks); turtleTakeDamageFromWater = getBoolean("mobs.turtle.takes-damage-from-water", turtleTakeDamageFromWater); @@ -2096,7 +2096,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean vexRidable = false; -@@ -2567,6 +2685,7 @@ public class PurpurWorldConfig { +@@ -2572,6 +2690,7 @@ public class PurpurWorldConfig { public double vexMaxY = 320D; public double vexMaxHealth = 14.0D; public boolean vexTakeDamageFromWater = false; @@ -2104,7 +2104,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void vexSettings() { vexRidable = getBoolean("mobs.vex.ridable", vexRidable); vexRidableInWater = getBoolean("mobs.vex.ridable-in-water", vexRidableInWater); -@@ -2579,6 +2698,7 @@ public class PurpurWorldConfig { +@@ -2584,6 +2703,7 @@ public class PurpurWorldConfig { } vexMaxHealth = getDouble("mobs.vex.attributes.max_health", vexMaxHealth); vexTakeDamageFromWater = getBoolean("mobs.vex.takes-damage-from-water", vexTakeDamageFromWater); @@ -2112,7 +2112,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean villagerRidable = false; -@@ -2594,6 +2714,7 @@ public class PurpurWorldConfig { +@@ -2599,6 +2719,7 @@ public class PurpurWorldConfig { public boolean villagerBypassMobGriefing = false; public boolean villagerTakeDamageFromWater = false; public boolean villagerAllowTrading = true; @@ -2120,7 +2120,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -2613,6 +2734,7 @@ public class PurpurWorldConfig { +@@ -2618,6 +2739,7 @@ public class PurpurWorldConfig { villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater); villagerAllowTrading = getBoolean("mobs.villager.allow-trading", villagerAllowTrading); @@ -2128,7 +2128,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean vindicatorRidable = false; -@@ -2621,6 +2743,7 @@ public class PurpurWorldConfig { +@@ -2626,6 +2748,7 @@ public class PurpurWorldConfig { public double vindicatorMaxHealth = 24.0D; public double vindicatorJohnnySpawnChance = 0D; public boolean vindicatorTakeDamageFromWater = false; @@ -2136,7 +2136,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void vindicatorSettings() { vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable); vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater); -@@ -2633,6 +2756,7 @@ public class PurpurWorldConfig { +@@ -2638,6 +2761,7 @@ public class PurpurWorldConfig { vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth); vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance); vindicatorTakeDamageFromWater = getBoolean("mobs.vindicator.takes-damage-from-water", vindicatorTakeDamageFromWater); @@ -2144,7 +2144,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean wanderingTraderRidable = false; -@@ -2643,6 +2767,7 @@ public class PurpurWorldConfig { +@@ -2648,6 +2772,7 @@ public class PurpurWorldConfig { public boolean wanderingTraderCanBeLeashed = false; public boolean wanderingTraderTakeDamageFromWater = false; public boolean wanderingTraderAllowTrading = true; @@ -2152,7 +2152,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -2657,6 +2782,7 @@ public class PurpurWorldConfig { +@@ -2662,6 +2787,7 @@ public class PurpurWorldConfig { wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater); wanderingTraderAllowTrading = getBoolean("mobs.wandering_trader.allow-trading", wanderingTraderAllowTrading); @@ -2160,7 +2160,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean wardenRidable = false; -@@ -2673,6 +2799,7 @@ public class PurpurWorldConfig { +@@ -2678,6 +2804,7 @@ public class PurpurWorldConfig { public boolean witchControllable = true; public double witchMaxHealth = 26.0D; public boolean witchTakeDamageFromWater = false; @@ -2168,7 +2168,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void witchSettings() { witchRidable = getBoolean("mobs.witch.ridable", witchRidable); witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater); -@@ -2684,6 +2811,7 @@ public class PurpurWorldConfig { +@@ -2689,6 +2816,7 @@ public class PurpurWorldConfig { } witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth); witchTakeDamageFromWater = getBoolean("mobs.witch.takes-damage-from-water", witchTakeDamageFromWater); @@ -2176,7 +2176,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean witherRidable = false; -@@ -2698,6 +2826,7 @@ public class PurpurWorldConfig { +@@ -2703,6 +2831,7 @@ public class PurpurWorldConfig { public boolean witherCanRideVehicles = false; public float witherExplosionRadius = 1.0F; public boolean witherPlaySpawnSound = true; @@ -2184,7 +2184,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2720,6 +2849,7 @@ public class PurpurWorldConfig { +@@ -2725,6 +2854,7 @@ public class PurpurWorldConfig { witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles); witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius); witherPlaySpawnSound = getBoolean("mobs.wither.play-spawn-sound", witherPlaySpawnSound); @@ -2192,7 +2192,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean witherSkeletonRidable = false; -@@ -2727,6 +2857,7 @@ public class PurpurWorldConfig { +@@ -2732,6 +2862,7 @@ public class PurpurWorldConfig { public boolean witherSkeletonControllable = true; public double witherSkeletonMaxHealth = 20.0D; public boolean witherSkeletonTakeDamageFromWater = false; @@ -2200,7 +2200,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void witherSkeletonSettings() { witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable); witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater); -@@ -2738,6 +2869,7 @@ public class PurpurWorldConfig { +@@ -2743,6 +2874,7 @@ public class PurpurWorldConfig { } witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth); witherSkeletonTakeDamageFromWater = getBoolean("mobs.wither_skeleton.takes-damage-from-water", witherSkeletonTakeDamageFromWater); @@ -2208,7 +2208,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean wolfRidable = false; -@@ -2749,6 +2881,7 @@ public class PurpurWorldConfig { +@@ -2754,6 +2886,7 @@ public class PurpurWorldConfig { public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; public boolean wolfTakeDamageFromWater = false; @@ -2216,7 +2216,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -2768,6 +2901,7 @@ public class PurpurWorldConfig { +@@ -2773,6 +2906,7 @@ public class PurpurWorldConfig { wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid); wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks); wolfTakeDamageFromWater = getBoolean("mobs.wolf.takes-damage-from-water", wolfTakeDamageFromWater); @@ -2224,7 +2224,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean zoglinRidable = false; -@@ -2775,6 +2909,7 @@ public class PurpurWorldConfig { +@@ -2780,6 +2914,7 @@ public class PurpurWorldConfig { public boolean zoglinControllable = true; public double zoglinMaxHealth = 40.0D; public boolean zoglinTakeDamageFromWater = false; @@ -2232,7 +2232,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void zoglinSettings() { zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable); zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater); -@@ -2786,6 +2921,7 @@ public class PurpurWorldConfig { +@@ -2791,6 +2926,7 @@ public class PurpurWorldConfig { } zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth); zoglinTakeDamageFromWater = getBoolean("mobs.zoglin.takes-damage-from-water", zoglinTakeDamageFromWater); @@ -2240,7 +2240,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean zombieRidable = false; -@@ -2799,6 +2935,7 @@ public class PurpurWorldConfig { +@@ -2804,6 +2940,7 @@ public class PurpurWorldConfig { public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public boolean zombieBypassMobGriefing = false; public boolean zombieTakeDamageFromWater = false; @@ -2248,7 +2248,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -2816,6 +2953,7 @@ public class PurpurWorldConfig { +@@ -2821,6 +2958,7 @@ public class PurpurWorldConfig { zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing); zombieTakeDamageFromWater = getBoolean("mobs.zombie.takes-damage-from-water", zombieTakeDamageFromWater); @@ -2256,7 +2256,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean zombieHorseRidableInWater = false; -@@ -2828,6 +2966,7 @@ public class PurpurWorldConfig { +@@ -2833,6 +2971,7 @@ public class PurpurWorldConfig { public double zombieHorseMovementSpeedMax = 0.2D; public double zombieHorseSpawnChance = 0.0D; public boolean zombieHorseTakeDamageFromWater = false; @@ -2264,7 +2264,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void zombieHorseSettings() { zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater); zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim); -@@ -2845,6 +2984,7 @@ public class PurpurWorldConfig { +@@ -2850,6 +2989,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); @@ -2272,7 +2272,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean zombieVillagerRidable = false; -@@ -2859,6 +2999,7 @@ public class PurpurWorldConfig { +@@ -2864,6 +3004,7 @@ public class PurpurWorldConfig { public int zombieVillagerCuringTimeMin = 3600; public int zombieVillagerCuringTimeMax = 6000; public boolean zombieVillagerCureEnabled = true; @@ -2280,7 +2280,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -2872,6 +3013,7 @@ public class PurpurWorldConfig { +@@ -2877,6 +3018,7 @@ public class PurpurWorldConfig { zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin); zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax); zombieVillagerCureEnabled = getBoolean("mobs.zombie_villager.cure.enabled", zombieVillagerCureEnabled); @@ -2288,7 +2288,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 } public boolean zombifiedPiglinRidable = false; -@@ -2884,6 +3026,7 @@ public class PurpurWorldConfig { +@@ -2889,6 +3031,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyTryExistingChickens = true; public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true; public boolean zombifiedPiglinTakeDamageFromWater = false; @@ -2296,7 +2296,7 @@ index 00e147d0097e4797b378310154942a141f6e1298..c70fc012709293fd01d996a55a49d500 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -2900,6 +3043,7 @@ public class PurpurWorldConfig { +@@ -2905,6 +3048,7 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater); diff --git a/patches/server/0228-Potion-NamespacedKey.patch b/patches/server/0229-Potion-NamespacedKey.patch similarity index 100% rename from patches/server/0228-Potion-NamespacedKey.patch rename to patches/server/0229-Potion-NamespacedKey.patch diff --git a/patches/server/0229-Grindstone-API.patch b/patches/server/0230-Grindstone-API.patch similarity index 100% rename from patches/server/0229-Grindstone-API.patch rename to patches/server/0230-Grindstone-API.patch diff --git a/patches/server/0275-Remove-Timings.patch b/patches/server/0272-Remove-Timings.patch similarity index 99% rename from patches/server/0275-Remove-Timings.patch rename to patches/server/0272-Remove-Timings.patch index 908d12f41..dd4c46769 100644 --- a/patches/server/0275-Remove-Timings.patch +++ b/patches/server/0272-Remove-Timings.patch @@ -600,10 +600,10 @@ index c490c88fd7798c0ac186b1de22a0dfc433adc431..48e259562bd46075e4d64ed1a291e32c } else if (close) { chunkproviderserver.close(false); } // Paper - rewrite chunk system diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c38f235b069b85e6ad6ebd0bdd528a109b310350..9440d259e3dd5f9b47186980c44e2ac4b54dfcd0 100644 +index d3158d0bea38780463e7fcc4cf2a27f96eef3331..1205b3099fdaa56e2d45e46b650fb602892e9c8b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2594,7 +2594,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2585,7 +2585,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } } // Paper End @@ -612,7 +612,7 @@ index c38f235b069b85e6ad6ebd0bdd528a109b310350..9440d259e3dd5f9b47186980c44e2ac4 if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s); -@@ -2604,7 +2604,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2595,7 +2595,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.cserver.getPluginManager().callEvent(event); if (event.isCancelled()) { @@ -621,7 +621,7 @@ index c38f235b069b85e6ad6ebd0bdd528a109b310350..9440d259e3dd5f9b47186980c44e2ac4 return; } -@@ -2617,7 +2617,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2608,7 +2608,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex); return; } finally { diff --git a/patches/server/0278-Remove-Mojang-Profiler.patch b/patches/server/0273-Remove-Mojang-Profiler.patch similarity index 99% rename from patches/server/0278-Remove-Mojang-Profiler.patch rename to patches/server/0273-Remove-Mojang-Profiler.patch index c2b823a48..e34c77a6f 100644 --- a/patches/server/0278-Remove-Mojang-Profiler.patch +++ b/patches/server/0273-Remove-Mojang-Profiler.patch @@ -793,7 +793,7 @@ index a155e61a95c0fe4fc16d6d18a02a83b6d5b2a930..c3bb1f0d4ea44d88f2f5453e9fc8b109 this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities())); playerlist.sendLevelInfo(this, worldserver); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 9440d259e3dd5f9b47186980c44e2ac4b54dfcd0..bf9635072d4ffc298a5221309bdf329c67e0451a 100644 +index 1205b3099fdaa56e2d45e46b650fb602892e9c8b..eb62c04013d981390524beb74dc37bc2443b844c 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -410,7 +410,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -1770,7 +1770,7 @@ index b4bfddb406fce51d1100976d9445db161dcb3f22..57fceb21ca6bc536a6faf04dbc8ddc78 } diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index dc20ef09fd47f95639ca3de237efe41765fb4cb9..029cceb339c86abe05d9eee944b60c081bffd804 100644 +index 4e2611c9a7df8343f76e3be3f01f2f828cdf8a1d..03fc9c6ef0fb320924038f2730c6f08426f0842c 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -132,7 +132,7 @@ public final class NaturalSpawner { diff --git a/patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0274-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 96% rename from patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0274-Add-more-logger-output-for-invalid-movement-kicks.patch index 3ed362396..d850007c8 100644 --- a/patches/server/0272-Add-more-logger-output-for-invalid-movement-kicks.patch +++ b/patches/server/0274-Add-more-logger-output-for-invalid-movement-kicks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add more logger output for invalid movement kicks diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d3158d0bea38780463e7fcc4cf2a27f96eef3331..c38f235b069b85e6ad6ebd0bdd528a109b310350 100644 +index eb62c04013d981390524beb74dc37bc2443b844c..bf9635072d4ffc298a5221309bdf329c67e0451a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -865,6 +865,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0273-Add-Bee-API.patch b/patches/server/0275-Add-Bee-API.patch similarity index 100% rename from patches/server/0273-Add-Bee-API.patch rename to patches/server/0275-Add-Bee-API.patch diff --git a/patches/server/0274-Debug-Marker-API.patch b/patches/server/0276-Debug-Marker-API.patch similarity index 100% rename from patches/server/0274-Debug-Marker-API.patch rename to patches/server/0276-Debug-Marker-API.patch diff --git a/patches/server/0276-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0277-mob-spawning-option-to-ignore-creative-players.patch similarity index 97% rename from patches/server/0276-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0277-mob-spawning-option-to-ignore-creative-players.patch index fcdb4c764..8a6b0134e 100644 --- a/patches/server/0276-mob-spawning-option-to-ignore-creative-players.patch +++ b/patches/server/0277-mob-spawning-option-to-ignore-creative-players.patch @@ -5,7 +5,7 @@ Subject: [PATCH] mob spawning option to ignore creative players diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java -index 4e2611c9a7df8343f76e3be3f01f2f828cdf8a1d..dc20ef09fd47f95639ca3de237efe41765fb4cb9 100644 +index 03fc9c6ef0fb320924038f2730c6f08426f0842c..029cceb339c86abe05d9eee944b60c081bffd804 100644 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java @@ -260,7 +260,7 @@ public final class NaturalSpawner { diff --git a/patches/server/0277-Add-skeleton-bow-accuracy-option.patch b/patches/server/0278-Add-skeleton-bow-accuracy-option.patch similarity index 100% rename from patches/server/0277-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0278-Add-skeleton-bow-accuracy-option.patch