From 247b99f43373745137adf04abec23165e53c2a55 Mon Sep 17 00:00:00 2001 From: Bierque Jason Date: Thu, 1 Jul 2021 06:06:52 +0200 Subject: [PATCH] Fix silk-touch spawners dropping xp and add config for minimal enchantment level (#454) --- patches/server/0023-Silk-touch-spawners.patch | 18 +++- ...772-Fix-Add-turtle-egg-block-options.patch | 6 +- patches/server/0028-Giants-AI-settings.patch | 6 +- .../0029-Zombie-horse-naturally-spawn.patch | 6 +- ...0030-Charged-creeper-naturally-spawn.patch | 6 +- ...bit-naturally-spawn-toast-and-killer.patch | 6 +- .../server/0034-Tulips-change-fox-type.patch | 6 +- .../server/0035-Breedable-Polar-Bears.patch | 6 +- .../server/0036-Chickens-can-retaliate.patch | 6 +- .../server/0038-Cat-spawning-options.patch | 6 +- patches/server/0040-Cows-eat-mushrooms.patch | 6 +- .../server/0042-Pigs-give-saddle-back.patch | 6 +- ...43-Snowman-drop-and-put-back-pumpkin.patch | 6 +- ...44-Ender-dragon-always-drop-full-exp.patch | 6 +- .../0045-Signs-editable-on-right-click.patch | 4 +- .../server/0046-Signs-allow-color-codes.patch | 4 +- ...moisten-from-water-directly-under-it.patch | 4 +- ...able-loot-drops-on-death-by-cramming.patch | 4 +- ...ption-to-toggle-milk-curing-bad-omen.patch | 4 +- ...-skeleton-takes-wither-damage-option.patch | 6 +- ...low-loyalty-on-tridents-to-work-in-t.patch | 4 +- ...derman-and-creeper-griefing-controls.patch | 10 +- ...0060-Villagers-follow-emerald-blocks.patch | 10 +- .../0061-Allow-leashing-villagers.patch | 10 +- ...urable-search-radius-for-villagers-t.patch | 6 +- .../server/0063-Implement-infinite-lava.patch | 4 +- ...64-Make-lava-flow-speed-configurable.patch | 4 +- ...urable-void-damage-height-and-damage.patch | 4 +- ...ispenser-curse-of-binding-protection.patch | 4 +- ...n-for-boats-to-eject-players-on-land.patch | 4 +- ...g-mends-most-damages-equipment-first.patch | 6 +- .../0077-Configurable-jockey-options.patch | 20 ++-- ...ed-to-crystals-and-crystals-shoot-ph.patch | 6 +- .../0079-Add-phantom-spawning-options.patch | 6 +- ...0080-Implement-bed-explosion-options.patch | 4 +- ...ent-respawn-anchor-explosion-options.patch | 4 +- patches/server/0086-Squid-EAR-immunity.patch | 6 +- .../server/0088-Phantoms-burn-in-light.patch | 6 +- .../0089-Configurable-villager-breeding.patch | 6 +- .../0090-Redstone-deactivates-spawners.patch | 4 +- ...2-Add-vindicator-johnny-spawn-chance.patch | 6 +- .../0094-Dispensers-place-anvils-option.patch | 4 +- patches/server/0095-Allow-anvil-colors.patch | 4 +- .../0096-Add-no-random-tick-block-list.patch | 4 +- ...o-disable-dolphin-treasure-searching.patch | 6 +- ...Stop-squids-floating-on-top-of-water.patch | 6 +- ...tities-can-use-portals-configuration.patch | 6 +- ...stomizable-wither-health-and-healing.patch | 6 +- .../server/0106-Raid-cooldown-setting.patch | 6 +- ...sable-zombie-aggressiveness-towards-.patch | 6 +- ...tent-TileEntity-Lore-and-DisplayName.patch | 6 +- patches/server/0111-Flying-squids-Oh-my.patch | 8 +- patches/server/0113-Stonecutter-damage.patch | 4 +- .../server/0116-Infinite-fuel-furnace.patch | 4 +- ...re-add-farmland-mechanics-from-Alpha.patch | 4 +- ...justable-breeding-cooldown-to-config.patch | 6 +- ...e-entity-breeding-times-configurable.patch | 92 +++++++++---------- ...mes-from-item-forms-of-entities-to-e.patch | 6 +- ...sting-and-weeping-vines-growth-rates.patch | 6 +- ...-twisting-vines-configurable-max-gro.patch | 8 +- ...llowing-Endermen-to-despawn-even-whi.patch | 6 +- ...break-door-minimum-difficulty-option.patch | 6 +- .../0131-Add-boat-fall-damage-config.patch | 8 +- .../0132-Snow-Golem-rate-of-fire-config.patch | 6 +- .../0135-Lobotomize-stuck-villagers.patch | 6 +- ...Villager-Clerics-to-farm-Nether-Wart.patch | 6 +- ...fied-Piglin-death-always-counting-as.patch | 6 +- ...ble-chance-for-wolves-to-spawn-rabid.patch | 6 +- ...nfigurable-default-wolf-collar-color.patch | 6 +- .../server/0141-Phantom-flames-on-swoop.patch | 6 +- ...s-to-open-even-with-a-solid-block-on.patch | 4 +- .../0144-Striders-give-saddle-back.patch | 6 +- ...iefing-bypass-to-everything-affected.patch | 70 +++++++------- ...allow-Note-Block-sounds-when-blocked.patch | 6 +- ...0151-Add-EntityTeleportHinderedEvent.patch | 6 +- .../0153-Farmland-trampling-changes.patch | 4 +- ...oggle-for-water-sensitive-mob-damage.patch | 18 ++-- ...57-Config-to-always-tame-in-Creative.patch | 6 +- .../0158-End-crystal-explosion-options.patch | 4 +- ...ither-Ender-Dragon-can-ride-vehicles.patch | 10 +- ...0163-Add-config-for-snow-on-blue-ice.patch | 4 +- ...an-aggressiveness-towards-Endermites.patch | 6 +- ...-Dragon-Head-wearers-and-stare-aggro.patch | 6 +- patches/server/0169-Tick-fluids-config.patch | 6 +- ...170-Config-to-disable-Llama-caravans.patch | 8 +- ...ig-to-make-Creepers-explode-on-death.patch | 6 +- ...urable-ravager-griefable-blocks-list.patch | 6 +- ...0173-Sneak-to-bulk-process-composter.patch | 4 +- ...0175-Add-config-for-villager-trading.patch | 10 +- ...Break-individual-slabs-when-sneaking.patch | 4 +- ...-to-disable-hostile-mob-spawn-on-ice.patch | 4 +- ...ption-to-make-doors-require-redstone.patch | 4 +- .../0183-Configurable-sponge-absorption.patch | 4 +- ...for-powered-rail-activation-distance.patch | 4 +- .../0186-Piglin-portal-spawn-modifier.patch | 6 +- ...ble-damage-settings-for-magma-blocks.patch | 4 +- ...9-Config-for-wither-explosion-radius.patch | 6 +- .../0192-Configurable-piston-push-limit.patch | 4 +- .../0195-Configurable-mob-blindness.patch | 6 +- ...h-to-impact-Creeper-explosion-radius.patch | 6 +- .../0198-Iron-golem-poppy-calms-anger.patch | 6 +- patches/server/0199-Breedable-parrots.patch | 6 +- ...on-to-disable-dragon-egg-teleporting.patch | 4 +- ...05-ShulkerBox-allow-oversized-stacks.patch | 4 +- ...ee-can-work-when-raining-or-at-night.patch | 6 +- ...Beacon-Activation-Range-Configurable.patch | 4 +- .../0211-Add-toggle-for-sand-duping-fix.patch | 4 +- ...ggle-for-end-portal-safe-teleporting.patch | 4 +- .../server/0217-Populator-seed-controls.patch | 4 +- ...19-Shulker-spawn-from-bullet-options.patch | 6 +- ...1-Option-to-make-drowned-break-doors.patch | 6 +- ...onfigurable-hunger-starvation-damage.patch | 4 +- 112 files changed, 410 insertions(+), 400 deletions(-) diff --git a/patches/server/0023-Silk-touch-spawners.patch b/patches/server/0023-Silk-touch-spawners.patch index ece141791..eab84f696 100644 --- a/patches/server/0023-Silk-touch-spawners.patch +++ b/patches/server/0023-Silk-touch-spawners.patch @@ -30,7 +30,7 @@ index bd52d7d19060b0922c5165a071a5d12123028f79..6322251336a4300649f207efdb4d404d public static final Item CHEST = registerBlock(Blocks.CHEST, CreativeModeTab.TAB_DECORATIONS); public static final Item CRAFTING_TABLE = registerBlock(Blocks.CRAFTING_TABLE, CreativeModeTab.TAB_DECORATIONS); diff --git a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java -index b1e04d41de80971a7a1616beb0860226ecc25045..a42375b6789bb0a386103ad826879032f30ed44b 100644 +index b1e04d41de80971a7a1616beb0860226ecc25045..295ae3877b955978105b756055c21e63cf3b84ab 100644 --- a/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java +++ b/src/main/java/net/minecraft/world/level/block/SpawnerBlock.java @@ -2,8 +2,16 @@ package net.minecraft.world.level.block; @@ -122,18 +122,26 @@ index b1e04d41de80971a7a1616beb0860226ecc25045..a42375b6789bb0a386103ad826879032 + } + + private boolean isSilkTouch(Level level, ItemStack stack) { -+ return stack != null && level.purpurConfig.silkTouchTools.contains(stack.getItem()) && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; ++ return stack != null && level.purpurConfig.silkTouchTools.contains(stack.getItem()) && EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, stack) >= level.purpurConfig.minimumSilkTouchSpawnerRequire; + } + // Purpur end + @Override public void spawnAfterBreak(BlockState state, ServerLevel world, BlockPos pos, ItemStack stack) { super.spawnAfterBreak(state, world, pos, stack); +@@ -42,6 +115,7 @@ public class SpawnerBlock extends BaseEntityBlock { + + @Override + public int getExpDrop(BlockState iblockdata, ServerLevel worldserver, BlockPos blockposition, ItemStack itemstack) { ++ if (isSilkTouch(worldserver, itemstack)) return 0; // Purpur + int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15); + + return i; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 65ca6e4a1c99555842804e5e21415d5f3193d526..6db6885ac937fb62755a2f0ef679ff8f88034a35 100644 +index 65ca6e4a1c99555842804e5e21415d5f3193d526..342bfb84a98292f50373fc3dd288fe37b9ba2eea 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -98,6 +98,29 @@ public class PurpurWorldConfig { +@@ -98,6 +98,31 @@ public class PurpurWorldConfig { playerInvulnerableWhileAcceptingResourcePack = getBoolean("gameplay-mechanics.player.invulnerable-while-accepting-resource-pack", playerInvulnerableWhileAcceptingResourcePack); } @@ -141,9 +149,11 @@ index 65ca6e4a1c99555842804e5e21415d5f3193d526..6db6885ac937fb62755a2f0ef679ff8f + public String silkTouchSpawnerName = "Spawner"; + public List silkTouchSpawnerLore = new ArrayList<>(); + public List silkTouchTools = new ArrayList<>(); ++ public int minimumSilkTouchSpawnerRequire = 1; + private void silkTouchSettings() { + silkTouchEnabled = getBoolean("gameplay-mechanics.silk-touch.enabled", silkTouchEnabled); + silkTouchSpawnerName = getString("gameplay-mechanics.silk-touch.spawner-name", silkTouchSpawnerName); ++ minimumSilkTouchSpawnerRequire = getInt("gameplay-mechanics.silk-touch.minimal-level", minimumSilkTouchSpawnerRequire); + silkTouchSpawnerLore.clear(); + getList("gameplay-mechanics.silk-touch.spawner-lore", new ArrayList(){{ + add("Spawns a {mob}"); diff --git a/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch index d225979ab..c1bb33f12 100644 --- a/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -50,10 +50,10 @@ index fdb3ab919a78221605257ae82bfd026346ce2ffb..e98fc3c235f9160f1928a8afb0d7991a } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6db6885ac937fb62755a2f0ef679ff8f88034a35..f6adc7530c2922282689413572fa6e44cab860ce 100644 +index 342bfb84a98292f50373fc3dd288fe37b9ba2eea..302539a1ecf0ffe6dcae52bdd48565def3c637c1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1052,7 +1052,10 @@ public class PurpurWorldConfig { +@@ -1054,7 +1054,10 @@ public class PurpurWorldConfig { public boolean turtleRidable = false; public boolean turtleRidableInWater = false; public double turtleMaxHealth = 30.0D; @@ -65,7 +65,7 @@ index 6db6885ac937fb62755a2f0ef679ff8f88034a35..f6adc7530c2922282689413572fa6e44 turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable); turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater); if (PurpurConfig.version < 10) { -@@ -1061,6 +1064,9 @@ public class PurpurWorldConfig { +@@ -1063,6 +1066,9 @@ public class PurpurWorldConfig { set("mobs.turtle.attributes.max_health", oldValue); } turtleMaxHealth = getDouble("mobs.turtle.attributes.max_health", turtleMaxHealth); diff --git a/patches/server/0028-Giants-AI-settings.patch b/patches/server/0028-Giants-AI-settings.patch index ddf644218..8881db223 100644 --- a/patches/server/0028-Giants-AI-settings.patch +++ b/patches/server/0028-Giants-AI-settings.patch @@ -120,10 +120,10 @@ index a8ffdc8810152d77668aad7bad15a00c4d194d4c..91e28c414545d2bbb4e2f22c516d0f68 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f6adc7530c2922282689413572fa6e44cab860ce..de6247368af121fcc3e44e8fa75043774cd224f0 100644 +index 302539a1ecf0ffe6dcae52bdd48565def3c637c1..20b2888e9cca71931bacb27f7c1c3a25d2b4680f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -441,6 +441,10 @@ public class PurpurWorldConfig { +@@ -443,6 +443,10 @@ public class PurpurWorldConfig { public double giantMovementSpeed = 0.5D; public double giantAttackDamage = 50.0D; public double giantMaxHealth = 100.0D; @@ -134,7 +134,7 @@ index f6adc7530c2922282689413572fa6e44cab860ce..de6247368af121fcc3e44e8fa7504377 private void giantSettings() { giantRidable = getBoolean("mobs.giant.ridable", giantRidable); giantRidableInWater = getBoolean("mobs.giant.ridable-in-water", giantRidableInWater); -@@ -456,6 +460,10 @@ public class PurpurWorldConfig { +@@ -458,6 +462,10 @@ public class PurpurWorldConfig { set("mobs.giant.attributes.max_health", oldValue); } giantMaxHealth = getDouble("mobs.giant.attributes.max_health", giantMaxHealth); diff --git a/patches/server/0029-Zombie-horse-naturally-spawn.patch b/patches/server/0029-Zombie-horse-naturally-spawn.patch index 752b070b1..af104037c 100644 --- a/patches/server/0029-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0029-Zombie-horse-naturally-spawn.patch @@ -42,10 +42,10 @@ index 004bdf930769974ed02c68b8939af8e96bad88a7..39402063a73fbdbefdbcd7b4f7ea675c LightningBolt entitylightning = (LightningBolt) EntityType.LIGHTNING_BOLT.create((net.minecraft.world.level.Level) this); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index de6247368af121fcc3e44e8fa75043774cd224f0..a91a5c4d2d2eb639c80c91bdacbe0a25cc5225ed 100644 +index 20b2888e9cca71931bacb27f7c1c3a25d2b4680f..a9f3ab3a505535581e75df5d3184f0d54e229983 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1239,6 +1239,7 @@ public class PurpurWorldConfig { +@@ -1241,6 +1241,7 @@ public class PurpurWorldConfig { public double zombieHorseJumpStrengthMax = 1.0D; public double zombieHorseMovementSpeedMin = 0.2D; public double zombieHorseMovementSpeedMax = 0.2D; @@ -53,7 +53,7 @@ index de6247368af121fcc3e44e8fa75043774cd224f0..a91a5c4d2d2eb639c80c91bdacbe0a25 private void zombieHorseSettings() { zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater); zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim); -@@ -1254,6 +1255,7 @@ public class PurpurWorldConfig { +@@ -1256,6 +1257,7 @@ public class PurpurWorldConfig { zombieHorseJumpStrengthMax = getDouble("mobs.zombie_horse.attributes.jump_strength.max", zombieHorseJumpStrengthMax); zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin); zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax); diff --git a/patches/server/0030-Charged-creeper-naturally-spawn.patch b/patches/server/0030-Charged-creeper-naturally-spawn.patch index 028680915..573427acb 100644 --- a/patches/server/0030-Charged-creeper-naturally-spawn.patch +++ b/patches/server/0030-Charged-creeper-naturally-spawn.patch @@ -24,10 +24,10 @@ index b71a6af3c2d1ca2a946b23efb11b0e794840cf25..b2b3630a90c685b0a692efb9bf8bb111 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a91a5c4d2d2eb639c80c91bdacbe0a25cc5225ed..c7a844bb8111dae7c9502ae2cf1660816d3a83f8 100644 +index a9f3ab3a505535581e75df5d3184f0d54e229983..a5d1b872a557a13f58f27d0289027d48a97f9da2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -263,6 +263,7 @@ public class PurpurWorldConfig { +@@ -265,6 +265,7 @@ public class PurpurWorldConfig { public boolean creeperRidable = false; public boolean creeperRidableInWater = false; public double creeperMaxHealth = 20.0D; @@ -35,7 +35,7 @@ index a91a5c4d2d2eb639c80c91bdacbe0a25cc5225ed..c7a844bb8111dae7c9502ae2cf166081 private void creeperSettings() { creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); -@@ -272,6 +273,7 @@ public class PurpurWorldConfig { +@@ -274,6 +275,7 @@ public class PurpurWorldConfig { set("mobs.creeper.attributes.max_health", oldValue); } creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth); diff --git a/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch index 4a9f4c97d..440ed55f3 100644 --- a/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch +++ b/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch @@ -38,10 +38,10 @@ index 587feda351efae19407cb9f23c6c1d42d5ed0cc9..e0ba1ef404c9f8ba1eae563b733d10d9 int i = this.random.nextInt(100); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c7a844bb8111dae7c9502ae2cf1660816d3a83f8..08bfa6591548259906f0e7c82046826aafe6bb33 100644 +index a5d1b872a557a13f58f27d0289027d48a97f9da2..0419865e00cdaa0460a1e5eebbb35ec8df1e95c4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -817,6 +817,8 @@ public class PurpurWorldConfig { +@@ -819,6 +819,8 @@ public class PurpurWorldConfig { public boolean rabbitRidable = false; public boolean rabbitRidableInWater = false; public double rabbitMaxHealth = 3.0D; @@ -50,7 +50,7 @@ index c7a844bb8111dae7c9502ae2cf1660816d3a83f8..08bfa6591548259906f0e7c82046826a private void rabbitSettings() { rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable); rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater); -@@ -826,6 +828,8 @@ public class PurpurWorldConfig { +@@ -828,6 +830,8 @@ public class PurpurWorldConfig { set("mobs.rabbit.attributes.max_health", oldValue); } rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth); diff --git a/patches/server/0034-Tulips-change-fox-type.patch b/patches/server/0034-Tulips-change-fox-type.patch index f5d4ddf7e..4ca17061c 100644 --- a/patches/server/0034-Tulips-change-fox-type.patch +++ b/patches/server/0034-Tulips-change-fox-type.patch @@ -75,10 +75,10 @@ index 80749df5d00df415a1b9e7c0e8586625b6453ffb..406b6ed8084c18da1062d8e8049bdfff // Paper start - Cancellable death event protected org.bukkit.event.entity.EntityDeathEvent dropAllDeathLoot(DamageSource source) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 08bfa6591548259906f0e7c82046826aafe6bb33..9699eb702324e40429510ecc97d0079c7a3b3ae0 100644 +index 0419865e00cdaa0460a1e5eebbb35ec8df1e95c4..581c1853725d9cffc29885402a36a45e8b313e5d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -411,6 +411,7 @@ public class PurpurWorldConfig { +@@ -413,6 +413,7 @@ public class PurpurWorldConfig { public boolean foxRidable = false; public boolean foxRidableInWater = false; public double foxMaxHealth = 10.0D; @@ -86,7 +86,7 @@ index 08bfa6591548259906f0e7c82046826aafe6bb33..9699eb702324e40429510ecc97d0079c private void foxSettings() { foxRidable = getBoolean("mobs.fox.ridable", foxRidable); foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater); -@@ -420,6 +421,7 @@ public class PurpurWorldConfig { +@@ -422,6 +423,7 @@ public class PurpurWorldConfig { set("mobs.fox.attributes.max_health", oldValue); } foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth); diff --git a/patches/server/0035-Breedable-Polar-Bears.patch b/patches/server/0035-Breedable-Polar-Bears.patch index 69dba4dfd..22795864e 100644 --- a/patches/server/0035-Breedable-Polar-Bears.patch +++ b/patches/server/0035-Breedable-Polar-Bears.patch @@ -59,10 +59,10 @@ index 18780fb268cabb47bb0deb84c44520831c1a762b..d39c88af3882a09ff1a06f9052d7b9b8 this.goalSelector.addGoal(5, new RandomStrollGoal(this, 1.0D)); this.goalSelector.addGoal(6, new LookAtPlayerGoal(this, Player.class, 6.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9699eb702324e40429510ecc97d0079c7a3b3ae0..402d11d29369ce2725cb9a8013ffdabbaf79297d 100644 +index 581c1853725d9cffc29885402a36a45e8b313e5d..3b9f366fbb5e96b0b6be616b9184ba5e58c4a9f0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -793,6 +793,8 @@ public class PurpurWorldConfig { +@@ -795,6 +795,8 @@ public class PurpurWorldConfig { public boolean polarBearRidable = false; public boolean polarBearRidableInWater = false; public double polarBearMaxHealth = 30.0D; @@ -71,7 +71,7 @@ index 9699eb702324e40429510ecc97d0079c7a3b3ae0..402d11d29369ce2725cb9a8013ffdabb private void polarBearSettings() { polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable); polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater); -@@ -802,6 +804,9 @@ public class PurpurWorldConfig { +@@ -804,6 +806,9 @@ public class PurpurWorldConfig { set("mobs.polar_bear.attributes.max_health", oldValue); } polarBearMaxHealth = getDouble("mobs.polar_bear.attributes.max_health", polarBearMaxHealth); diff --git a/patches/server/0036-Chickens-can-retaliate.patch b/patches/server/0036-Chickens-can-retaliate.patch index df9482978..c4f9e17fa 100644 --- a/patches/server/0036-Chickens-can-retaliate.patch +++ b/patches/server/0036-Chickens-can-retaliate.patch @@ -51,10 +51,10 @@ index 55dccf338f9fba17fbcb88672d36b83e7bbec88b..eaec6eba96db3b8ce046208a4a1e5fc4 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 402d11d29369ce2725cb9a8013ffdabbaf79297d..631b7dccb648fdb12b7e7232403cac47b90d9125 100644 +index 3b9f366fbb5e96b0b6be616b9184ba5e58c4a9f0..1153271f5e3dab623563c697bff563614f12404b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -223,6 +223,7 @@ public class PurpurWorldConfig { +@@ -225,6 +225,7 @@ public class PurpurWorldConfig { public boolean chickenRidable = false; public boolean chickenRidableInWater = false; public double chickenMaxHealth = 4.0D; @@ -62,7 +62,7 @@ index 402d11d29369ce2725cb9a8013ffdabbaf79297d..631b7dccb648fdb12b7e7232403cac47 private void chickenSettings() { chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable); chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater); -@@ -232,6 +233,7 @@ public class PurpurWorldConfig { +@@ -234,6 +235,7 @@ public class PurpurWorldConfig { set("mobs.chicken.attributes.max_health", oldValue); } chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth); diff --git a/patches/server/0038-Cat-spawning-options.patch b/patches/server/0038-Cat-spawning-options.patch index 458cdf69e..cc2e84f48 100644 --- a/patches/server/0038-Cat-spawning-options.patch +++ b/patches/server/0038-Cat-spawning-options.patch @@ -49,10 +49,10 @@ index 4cab98b5e441a174482893d3d289bbafa1f7a5fc..fa3cdff99a16b67ed86c8f7940ffa139 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 41e3342f37c2b55655b01281c6411ec6dc94f336..eb3d47f97c1dddd809f79cd98017edd810f1671d 100644 +index 316fe00962caa5951a3dccb79f4745d3ab4eba22..5cea174102d346a66dafcbd9c1b524bde53d5168 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -200,6 +200,9 @@ public class PurpurWorldConfig { +@@ -202,6 +202,9 @@ public class PurpurWorldConfig { public boolean catRidable = false; public boolean catRidableInWater = false; public double catMaxHealth = 10.0D; @@ -62,7 +62,7 @@ index 41e3342f37c2b55655b01281c6411ec6dc94f336..eb3d47f97c1dddd809f79cd98017edd8 private void catSettings() { catRidable = getBoolean("mobs.cat.ridable", catRidable); catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater); -@@ -209,6 +212,9 @@ public class PurpurWorldConfig { +@@ -211,6 +214,9 @@ public class PurpurWorldConfig { set("mobs.cat.attributes.max_health", oldValue); } catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth); diff --git a/patches/server/0040-Cows-eat-mushrooms.patch b/patches/server/0040-Cows-eat-mushrooms.patch index 28e2513b7..06b922746 100644 --- a/patches/server/0040-Cows-eat-mushrooms.patch +++ b/patches/server/0040-Cows-eat-mushrooms.patch @@ -114,10 +114,10 @@ index bee82d5bf600cbeacfcede600e5606529af1435e..9da76357da891a70e20ad80f50873b3b public Cow getBreedOffspring(ServerLevel world, AgeableMob entity) { return (Cow) EntityType.COW.create((Level) world); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index eb3d47f97c1dddd809f79cd98017edd810f1671d..b85daa6b78e5bc34c5fbee25495ce4e498971fc3 100644 +index 5cea174102d346a66dafcbd9c1b524bde53d5168..876fc6694f4116772bb6bf1c2249b8981f945f51 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -262,6 +262,7 @@ public class PurpurWorldConfig { +@@ -264,6 +264,7 @@ public class PurpurWorldConfig { public boolean cowRidable = false; public boolean cowRidableInWater = false; public double cowMaxHealth = 10.0D; @@ -125,7 +125,7 @@ index eb3d47f97c1dddd809f79cd98017edd810f1671d..b85daa6b78e5bc34c5fbee25495ce4e4 private void cowSettings() { cowRidable = getBoolean("mobs.cow.ridable", cowRidable); cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater); -@@ -271,6 +272,7 @@ public class PurpurWorldConfig { +@@ -273,6 +274,7 @@ public class PurpurWorldConfig { set("mobs.cow.attributes.max_health", oldValue); } cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth); diff --git a/patches/server/0042-Pigs-give-saddle-back.patch b/patches/server/0042-Pigs-give-saddle-back.patch index 816b7406b..b179d1126 100644 --- a/patches/server/0042-Pigs-give-saddle-back.patch +++ b/patches/server/0042-Pigs-give-saddle-back.patch @@ -28,10 +28,10 @@ index f4a099e691dce3c57069e76d67859161b459098e..518d28dc0b5b8c04263c93a4347e4c97 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b85daa6b78e5bc34c5fbee25495ce4e498971fc3..63ec9aee12ccfa08852fe9793008dec984147cd2 100644 +index 876fc6694f4116772bb6bf1c2249b8981f945f51..b24f63db425608772d18f956fe3245510b2e2d5b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -752,6 +752,7 @@ public class PurpurWorldConfig { +@@ -754,6 +754,7 @@ public class PurpurWorldConfig { public boolean pigRidable = false; public boolean pigRidableInWater = false; public double pigMaxHealth = 10.0D; @@ -39,7 +39,7 @@ index b85daa6b78e5bc34c5fbee25495ce4e498971fc3..63ec9aee12ccfa08852fe9793008dec9 private void pigSettings() { pigRidable = getBoolean("mobs.pig.ridable", pigRidable); pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater); -@@ -761,6 +762,7 @@ public class PurpurWorldConfig { +@@ -763,6 +764,7 @@ public class PurpurWorldConfig { set("mobs.pig.attributes.max_health", oldValue); } pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth); diff --git a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch index 40062bd4e..30f95a02e 100644 --- a/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch +++ b/patches/server/0043-Snowman-drop-and-put-back-pumpkin.patch @@ -32,10 +32,10 @@ index 7fbe1a62e9c67a8bdaf13aaa9fae1d8742d75148..0733f9c057fef17fd79a4769f19b78f4 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 63ec9aee12ccfa08852fe9793008dec984147cd2..f3dc9f8d7afda7d8bcbf42c7a36a7e06ab4e4afc 100644 +index b24f63db425608772d18f956fe3245510b2e2d5b..9e6228f51d4f9a381537389e55bb60670d3359b7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -983,6 +983,8 @@ public class PurpurWorldConfig { +@@ -985,6 +985,8 @@ public class PurpurWorldConfig { public boolean snowGolemRidableInWater = false; public boolean snowGolemLeaveTrailWhenRidden = false; public double snowGolemMaxHealth = 4.0D; @@ -44,7 +44,7 @@ index 63ec9aee12ccfa08852fe9793008dec984147cd2..f3dc9f8d7afda7d8bcbf42c7a36a7e06 private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -993,6 +995,8 @@ public class PurpurWorldConfig { +@@ -995,6 +997,8 @@ public class PurpurWorldConfig { set("mobs.snow_golem.attributes.max_health", oldValue); } snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth); diff --git a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch index 050aa198d..b86b6b414 100644 --- a/patches/server/0044-Ender-dragon-always-drop-full-exp.patch +++ b/patches/server/0044-Ender-dragon-always-drop-full-exp.patch @@ -18,10 +18,10 @@ index 177c5b385613ac08a75500013326874ff31a1992..a70c631691512a633c7fe4df9e9f2881 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f3dc9f8d7afda7d8bcbf42c7a36a7e06ab4e4afc..91290c9c2da64a5f3e7db69aaa440f02f6e0645f 100644 +index 9e6228f51d4f9a381537389e55bb60670d3359b7..9eedfb6293d56d8d9bc1ce108d7ef9a347748b92 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -365,6 +365,7 @@ public class PurpurWorldConfig { +@@ -367,6 +367,7 @@ public class PurpurWorldConfig { public boolean enderDragonRidableInWater = false; public double enderDragonMaxY = 256D; public double enderDragonMaxHealth = 200.0D; @@ -29,7 +29,7 @@ index f3dc9f8d7afda7d8bcbf42c7a36a7e06ab4e4afc..91290c9c2da64a5f3e7db69aaa440f02 private void enderDragonSettings() { enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable); enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater); -@@ -379,6 +380,7 @@ public class PurpurWorldConfig { +@@ -381,6 +382,7 @@ public class PurpurWorldConfig { set("mobs.ender_dragon.attributes.max_health", oldValue); } enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth); diff --git a/patches/server/0045-Signs-editable-on-right-click.patch b/patches/server/0045-Signs-editable-on-right-click.patch index aecd3588a..8e71c5338 100644 --- a/patches/server/0045-Signs-editable-on-right-click.patch +++ b/patches/server/0045-Signs-editable-on-right-click.patch @@ -35,10 +35,10 @@ index 1844ea93f8cea420f01937f85ed17c0ec1bb8bf0..9e80ba8970cad91ea22ac701f76e1413 } else { return InteractionResult.PASS; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 91290c9c2da64a5f3e7db69aaa440f02f6e0645f..8ea74cf6b3369cc1de566862f894ac3676643c93 100644 +index 9eedfb6293d56d8d9bc1ce108d7ef9a347748b92..530a6887900202340217e6b2f0db495e774881e8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -126,6 +126,11 @@ public class PurpurWorldConfig { +@@ -128,6 +128,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0046-Signs-allow-color-codes.patch b/patches/server/0046-Signs-allow-color-codes.patch index 8308a63c1..a1b9259b3 100644 --- a/patches/server/0046-Signs-allow-color-codes.patch +++ b/patches/server/0046-Signs-allow-color-codes.patch @@ -70,10 +70,10 @@ index 9b5d11ece006d7aa893360a84ba652c666517ac1..bdd6d8201ac078635d637081a37f353c @Override public ClientboundBlockEntityDataPacket getUpdatePacket() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8ea74cf6b3369cc1de566862f894ac3676643c93..dfe45b8bc6d96967c2cb1580810f60ffbc1449a4 100644 +index 530a6887900202340217e6b2f0db495e774881e8..11c4716dea2d944402330c525d9bd53b23a8e74f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -126,8 +126,10 @@ public class PurpurWorldConfig { +@@ -128,8 +128,10 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch index c6fff640e..09d1bddf1 100644 --- a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -42,10 +42,10 @@ index a242a80b16c7d074d52a52728646224b1a0091d4..5d9d77cb382c8075af2713a0ce26c28a } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index dfe45b8bc6d96967c2cb1580810f60ffbc1449a4..89d090233a42f7d53bcd6376a5a4b0eb2f592952 100644 +index 11c4716dea2d944402330c525d9bd53b23a8e74f..cc68e6dae4892d8d2efda3dbd9b433601338b6fa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -126,6 +126,11 @@ public class PurpurWorldConfig { +@@ -128,6 +128,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch index 2de28a71b..42272e562 100644 --- a/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0049-Disable-loot-drops-on-death-by-cramming.patch @@ -20,10 +20,10 @@ index 28d5fc868498a4a6746b9defa1c06da27a4aa495..5b25fc620161053e1f3811dbdd7fac01 // CraftBukkit start - Call death event org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops); // Paper diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 95d03cb21bdedf595df8aee46ff1ace6323b6a67..42d9181991d83d44c5bf56960f8c6005353eba91 100644 +index 3c517e22d7882dbb4c156e11d7854add27c57a11..687402ae1949b99f78826be8d549e943230ab55f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -188,6 +188,11 @@ public class PurpurWorldConfig { +@@ -190,6 +190,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch index d8e168dce..f39f119a7 100644 --- a/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0051-Option-to-toggle-milk-curing-bad-omen.patch @@ -28,10 +28,10 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 42d9181991d83d44c5bf56960f8c6005353eba91..6a640a0e8db52d0b7c3142d331a172fe1239ba2a 100644 +index 687402ae1949b99f78826be8d549e943230ab55f..085549acf40b26f94098077dd90f2c1d4be2e87e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -189,8 +189,10 @@ public class PurpurWorldConfig { +@@ -191,8 +191,10 @@ public class PurpurWorldConfig { } public boolean disableDropsOnCrammingDeath = false; diff --git a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch index bc75ace5f..8806ef563 100644 --- a/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch +++ b/patches/server/0056-Add-wither-skeleton-takes-wither-damage-option.patch @@ -17,10 +17,10 @@ index 8212ee2cc1242c0a3626f3643c455f3be0de18c2..aaf6f43c0f37a51a7b2db57b8da43365 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6a640a0e8db52d0b7c3142d331a172fe1239ba2a..cf43d434eb808ad80a4b97c9d94210047a02dce3 100644 +index 085549acf40b26f94098077dd90f2c1d4be2e87e..d8cd35bd0e52698e4fbd7e8dbab8258dfe6ede82 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1293,6 +1293,7 @@ public class PurpurWorldConfig { +@@ -1295,6 +1295,7 @@ public class PurpurWorldConfig { public boolean witherSkeletonRidable = false; public boolean witherSkeletonRidableInWater = false; public double witherSkeletonMaxHealth = 20.0D; @@ -28,7 +28,7 @@ index 6a640a0e8db52d0b7c3142d331a172fe1239ba2a..cf43d434eb808ad80a4b97c9d9421004 private void witherSkeletonSettings() { witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable); witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater); -@@ -1302,6 +1303,7 @@ public class PurpurWorldConfig { +@@ -1304,6 +1305,7 @@ public class PurpurWorldConfig { set("mobs.wither_skeleton.attributes.max_health", oldValue); } witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth); diff --git a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index 08e104985..a7156c5d3 100644 --- a/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0058-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -18,10 +18,10 @@ index c95eef8596fe3e1ca83e620a6c54b164c797cbe1..1e6a5404d767318de29184b3e3a2bc41 if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) { this.spawnAtLocation(this.getPickupItem(), 0.1F); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cf43d434eb808ad80a4b97c9d94210047a02dce3..cd9e1583c5ee1d540992787d04134282b99e050b 100644 +index d8cd35bd0e52698e4fbd7e8dbab8258dfe6ede82..ea1b04f44d15af4651fc068c5c514d82566e4d49 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -190,9 +190,11 @@ public class PurpurWorldConfig { +@@ -192,9 +192,11 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean milkCuresBadOmen = true; diff --git a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch index 70439b3c5..c07b2fafc 100644 --- a/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch +++ b/patches/server/0059-Add-enderman-and-creeper-griefing-controls.patch @@ -38,10 +38,10 @@ index b061ecc42122ef66fbf87fe017023abca5728a01..6e0b5fbf5b0d216b6b7c647d45ef37cd } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cd9e1583c5ee1d540992787d04134282b99e050b..9caf2bc24e27bb652612a01d726034f53f4c7fea 100644 +index ea1b04f44d15af4651fc068c5c514d82566e4d49..503a6cddf4b652544ea884a6e8cb78c2fb8658a2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -362,6 +362,7 @@ public class PurpurWorldConfig { +@@ -364,6 +364,7 @@ public class PurpurWorldConfig { public boolean creeperRidableInWater = false; public double creeperMaxHealth = 20.0D; public double creeperChargedChance = 0.0D; @@ -49,7 +49,7 @@ index cd9e1583c5ee1d540992787d04134282b99e050b..9caf2bc24e27bb652612a01d726034f5 private void creeperSettings() { creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); -@@ -372,6 +373,7 @@ public class PurpurWorldConfig { +@@ -374,6 +375,7 @@ public class PurpurWorldConfig { } creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth); creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); @@ -57,7 +57,7 @@ index cd9e1583c5ee1d540992787d04134282b99e050b..9caf2bc24e27bb652612a01d726034f5 } public boolean dolphinRidable = false; -@@ -469,6 +471,7 @@ public class PurpurWorldConfig { +@@ -471,6 +473,7 @@ public class PurpurWorldConfig { public boolean endermanRidable = false; public boolean endermanRidableInWater = false; public double endermanMaxHealth = 40.0D; @@ -65,7 +65,7 @@ index cd9e1583c5ee1d540992787d04134282b99e050b..9caf2bc24e27bb652612a01d726034f5 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -478,6 +481,7 @@ public class PurpurWorldConfig { +@@ -480,6 +483,7 @@ public class PurpurWorldConfig { set("mobs.enderman.attributes.max_health", oldValue); } endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth); diff --git a/patches/server/0060-Villagers-follow-emerald-blocks.patch b/patches/server/0060-Villagers-follow-emerald-blocks.patch index c63e581b4..e15f9934e 100644 --- a/patches/server/0060-Villagers-follow-emerald-blocks.patch +++ b/patches/server/0060-Villagers-follow-emerald-blocks.patch @@ -41,10 +41,10 @@ index d2588a91b55aebdecf8e1644498111ccf84a9dc9..393061e13375bf7a7ee57973b4abac83 this.goalSelector.addGoal(8, new WaterAvoidingRandomStrollGoal(this, 0.35D)); this.goalSelector.addGoal(9, new InteractGoal(this, Player.class, 3.0F, 1.0F)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9caf2bc24e27bb652612a01d726034f53f4c7fea..0cf3001606f00d0dde9b4ed28a417a557845ec2b 100644 +index 503a6cddf4b652544ea884a6e8cb78c2fb8658a2..1a77066e85fd68af98126d3030649510fc6dccee 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1221,6 +1221,7 @@ public class PurpurWorldConfig { +@@ -1223,6 +1223,7 @@ public class PurpurWorldConfig { public double villagerMaxHealth = 20.0D; public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; @@ -52,7 +52,7 @@ index 9caf2bc24e27bb652612a01d726034f53f4c7fea..0cf3001606f00d0dde9b4ed28a417a55 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1232,6 +1233,7 @@ public class PurpurWorldConfig { +@@ -1234,6 +1235,7 @@ public class PurpurWorldConfig { villagerMaxHealth = getDouble("mobs.villager.attributes.max_health", villagerMaxHealth); villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks); villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); @@ -60,7 +60,7 @@ index 9caf2bc24e27bb652612a01d726034f53f4c7fea..0cf3001606f00d0dde9b4ed28a417a55 } public boolean vindicatorRidable = false; -@@ -1251,6 +1253,7 @@ public class PurpurWorldConfig { +@@ -1253,6 +1255,7 @@ public class PurpurWorldConfig { public boolean wanderingTraderRidable = false; public boolean wanderingTraderRidableInWater = false; public double wanderingTraderMaxHealth = 20.0D; @@ -68,7 +68,7 @@ index 9caf2bc24e27bb652612a01d726034f53f4c7fea..0cf3001606f00d0dde9b4ed28a417a55 private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -1260,6 +1263,7 @@ public class PurpurWorldConfig { +@@ -1262,6 +1265,7 @@ public class PurpurWorldConfig { set("mobs.wandering_trader.attributes.max_health", oldValue); } wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth); diff --git a/patches/server/0061-Allow-leashing-villagers.patch b/patches/server/0061-Allow-leashing-villagers.patch index 1893ecbbf..179625bc5 100644 --- a/patches/server/0061-Allow-leashing-villagers.patch +++ b/patches/server/0061-Allow-leashing-villagers.patch @@ -49,10 +49,10 @@ index 393061e13375bf7a7ee57973b4abac83ffa15fa3..c48935d35a6141c41db22e3ec172d599 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0cf3001606f00d0dde9b4ed28a417a557845ec2b..4730feffdfd7fc2cbd9b67c6c39eb54700cac1f4 100644 +index 1a77066e85fd68af98126d3030649510fc6dccee..c87fb386006003123c23d50b0f3f899820fad857 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1222,6 +1222,7 @@ public class PurpurWorldConfig { +@@ -1224,6 +1224,7 @@ public class PurpurWorldConfig { public int villagerBrainTicks = 1; public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; @@ -60,7 +60,7 @@ index 0cf3001606f00d0dde9b4ed28a417a557845ec2b..4730feffdfd7fc2cbd9b67c6c39eb547 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1234,6 +1235,7 @@ public class PurpurWorldConfig { +@@ -1236,6 +1237,7 @@ public class PurpurWorldConfig { villagerBrainTicks = getInt("mobs.villager.brain-ticks", villagerBrainTicks); villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); @@ -68,7 +68,7 @@ index 0cf3001606f00d0dde9b4ed28a417a557845ec2b..4730feffdfd7fc2cbd9b67c6c39eb547 } public boolean vindicatorRidable = false; -@@ -1254,6 +1256,7 @@ public class PurpurWorldConfig { +@@ -1256,6 +1258,7 @@ public class PurpurWorldConfig { public boolean wanderingTraderRidableInWater = false; public double wanderingTraderMaxHealth = 20.0D; public boolean wanderingTraderFollowEmeraldBlock = false; @@ -76,7 +76,7 @@ index 0cf3001606f00d0dde9b4ed28a417a557845ec2b..4730feffdfd7fc2cbd9b67c6c39eb547 private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -1264,6 +1267,7 @@ public class PurpurWorldConfig { +@@ -1266,6 +1269,7 @@ public class PurpurWorldConfig { } wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth); wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); diff --git a/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch index b02205134..7f535de61 100644 --- a/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch +++ b/patches/server/0062-Implement-configurable-search-radius-for-villagers-t.patch @@ -18,10 +18,10 @@ index 52a592e569d020dca45916be7b5fad28c9d480de..5e100dbdbd6cfb4aa34b0d6b1ce09138 for (int i = 0; i < 10; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4730feffdfd7fc2cbd9b67c6c39eb54700cac1f4..b0b4a47ddaaf010466ef771bedd217571eb444d2 100644 +index c87fb386006003123c23d50b0f3f899820fad857..8c400b11734f541c683186072f80c89c5f93093b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1223,6 +1223,8 @@ public class PurpurWorldConfig { +@@ -1225,6 +1225,8 @@ public class PurpurWorldConfig { public boolean villagerUseBrainTicksOnlyWhenLagging = true; public boolean villagerFollowEmeraldBlock = false; public boolean villagerCanBeLeashed = false; @@ -30,7 +30,7 @@ index 4730feffdfd7fc2cbd9b67c6c39eb54700cac1f4..b0b4a47ddaaf010466ef771bedd21757 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1236,6 +1238,8 @@ public class PurpurWorldConfig { +@@ -1238,6 +1240,8 @@ public class PurpurWorldConfig { villagerUseBrainTicksOnlyWhenLagging = getBoolean("mobs.villager.use-brain-ticks-only-when-lagging", villagerUseBrainTicksOnlyWhenLagging); villagerFollowEmeraldBlock = getBoolean("mobs.villager.follow-emerald-blocks", villagerFollowEmeraldBlock); villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); diff --git a/patches/server/0063-Implement-infinite-lava.patch b/patches/server/0063-Implement-infinite-lava.patch index fec922931..9e0e8e0f6 100644 --- a/patches/server/0063-Implement-infinite-lava.patch +++ b/patches/server/0063-Implement-infinite-lava.patch @@ -58,10 +58,10 @@ index 695783e64564b1d2a178d57a89737d2a97ab9014..cd1a33a1f10d04a91358f51d736bda34 protected boolean canConvertToSource() { return false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b0b4a47ddaaf010466ef771bedd217571eb444d2..bb33cc21ba25ed4f42bb1f3965440ac16d8c4708 100644 +index 8c400b11734f541c683186072f80c89c5f93093b..9cd572048951bb6be33bf86959ad8162780ecdbf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -202,6 +202,13 @@ public class PurpurWorldConfig { +@@ -204,6 +204,13 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0064-Make-lava-flow-speed-configurable.patch b/patches/server/0064-Make-lava-flow-speed-configurable.patch index 4eaa9b0b6..12c871921 100644 --- a/patches/server/0064-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0064-Make-lava-flow-speed-configurable.patch @@ -18,10 +18,10 @@ index cd1a33a1f10d04a91358f51d736bda34110324c4..b0d671ba015d1ad37fdf600b8e70def2 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bb33cc21ba25ed4f42bb1f3965440ac16d8c4708..2a2803a8c31f7779bd3bfd666885b8e8bbfc838b 100644 +index 9cd572048951bb6be33bf86959ad8162780ecdbf..3aa045fd27de4a38cf90549e102258cc92a9ea12 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -204,9 +204,13 @@ public class PurpurWorldConfig { +@@ -206,9 +206,13 @@ public class PurpurWorldConfig { public boolean lavaInfinite = false; public int lavaInfiniteRequiredSources = 2; diff --git a/patches/server/0066-Configurable-void-damage-height-and-damage.patch b/patches/server/0066-Configurable-void-damage-height-and-damage.patch index aacb87d51..b5043290b 100644 --- a/patches/server/0066-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0066-Configurable-void-damage-height-and-damage.patch @@ -31,10 +31,10 @@ index 54bc16b6971259f6083ca530d4109909c86a3e1e..b4640aa8fe8a37a6f27a626862b68b63 protected void updateSwingTime() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7b3f7ef0df0d0c79c9d133632c57607fa4f3a494..6c3fd4120ec84ed00019f765b1ad12b6704292f9 100644 +index 90f126acb69c4017753816f1cd3d4b2bd25b2f89..dc3eb512777f66c4f7fceb30c9b304f9fa29fbdb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -195,10 +195,14 @@ public class PurpurWorldConfig { +@@ -197,10 +197,14 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean milkCuresBadOmen = true; public double tridentLoyaltyVoidReturnHeight = 0.0D; diff --git a/patches/server/0068-Dispenser-curse-of-binding-protection.patch b/patches/server/0068-Dispenser-curse-of-binding-protection.patch index 85485230d..dd3e2e618 100644 --- a/patches/server/0068-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0068-Dispenser-curse-of-binding-protection.patch @@ -43,10 +43,10 @@ index aab4a63e61aced51b1b6c885fd8b8426a4f14408..ad095c6bc7e00d286c83e37f84d8ed5d // CraftBukkit start Level world = pointer.getLevel(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6c3fd4120ec84ed00019f765b1ad12b6704292f9..9a3fbdfe9f1c963e5df95aded7082ad7f57bb966 100644 +index dc3eb512777f66c4f7fceb30c9b304f9fa29fbdb..2010a7a7418d19aec51af7de102dd42eb4542a47 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -205,6 +205,11 @@ public class PurpurWorldConfig { +@@ -207,6 +207,11 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch index b1ba60c40..4ce4b11f2 100644 --- a/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0069-Add-option-for-boats-to-eject-players-on-land.patch @@ -17,10 +17,10 @@ index aa7c022c4faade23bd9061311d4152cf845d3331..d4a19fc38027717e43353bc62ef23e56 } else { return Boat.Status.IN_AIR; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9a3fbdfe9f1c963e5df95aded7082ad7f57bb966..89be7d21dd0cfea24fa1f4bebf7ffd42d1c910f2 100644 +index 2010a7a7418d19aec51af7de102dd42eb4542a47..24bacb54f53794862adc717004402318267d337b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -192,12 +192,14 @@ public class PurpurWorldConfig { +@@ -194,12 +194,14 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch b/patches/server/0070-Mending-mends-most-damages-equipment-first.patch index b3aec408d..8423f95f6 100644 --- a/patches/server/0070-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0070-Mending-mends-most-damages-equipment-first.patch @@ -73,10 +73,10 @@ index e246bf034a86deba5a15e7c639f5e08213fe7eee..585b29a214d0306ac2d6a170125270c1 Entry entry = getRandomItemWith(enchantment, entityliving); return entry != null ? entry.getValue() : ItemStack.EMPTY; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 89be7d21dd0cfea24fa1f4bebf7ffd42d1c910f2..f3408e38ab06c60f3369b5795bed6d9efd53fe0f 100644 +index 24bacb54f53794862adc717004402318267d337b..453b3d2758ce9b1b8c1d12524befc868b56f2cc6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -192,6 +192,7 @@ public class PurpurWorldConfig { +@@ -194,6 +194,7 @@ public class PurpurWorldConfig { }); } @@ -84,7 +84,7 @@ index 89be7d21dd0cfea24fa1f4bebf7ffd42d1c910f2..f3408e38ab06c60f3369b5795bed6d9e public boolean boatEjectPlayersOnLand = false; public boolean disableDropsOnCrammingDeath = false; public boolean milkCuresBadOmen = true; -@@ -199,6 +200,7 @@ public class PurpurWorldConfig { +@@ -201,6 +202,7 @@ public class PurpurWorldConfig { public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; private void miscGameplayMechanicsSettings() { diff --git a/patches/server/0077-Configurable-jockey-options.patch b/patches/server/0077-Configurable-jockey-options.patch index 9b93ae107..bc27bfb16 100644 --- a/patches/server/0077-Configurable-jockey-options.patch +++ b/patches/server/0077-Configurable-jockey-options.patch @@ -167,10 +167,10 @@ index 04d09123f70a192f1283c0d7e8a8254f3d30889a..43ef93d2c0c59e0d7021ee9aa2b44345 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb827e998a 100644 +index 9f602b143f277510988611b1b93e19c90708a582..0e7dee25ab748fe3529dd2e67de97e68b8cb8d03 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -506,6 +506,9 @@ public class PurpurWorldConfig { +@@ -508,6 +508,9 @@ public class PurpurWorldConfig { public boolean drownedRidableInWater = false; public double drownedMaxHealth = 20.0D; public double drownedSpawnReinforcements = 0.1D; @@ -180,7 +180,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb private void drownedSettings() { drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable); drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater); -@@ -516,6 +519,9 @@ public class PurpurWorldConfig { +@@ -518,6 +521,9 @@ public class PurpurWorldConfig { } drownedMaxHealth = getDouble("mobs.drowned.attributes.max_health", drownedMaxHealth); drownedSpawnReinforcements = getDouble("mobs.drowned.attributes.spawn_reinforcements", drownedSpawnReinforcements); @@ -190,7 +190,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb } public boolean elderGuardianRidable = false; -@@ -728,6 +734,9 @@ public class PurpurWorldConfig { +@@ -730,6 +736,9 @@ public class PurpurWorldConfig { public boolean huskRidableInWater = false; public double huskMaxHealth = 20.0D; public double huskSpawnReinforcements = 0.1D; @@ -200,7 +200,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb private void huskSettings() { huskRidable = getBoolean("mobs.husk.ridable", huskRidable); huskRidableInWater = getBoolean("mobs.husk.ridable-in-water", huskRidableInWater); -@@ -738,6 +747,9 @@ public class PurpurWorldConfig { +@@ -740,6 +749,9 @@ public class PurpurWorldConfig { } huskMaxHealth = getDouble("mobs.husk.attributes.max_health", huskMaxHealth); huskSpawnReinforcements = getDouble("mobs.husk.attributes.spawn_reinforcements", huskSpawnReinforcements); @@ -210,7 +210,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb } public boolean illusionerRidable = false; -@@ -1440,6 +1452,9 @@ public class PurpurWorldConfig { +@@ -1442,6 +1454,9 @@ public class PurpurWorldConfig { public boolean zombieRidableInWater = false; public double zombieMaxHealth = 20.0D; public double zombieSpawnReinforcements = 0.1D; @@ -220,7 +220,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1450,6 +1465,9 @@ public class PurpurWorldConfig { +@@ -1452,6 +1467,9 @@ public class PurpurWorldConfig { } zombieMaxHealth = getDouble("mobs.zombie.attributes.max_health", zombieMaxHealth); zombieSpawnReinforcements = getDouble("mobs.zombie.attributes.spawn_reinforcements", zombieSpawnReinforcements); @@ -230,7 +230,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb } public boolean zombieHorseRidableInWater = false; -@@ -1483,6 +1501,9 @@ public class PurpurWorldConfig { +@@ -1485,6 +1503,9 @@ public class PurpurWorldConfig { public boolean zombieVillagerRidableInWater = false; public double zombieVillagerMaxHealth = 20.0D; public double zombieVillagerSpawnReinforcements = 0.1D; @@ -240,7 +240,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -1493,12 +1514,18 @@ public class PurpurWorldConfig { +@@ -1495,12 +1516,18 @@ public class PurpurWorldConfig { } zombieVillagerMaxHealth = getDouble("mobs.zombie_villager.attributes.max_health", zombieVillagerMaxHealth); zombieVillagerSpawnReinforcements = getDouble("mobs.zombie_villager.attributes.spawn_reinforcements", zombieVillagerSpawnReinforcements); @@ -259,7 +259,7 @@ index 572db67801321091942bb88bbdd1416ec9864d9c..c4a6af80a2093a261935caac40b702bb private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1509,5 +1536,8 @@ public class PurpurWorldConfig { +@@ -1511,5 +1538,8 @@ public class PurpurWorldConfig { } zombifiedPiglinMaxHealth = getDouble("mobs.zombified_piglin.attributes.max_health", zombifiedPiglinMaxHealth); zombifiedPiglinSpawnReinforcements = getDouble("mobs.zombified_piglin.attributes.spawn_reinforcements", zombifiedPiglinSpawnReinforcements); diff --git a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch index ae2f2d52a..f7635e6e4 100644 --- a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch +++ b/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch @@ -258,10 +258,10 @@ index 5e069ac0c57d2a3a23f6e4483d12ce298d172691..916c29d08fbcf245ad6f50f8e8cc1736 private float speed = 0.1F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c4a6af80a2093a261935caac40b702bb827e998a..e3bd27513287ba77efd3f2c2418b83b7646ea5e2 100644 +index 0e7dee25ab748fe3529dd2e67de97e68b8cb8d03..4bd850773e9cd77363f52e9bf186050a09d3419e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -919,6 +919,9 @@ public class PurpurWorldConfig { +@@ -921,6 +921,9 @@ public class PurpurWorldConfig { public int phantomFlameFireTime = 8; public boolean phantomAllowGriefing = false; public double phantomMaxHealth = 20.0D; @@ -271,7 +271,7 @@ index c4a6af80a2093a261935caac40b702bb827e998a..e3bd27513287ba77efd3f2c2418b83b7 private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -932,6 +935,9 @@ public class PurpurWorldConfig { +@@ -934,6 +937,9 @@ public class PurpurWorldConfig { set("mobs.phantom.attributes.max_health", oldValue); } phantomMaxHealth = getDouble("mobs.phantom.attributes.max_health", phantomMaxHealth); diff --git a/patches/server/0079-Add-phantom-spawning-options.patch b/patches/server/0079-Add-phantom-spawning-options.patch index bb6156b9c..aa3abd844 100644 --- a/patches/server/0079-Add-phantom-spawning-options.patch +++ b/patches/server/0079-Add-phantom-spawning-options.patch @@ -48,10 +48,10 @@ index 79504dc3448402e73b09c4232b1fd0488872cf68..300c9f136edace2babea4a574090b184 for (int l = 0; l < k; ++l) { // Paper start diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e3bd27513287ba77efd3f2c2418b83b7646ea5e2..506e7198de3a339545bebb508d96ca95f5fc8fc1 100644 +index 4bd850773e9cd77363f52e9bf186050a09d3419e..672009f1022b55559322823a93cf1463fa6c63c5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -922,6 +922,18 @@ public class PurpurWorldConfig { +@@ -924,6 +924,18 @@ public class PurpurWorldConfig { public double phantomAttackedByCrystalRadius = 0.0D; public float phantomAttackedByCrystalDamage = 1.0F; public double phantomOrbitCrystalRadius = 0.0D; @@ -70,7 +70,7 @@ index e3bd27513287ba77efd3f2c2418b83b7646ea5e2..506e7198de3a339545bebb508d96ca95 private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -938,6 +950,18 @@ public class PurpurWorldConfig { +@@ -940,6 +952,18 @@ 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); diff --git a/patches/server/0080-Implement-bed-explosion-options.patch b/patches/server/0080-Implement-bed-explosion-options.patch index 994b83200..ce2a6c38e 100644 --- a/patches/server/0080-Implement-bed-explosion-options.patch +++ b/patches/server/0080-Implement-bed-explosion-options.patch @@ -27,10 +27,10 @@ index 163a7861f987c3832aac51cc6df950c768546731..bf5765b6af9c7807d50f7daaacb5d524 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 506e7198de3a339545bebb508d96ca95f5fc8fc1..c3ec6d09e952f55e1e098f59d9764bc6cbe7c444 100644 +index 672009f1022b55559322823a93cf1463fa6c63c5..943a20291e88bbd45fff1885bfd1979e57082e92 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -265,6 +265,22 @@ public class PurpurWorldConfig { +@@ -267,6 +267,22 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0081-Implement-respawn-anchor-explosion-options.patch b/patches/server/0081-Implement-respawn-anchor-explosion-options.patch index eaa1fcb11..8ae380ddd 100644 --- a/patches/server/0081-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0081-Implement-respawn-anchor-explosion-options.patch @@ -18,10 +18,10 @@ index af4eb4a8814491afef449a2874521636957d7557..365c28300ecfbe0161716972adf22a8a public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c3ec6d09e952f55e1e098f59d9764bc6cbe7c444..af064d4ea1c64a5cd99b784a04599b650cd83d5d 100644 +index 943a20291e88bbd45fff1885bfd1979e57082e92..6cd97f728e06ae5c1732102bba2ce68c9bdc8327 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -302,6 +302,22 @@ public class PurpurWorldConfig { +@@ -304,6 +304,22 @@ public class PurpurWorldConfig { lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether); } diff --git a/patches/server/0086-Squid-EAR-immunity.patch b/patches/server/0086-Squid-EAR-immunity.patch index da1c0773b..3413aa816 100644 --- a/patches/server/0086-Squid-EAR-immunity.patch +++ b/patches/server/0086-Squid-EAR-immunity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 43c8dc815f4e756e270b1a130ec67dba5f4cb453..c54831d2f24511ee02b38a8e8d35cfb19e998306 100644 +index 89be0e1d958e7c1ed539895cb269296bb9599c64..2d3c95013d680a975943d403fa413e68102a400d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1255,6 +1255,7 @@ public class PurpurWorldConfig { +@@ -1257,6 +1257,7 @@ public class PurpurWorldConfig { public boolean squidRidable = false; public double squidMaxHealth = 10.0D; @@ -16,7 +16,7 @@ index 43c8dc815f4e756e270b1a130ec67dba5f4cb453..c54831d2f24511ee02b38a8e8d35cfb1 private void squidSettings() { squidRidable = getBoolean("mobs.squid.ridable", squidRidable); if (PurpurConfig.version < 10) { -@@ -1263,6 +1264,7 @@ public class PurpurWorldConfig { +@@ -1265,6 +1266,7 @@ public class PurpurWorldConfig { set("mobs.squid.attributes.max_health", oldValue); } squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth); diff --git a/patches/server/0088-Phantoms-burn-in-light.patch b/patches/server/0088-Phantoms-burn-in-light.patch index 5f601550d..fb160a659 100644 --- a/patches/server/0088-Phantoms-burn-in-light.patch +++ b/patches/server/0088-Phantoms-burn-in-light.patch @@ -47,10 +47,10 @@ index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff30 list.sort(Comparator.comparing(Entity::getY).reversed()); // Paper - remap fix Iterator iterator = list.iterator(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c54831d2f24511ee02b38a8e8d35cfb19e998306..f508e8fe38fbb01600c221b84690eb12a14f808a 100644 +index 2d3c95013d680a975943d403fa413e68102a400d..fa699ad8f555131b71f83cb8a43b6ba10a37a00c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -973,6 +973,9 @@ public class PurpurWorldConfig { +@@ -975,6 +975,9 @@ public class PurpurWorldConfig { public int phantomSpawnOverheadRadius = 10; public int phantomSpawnMinPerAttempt = 1; public int phantomSpawnMaxPerAttempt = -1; @@ -60,7 +60,7 @@ index c54831d2f24511ee02b38a8e8d35cfb19e998306..f508e8fe38fbb01600c221b84690eb12 private void phantomSettings() { phantomRidable = getBoolean("mobs.phantom.ridable", phantomRidable); phantomRidableInWater = getBoolean("mobs.phantom.ridable-in-water", phantomRidableInWater); -@@ -1001,6 +1004,9 @@ public class PurpurWorldConfig { +@@ -1003,6 +1006,9 @@ public class PurpurWorldConfig { phantomSpawnOverheadRadius = getInt("mobs.phantom.spawn.overhead.radius", phantomSpawnOverheadRadius); phantomSpawnMinPerAttempt = getInt("mobs.phantom.spawn.per-attempt.min", phantomSpawnMinPerAttempt); phantomSpawnMaxPerAttempt = getInt("mobs.phantom.spawn.per-attempt.max", phantomSpawnMaxPerAttempt); diff --git a/patches/server/0089-Configurable-villager-breeding.patch b/patches/server/0089-Configurable-villager-breeding.patch index 87e82ba68..d1d0f98f9 100644 --- a/patches/server/0089-Configurable-villager-breeding.patch +++ b/patches/server/0089-Configurable-villager-breeding.patch @@ -18,10 +18,10 @@ index 5e100dbdbd6cfb4aa34b0d6b1ce0913899f60b7c..1e05cc98a332e5b115c4670e5331e679 private boolean hungry() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f508e8fe38fbb01600c221b84690eb12a14f808a..27e448c7a490ef186d730ac0212d480eebdc1b88 100644 +index fa699ad8f555131b71f83cb8a43b6ba10a37a00c..df85b6c0f861b25422b69a08ada6a8e537afbb14 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1398,6 +1398,7 @@ public class PurpurWorldConfig { +@@ -1400,6 +1400,7 @@ public class PurpurWorldConfig { public boolean villagerCanBeLeashed = false; public int villagerSpawnIronGolemRadius = 0; public int villagerSpawnIronGolemLimit = 0; @@ -29,7 +29,7 @@ index f508e8fe38fbb01600c221b84690eb12a14f808a..27e448c7a490ef186d730ac0212d480e private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1413,6 +1414,7 @@ public class PurpurWorldConfig { +@@ -1415,6 +1416,7 @@ public class PurpurWorldConfig { villagerCanBeLeashed = getBoolean("mobs.villager.can-be-leashed", villagerCanBeLeashed); villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius); villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit); diff --git a/patches/server/0090-Redstone-deactivates-spawners.patch b/patches/server/0090-Redstone-deactivates-spawners.patch index 2411eb99c..0e8a7f578 100644 --- a/patches/server/0090-Redstone-deactivates-spawners.patch +++ b/patches/server/0090-Redstone-deactivates-spawners.patch @@ -17,10 +17,10 @@ index 9228c0bc797fb95c8ac949bdc568eadafee84a80..f2c9f841d397f445cd3d0420f19e765c } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 27e448c7a490ef186d730ac0212d480eebdc1b88..edeb6fff3bdd716ed1771705b79853d913cd1bbc 100644 +index df85b6c0f861b25422b69a08ada6a8e537afbb14..2fe461aa6b25bc1eda8f6e307914eab9760e504c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -332,6 +332,11 @@ public class PurpurWorldConfig { +@@ -334,6 +334,11 @@ public class PurpurWorldConfig { signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit); } diff --git a/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch index 4f9ebd693..513c0010a 100644 --- a/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch +++ b/patches/server/0092-Add-vindicator-johnny-spawn-chance.patch @@ -30,10 +30,10 @@ index 76e6ea34db3942e9dd7646ad7ca1259f4387a4d8..9096c40ad5784d9097e889f0f43b6cf1 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1a3ea260a5532db2aa14bab3145f3a00d6683cea..591258b3a8cda4cbe50f2bf0d93d25008f4c8a31 100644 +index 716898ec4ff67c64d96a47f5f76ea7096dbeb61c..ff4c9d73d3390c4367bb92e094a9eba5f5399ae5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1427,6 +1427,7 @@ public class PurpurWorldConfig { +@@ -1429,6 +1429,7 @@ public class PurpurWorldConfig { public boolean vindicatorRidable = false; public boolean vindicatorRidableInWater = false; public double vindicatorMaxHealth = 24.0D; @@ -41,7 +41,7 @@ index 1a3ea260a5532db2aa14bab3145f3a00d6683cea..591258b3a8cda4cbe50f2bf0d93d2500 private void vindicatorSettings() { vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable); vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater); -@@ -1436,6 +1437,7 @@ public class PurpurWorldConfig { +@@ -1438,6 +1439,7 @@ public class PurpurWorldConfig { set("mobs.vindicator.attributes.max_health", oldValue); } vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth); diff --git a/patches/server/0094-Dispensers-place-anvils-option.patch b/patches/server/0094-Dispensers-place-anvils-option.patch index 77afe5491..150552cd0 100644 --- a/patches/server/0094-Dispensers-place-anvils-option.patch +++ b/patches/server/0094-Dispensers-place-anvils-option.patch @@ -41,10 +41,10 @@ index 92623ae25249d63efb92be8bd6c95228f9155ad2..20bf6d01046488eff53a109f5239351a static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 591258b3a8cda4cbe50f2bf0d93d25008f4c8a31..97b8b8f6c6c9761d06344fa065a573a7bea37ef6 100644 +index ff4c9d73d3390c4367bb92e094a9eba5f5399ae5..81a6f90e1506fcb57b75281a09459c9c7b86494b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -291,8 +291,10 @@ public class PurpurWorldConfig { +@@ -293,8 +293,10 @@ public class PurpurWorldConfig { } public boolean dispenserApplyCursedArmor = true; diff --git a/patches/server/0095-Allow-anvil-colors.patch b/patches/server/0095-Allow-anvil-colors.patch index 6df2e1070..656bea955 100644 --- a/patches/server/0095-Allow-anvil-colors.patch +++ b/patches/server/0095-Allow-anvil-colors.patch @@ -37,10 +37,10 @@ index c81af461fa01dac0b7b26becc1a5e7ae31bb5f95..2dbc71a3d76cc87e2683b8f351bd8db0 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 97b8b8f6c6c9761d06344fa065a573a7bea37ef6..c0dd404357dade5ef61f6c20b143ec46543cfb51 100644 +index 81a6f90e1506fcb57b75281a09459c9c7b86494b..fbfb46f1a4ab5dd49059a51d5938431d76c880be 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -274,6 +274,11 @@ public class PurpurWorldConfig { +@@ -276,6 +276,11 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0096-Add-no-random-tick-block-list.patch b/patches/server/0096-Add-no-random-tick-block-list.patch index d089222f8..542a2b100 100644 --- a/patches/server/0096-Add-no-random-tick-block-list.patch +++ b/patches/server/0096-Add-no-random-tick-block-list.patch @@ -35,10 +35,10 @@ index 7538262e14c86e4da9cd4cb887b76f649bfef2e6..f34973be478de4f088a0593b45bd89e5 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c0dd404357dade5ef61f6c20b143ec46543cfb51..6e53ebf9dbac0d1dc387845abe8d47abdf18b9f0 100644 +index fbfb46f1a4ab5dd49059a51d5938431d76c880be..17e473ffde0aa075e97b76c6dcb47648ad57cc99 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -274,6 +274,28 @@ public class PurpurWorldConfig { +@@ -276,6 +276,28 @@ public class PurpurWorldConfig { voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); } diff --git a/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch index 790dfaf33..358fa75fa 100644 --- a/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch +++ b/patches/server/0097-Add-option-to-disable-dolphin-treasure-searching.patch @@ -17,10 +17,10 @@ index c372d47a929e06c8cfb0df86cf4e9bfee4d4b300..2aead13e8f879b614445715fb1912a20 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6e53ebf9dbac0d1dc387845abe8d47abdf18b9f0..91697c96d7133f1815fd6d89b4fc55c24609b2aa 100644 +index 17e473ffde0aa075e97b76c6dcb47648ad57cc99..d647f3bcebbacdfd603da7897d7b66a357e818d4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -540,6 +540,7 @@ public class PurpurWorldConfig { +@@ -542,6 +542,7 @@ public class PurpurWorldConfig { public float dolphinSpitSpeed = 1.0F; public float dolphinSpitDamage = 2.0F; public double dolphinMaxHealth = 10.0D; @@ -28,7 +28,7 @@ index 6e53ebf9dbac0d1dc387845abe8d47abdf18b9f0..91697c96d7133f1815fd6d89b4fc55c2 private void dolphinSettings() { dolphinRidable = getBoolean("mobs.dolphin.ridable", dolphinRidable); dolphinSpitCooldown = getInt("mobs.dolphin.spit.cooldown", dolphinSpitCooldown); -@@ -551,6 +552,7 @@ public class PurpurWorldConfig { +@@ -553,6 +554,7 @@ public class PurpurWorldConfig { set("mobs.dolphin.attributes.max_health", oldValue); } dolphinMaxHealth = getDouble("mobs.dolphin.attributes.max_health", dolphinMaxHealth); diff --git a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch index 781227dc7..f2dc6e82e 100644 --- a/patches/server/0099-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0099-Stop-squids-floating-on-top-of-water.patch @@ -60,10 +60,10 @@ index 6f7e6429c35eea346517cbf08cf223fc6d838a8c..6a77112180556675af38cb1b3ce0b38a + // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 91697c96d7133f1815fd6d89b4fc55c24609b2aa..1d804ff002c3736b3c6199130a4c1c27fd048dd3 100644 +index d647f3bcebbacdfd603da7897d7b66a357e818d4..556d5edc7ad8acb676cfb60ec18bca60e24dcfd8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1300,6 +1300,7 @@ public class PurpurWorldConfig { +@@ -1302,6 +1302,7 @@ public class PurpurWorldConfig { public boolean squidRidable = false; public double squidMaxHealth = 10.0D; public boolean squidImmuneToEAR = true; @@ -71,7 +71,7 @@ index 91697c96d7133f1815fd6d89b4fc55c24609b2aa..1d804ff002c3736b3c6199130a4c1c27 private void squidSettings() { squidRidable = getBoolean("mobs.squid.ridable", squidRidable); if (PurpurConfig.version < 10) { -@@ -1309,6 +1310,7 @@ public class PurpurWorldConfig { +@@ -1311,6 +1312,7 @@ public class PurpurWorldConfig { } squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth); squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR); diff --git a/patches/server/0102-Entities-can-use-portals-configuration.patch b/patches/server/0102-Entities-can-use-portals-configuration.patch index 6c9bc4343..c1c3610b9 100644 --- a/patches/server/0102-Entities-can-use-portals-configuration.patch +++ b/patches/server/0102-Entities-can-use-portals-configuration.patch @@ -27,10 +27,10 @@ index e43b31f07d6f0cbb35f925dca952b5947fe1fd4f..cc5854281d976c2faa453c2a6b07b574 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1d804ff002c3736b3c6199130a4c1c27fd048dd3..f1724c6871e1aff14f784470df71611e576793cf 100644 +index 556d5edc7ad8acb676cfb60ec18bca60e24dcfd8..888674faa5d804e1a011ca266043da5c7ecf6ce6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -260,6 +260,7 @@ public class PurpurWorldConfig { +@@ -262,6 +262,7 @@ public class PurpurWorldConfig { public boolean useBetterMending = false; public boolean boatEjectPlayersOnLand = false; public boolean disableDropsOnCrammingDeath = false; @@ -38,7 +38,7 @@ index 1d804ff002c3736b3c6199130a4c1c27fd048dd3..f1724c6871e1aff14f784470df71611e public boolean milkCuresBadOmen = true; public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; -@@ -268,6 +269,7 @@ public class PurpurWorldConfig { +@@ -270,6 +271,7 @@ public class PurpurWorldConfig { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); diff --git a/patches/server/0104-Customizable-wither-health-and-healing.patch b/patches/server/0104-Customizable-wither-health-and-healing.patch index 26a6c71b3..688c8f01d 100644 --- a/patches/server/0104-Customizable-wither-health-and-healing.patch +++ b/patches/server/0104-Customizable-wither-health-and-healing.patch @@ -23,10 +23,10 @@ index 22dd455b3b9c148f38a63f72901009f864e63a4b..689df66281ef84f0cc31d89c6f2e654c this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth()); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f1724c6871e1aff14f784470df71611e576793cf..093c44cba0675316479f5d96434092821804cfa0 100644 +index 888674faa5d804e1a011ca266043da5c7ecf6ce6..a5123bea0e5da28591216d9365529aa99d199e5f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1511,6 +1511,8 @@ public class PurpurWorldConfig { +@@ -1513,6 +1513,8 @@ public class PurpurWorldConfig { public boolean witherRidableInWater = false; public double witherMaxY = 256D; public double witherMaxHealth = 300.0D; @@ -35,7 +35,7 @@ index f1724c6871e1aff14f784470df71611e576793cf..093c44cba0675316479f5d9643409282 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1525,6 +1527,8 @@ public class PurpurWorldConfig { +@@ -1527,6 +1529,8 @@ public class PurpurWorldConfig { set("mobs.wither.attributes.max_health", oldValue); } witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth); diff --git a/patches/server/0106-Raid-cooldown-setting.patch b/patches/server/0106-Raid-cooldown-setting.patch index 1d5ea87be..b1ee1a660 100644 --- a/patches/server/0106-Raid-cooldown-setting.patch +++ b/patches/server/0106-Raid-cooldown-setting.patch @@ -52,10 +52,10 @@ index 45e369aa69a6b78def42b619b1b1b8259d4b30ea..de7443e7a27e51eabaed2d6d348ec8ea if (!this.raidMap.containsKey(raid.getId())) { this.raidMap.put(raid.getId(), raid); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2e2f5e7ca914abf1a1d22c8ea03f363643f46488..c53852320909c7481f23b33433c771b96ae8557b 100644 +index b92862b331666f36a8cef0289b5241f03fe3bf9b..7a53ccbde201376248208090b598dc109ffd564e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -286,6 +286,7 @@ public class PurpurWorldConfig { +@@ -288,6 +288,7 @@ public class PurpurWorldConfig { public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; @@ -63,7 +63,7 @@ index 2e2f5e7ca914abf1a1d22c8ea03f363643f46488..c53852320909c7481f23b33433c771b9 private void miscGameplayMechanicsSettings() { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); -@@ -295,6 +296,7 @@ public class PurpurWorldConfig { +@@ -297,6 +298,7 @@ public class PurpurWorldConfig { tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight); voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight); voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); diff --git a/patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch index eb2b444e1..1a6054edd 100644 --- a/patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch +++ b/patches/server/0108-Add-option-to-disable-zombie-aggressiveness-towards-.patch @@ -71,10 +71,10 @@ index 77002a4c3b03e0397515fd922f14e56b8e81074a..b80f7c71cbf7b10bda6fac3cfe673ac7 this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR)); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 401621a9a9592558efd7c3aa043822a857ab6b41..96c242bba2dc7309ed9878687694193f0ee70bd7 100644 +index 7b81840051e2221b3287ad03108437256addaa76..6e2bc00cc363acfcc0d2d39053aa29352f6d79ff 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1634,6 +1634,7 @@ public class PurpurWorldConfig { +@@ -1636,6 +1636,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyOnlyBaby = true; public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; @@ -82,7 +82,7 @@ index 401621a9a9592558efd7c3aa043822a857ab6b41..96c242bba2dc7309ed9878687694193f private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1647,6 +1648,7 @@ public class PurpurWorldConfig { +@@ -1649,6 +1650,7 @@ public class PurpurWorldConfig { zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby); zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); diff --git a/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch b/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch index ecfbeae35..64124bf83 100644 --- a/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch +++ b/patches/server/0109-Persistent-TileEntity-Lore-and-DisplayName.patch @@ -189,10 +189,10 @@ index c3a07ccccd5cc38552363c82398f432c8d624288..132c9e6a643995d9fde535a78d9edc9e + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 96c242bba2dc7309ed9878687694193f0ee70bd7..9231ec35dbca08c5bb58cb6c288e493ea8036b95 100644 +index 6e2bc00cc363acfcc0d2d39053aa29352f6d79ff..92dd97364a7c40c5ff05d408d40616ac4ed11116 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -312,6 +312,7 @@ public class PurpurWorldConfig { +@@ -314,6 +314,7 @@ public class PurpurWorldConfig { public boolean disableDropsOnCrammingDeath = false; public boolean entitiesCanUsePortals = true; public boolean milkCuresBadOmen = true; @@ -200,7 +200,7 @@ index 96c242bba2dc7309ed9878687694193f0ee70bd7..9231ec35dbca08c5bb58cb6c288e493e public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; -@@ -322,6 +323,7 @@ public class PurpurWorldConfig { +@@ -324,6 +325,7 @@ public class PurpurWorldConfig { disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); diff --git a/patches/server/0111-Flying-squids-Oh-my.patch b/patches/server/0111-Flying-squids-Oh-my.patch index 97565a27f..048953b3a 100644 --- a/patches/server/0111-Flying-squids-Oh-my.patch +++ b/patches/server/0111-Flying-squids-Oh-my.patch @@ -58,10 +58,10 @@ index 2affff346a7fe81480e86cb61996039df0569853..12be4a2f25a7def8341acda47d10a256 float f1 = Mth.cos(f) * 0.2F; float f2 = -0.1F + this.squid.getRandom().nextFloat() * 0.2F; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9231ec35dbca08c5bb58cb6c288e493ea8036b95..f7baead9f97d680c45dd4e87e1e017bddd313494 100644 +index 92dd97364a7c40c5ff05d408d40616ac4ed11116..024d03c318ab4c76f173599cdca8d7e4e1f7c4bd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -799,9 +799,11 @@ public class PurpurWorldConfig { +@@ -801,9 +801,11 @@ public class PurpurWorldConfig { public boolean glowSquidRidable = false; public double glowSquidMaxHealth = 10.0D; @@ -73,7 +73,7 @@ index 9231ec35dbca08c5bb58cb6c288e493ea8036b95..f7baead9f97d680c45dd4e87e1e017bd } public boolean goatRidable = false; -@@ -1357,6 +1359,7 @@ public class PurpurWorldConfig { +@@ -1359,6 +1361,7 @@ public class PurpurWorldConfig { public double squidMaxHealth = 10.0D; public boolean squidImmuneToEAR = true; public double squidOffsetWaterCheck = 0.0D; @@ -81,7 +81,7 @@ index 9231ec35dbca08c5bb58cb6c288e493ea8036b95..f7baead9f97d680c45dd4e87e1e017bd private void squidSettings() { squidRidable = getBoolean("mobs.squid.ridable", squidRidable); if (PurpurConfig.version < 10) { -@@ -1367,6 +1370,7 @@ public class PurpurWorldConfig { +@@ -1369,6 +1372,7 @@ public class PurpurWorldConfig { squidMaxHealth = getDouble("mobs.squid.attributes.max_health", squidMaxHealth); squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR); squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck); diff --git a/patches/server/0113-Stonecutter-damage.patch b/patches/server/0113-Stonecutter-damage.patch index df449551a..f5585403a 100644 --- a/patches/server/0113-Stonecutter-damage.patch +++ b/patches/server/0113-Stonecutter-damage.patch @@ -61,10 +61,10 @@ index 2ad5ff9a1d7de54e75436e99da8a73db9dc91bde..60605a8a021cc56f9c3ba22bc43c43c3 } else if (blockState.is(Blocks.HONEY_BLOCK)) { return BlockPathTypes.STICKY_HONEY; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 18ffce02b1301659e898d5c7e656d6a90f6568df..2cf088cc750aad13001859bbc8b49343e5459567 100644 +index 916674bd0ee39f6580d82026bf571f54fc3ec20e..6f5b372f0a9e9d9f98da61b7ead568a9c4ada3ae 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -435,6 +435,11 @@ public class PurpurWorldConfig { +@@ -437,6 +437,11 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } diff --git a/patches/server/0116-Infinite-fuel-furnace.patch b/patches/server/0116-Infinite-fuel-furnace.patch index 3539fad99..c37177802 100644 --- a/patches/server/0116-Infinite-fuel-furnace.patch +++ b/patches/server/0116-Infinite-fuel-furnace.patch @@ -48,10 +48,10 @@ index 348e485897c34cca19113cc35f055a58778ca38b..1eab83cefdf1484b8cf80072d9a0ee61 private static boolean canBurn(@Nullable Recipe recipe, NonNullList slots, int count) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 71d3d41eab2fc5068f34e8e1b20b43a19caa958e..638000f9acb937e9a3093c1c7f74a47f9ce7b13d 100644 +index a3091e4c78544f8ee53d9ada1a8f7cd7b68de49d..fc75bc0436afb9531024a542616707fc1420a0ba 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -403,6 +403,11 @@ public class PurpurWorldConfig { +@@ -405,6 +405,11 @@ public class PurpurWorldConfig { farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); } diff --git a/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 1771adb04..7d281078c 100644 --- a/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0118-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -24,10 +24,10 @@ index 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776 return; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 638000f9acb937e9a3093c1c7f74a47f9ce7b13d..b4a6fe5acd5f6bb536e35bfe6d1d0df790c52cea 100644 +index fc75bc0436afb9531024a542616707fc1420a0ba..f7cbd213c39cdc388651b133acf119d7c0d8387e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -399,8 +399,10 @@ public class PurpurWorldConfig { +@@ -401,8 +401,10 @@ public class PurpurWorldConfig { } public boolean farmlandGetsMoistFromBelow = false; diff --git a/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch index 59ff3bd0b..678a4048e 100644 --- a/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0119-Add-adjustable-breeding-cooldown-to-config.patch @@ -95,10 +95,10 @@ index 65aba9a17a76e56c0140220ab00645a1e02cc8b5..bfac7888f71232ac095e2615bddf05d7 this.world = new CraftWorld((ServerLevel) this, gen, env); this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b4a6fe5acd5f6bb536e35bfe6d1d0df790c52cea..dd93c5252cf0b53b23fca410e856852bbfda3d39 100644 +index f7cbd213c39cdc388651b133acf119d7c0d8387e..d7f9e34ea49b786e515a75969ba088fe8f84fb52 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -335,6 +335,7 @@ public class PurpurWorldConfig { +@@ -337,6 +337,7 @@ public class PurpurWorldConfig { public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; public int raidCooldownSeconds = 0; @@ -106,7 +106,7 @@ index b4a6fe5acd5f6bb536e35bfe6d1d0df790c52cea..dd93c5252cf0b53b23fca410e856852b private void miscGameplayMechanicsSettings() { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); -@@ -346,6 +347,7 @@ public class PurpurWorldConfig { +@@ -348,6 +349,7 @@ public class PurpurWorldConfig { voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight); voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds); diff --git a/patches/server/0120-Make-entity-breeding-times-configurable.patch b/patches/server/0120-Make-entity-breeding-times-configurable.patch index 40f2e1bd5..c9d891af5 100644 --- a/patches/server/0120-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0120-Make-entity-breeding-times-configurable.patch @@ -362,7 +362,7 @@ index 6c6d2ac7551ae24dec88bd9e6bce7aeafd900e8c..b077b3d389e3439cf1115009a0edb4ed @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java -index 92069543fd8f19ee037af59edd84c61f5216463f..873e1d64b917e961c9d9b5217fe664a91d0ab5bc 100644 +index 5a0b9cfdd0b8d79b10f16c4a3ea1eed746c8887d..93a05b945ac248df0ea7a0b9d7264a9c129c3bcf 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java @@ -123,6 +123,11 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { @@ -474,10 +474,10 @@ index 5d289be8f0ef003abbce992e7662f6ddce4f4a99..5e3d7321a73144c3e4c43c18c5b748b2 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e7e8938ae 100644 +index d7f9e34ea49b786e515a75969ba088fe8f84fb52..8777f901c5b04e0465559aa00382dbfa3b3cbef3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -467,9 +467,11 @@ public class PurpurWorldConfig { +@@ -469,9 +469,11 @@ public class PurpurWorldConfig { public boolean axolotlRidable = false; public double axolotlMaxHealth = 14.0D; @@ -489,7 +489,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean batRidable = false; -@@ -499,6 +501,7 @@ public class PurpurWorldConfig { +@@ -501,6 +503,7 @@ public class PurpurWorldConfig { public boolean beeRidableInWater = false; public double beeMaxY = 256D; public double beeMaxHealth = 10.0D; @@ -497,7 +497,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void beeSettings() { beeRidable = getBoolean("mobs.bee.ridable", beeRidable); beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater); -@@ -509,6 +512,7 @@ public class PurpurWorldConfig { +@@ -511,6 +514,7 @@ public class PurpurWorldConfig { set("mobs.bee.attributes.max_health", oldValue); } beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth); @@ -505,7 +505,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean blazeRidable = false; -@@ -533,6 +537,7 @@ public class PurpurWorldConfig { +@@ -535,6 +539,7 @@ public class PurpurWorldConfig { public int catSpawnDelay = 1200; public int catSpawnSwampHutScanRange = 16; public int catSpawnVillageScanRange = 48; @@ -513,7 +513,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void catSettings() { catRidable = getBoolean("mobs.cat.ridable", catRidable); catRidableInWater = getBoolean("mobs.cat.ridable-in-water", catRidableInWater); -@@ -545,6 +550,7 @@ public class PurpurWorldConfig { +@@ -547,6 +552,7 @@ public class PurpurWorldConfig { catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay); catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange); catSpawnVillageScanRange = getInt("mobs.cat.scan-range-for-other-cats.village", catSpawnVillageScanRange); @@ -521,7 +521,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean caveSpiderRidable = false; -@@ -565,6 +571,7 @@ public class PurpurWorldConfig { +@@ -567,6 +573,7 @@ public class PurpurWorldConfig { public boolean chickenRidableInWater = false; public double chickenMaxHealth = 4.0D; public boolean chickenRetaliate = false; @@ -529,7 +529,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void chickenSettings() { chickenRidable = getBoolean("mobs.chicken.ridable", chickenRidable); chickenRidableInWater = getBoolean("mobs.chicken.ridable-in-water", chickenRidableInWater); -@@ -575,6 +582,7 @@ public class PurpurWorldConfig { +@@ -577,6 +584,7 @@ public class PurpurWorldConfig { } chickenMaxHealth = getDouble("mobs.chicken.attributes.max_health", chickenMaxHealth); chickenRetaliate = getBoolean("mobs.chicken.retaliate", chickenRetaliate); @@ -537,7 +537,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean codRidable = false; -@@ -593,6 +601,7 @@ public class PurpurWorldConfig { +@@ -595,6 +603,7 @@ public class PurpurWorldConfig { public boolean cowRidableInWater = false; public double cowMaxHealth = 10.0D; public int cowFeedMushrooms = 0; @@ -545,7 +545,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void cowSettings() { cowRidable = getBoolean("mobs.cow.ridable", cowRidable); cowRidableInWater = getBoolean("mobs.cow.ridable-in-water", cowRidableInWater); -@@ -603,6 +612,7 @@ public class PurpurWorldConfig { +@@ -605,6 +614,7 @@ public class PurpurWorldConfig { } cowMaxHealth = getDouble("mobs.cow.attributes.max_health", cowMaxHealth); cowFeedMushrooms = getInt("mobs.cow.feed-mushrooms-for-mooshroom", cowFeedMushrooms); @@ -553,7 +553,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean creeperRidable = false; -@@ -650,6 +660,7 @@ public class PurpurWorldConfig { +@@ -652,6 +662,7 @@ public class PurpurWorldConfig { public double donkeyJumpStrengthMax = 0.5D; public double donkeyMovementSpeedMin = 0.175D; public double donkeyMovementSpeedMax = 0.175D; @@ -561,7 +561,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void donkeySettings() { donkeyRidableInWater = getBoolean("mobs.donkey.ridable-in-water", donkeyRidableInWater); if (PurpurConfig.version < 10) { -@@ -665,6 +676,7 @@ public class PurpurWorldConfig { +@@ -667,6 +678,7 @@ public class PurpurWorldConfig { donkeyJumpStrengthMax = getDouble("mobs.donkey.attributes.jump_strength.max", donkeyJumpStrengthMax); donkeyMovementSpeedMin = getDouble("mobs.donkey.attributes.movement_speed.min", donkeyMovementSpeedMin); donkeyMovementSpeedMax = getDouble("mobs.donkey.attributes.movement_speed.max", donkeyMovementSpeedMax); @@ -569,7 +569,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean drownedRidable = false; -@@ -771,6 +783,7 @@ public class PurpurWorldConfig { +@@ -773,6 +785,7 @@ public class PurpurWorldConfig { public boolean foxRidableInWater = false; public double foxMaxHealth = 10.0D; public boolean foxTypeChangesWithTulips = false; @@ -577,7 +577,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void foxSettings() { foxRidable = getBoolean("mobs.fox.ridable", foxRidable); foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater); -@@ -781,6 +794,7 @@ public class PurpurWorldConfig { +@@ -783,6 +796,7 @@ public class PurpurWorldConfig { } foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth); foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips); @@ -585,7 +585,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean ghastRidable = false; -@@ -841,10 +855,12 @@ public class PurpurWorldConfig { +@@ -843,10 +857,12 @@ public class PurpurWorldConfig { public boolean goatRidable = false; public boolean goatRidableInWater = false; public double goatMaxHealth = 10.0D; @@ -598,7 +598,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean guardianRidable = false; -@@ -862,6 +878,7 @@ public class PurpurWorldConfig { +@@ -864,6 +880,7 @@ public class PurpurWorldConfig { public boolean hoglinRidable = false; public boolean hoglinRidableInWater = false; public double hoglinMaxHealth = 40.0D; @@ -606,7 +606,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void hoglinSettings() { hoglinRidable = getBoolean("mobs.hoglin.ridable", hoglinRidable); hoglinRidableInWater = getBoolean("mobs.hoglin.ridable-in-water", hoglinRidableInWater); -@@ -871,6 +888,7 @@ public class PurpurWorldConfig { +@@ -873,6 +890,7 @@ public class PurpurWorldConfig { set("mobs.hoglin.attributes.max_health", oldValue); } hoglinMaxHealth = getDouble("mobs.hoglin.attributes.max_health", hoglinMaxHealth); @@ -614,7 +614,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean horseRidableInWater = false; -@@ -880,6 +898,7 @@ public class PurpurWorldConfig { +@@ -882,6 +900,7 @@ public class PurpurWorldConfig { public double horseJumpStrengthMax = 1.0D; public double horseMovementSpeedMin = 0.1125D; public double horseMovementSpeedMax = 0.3375D; @@ -622,7 +622,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void horseSettings() { horseRidableInWater = getBoolean("mobs.horse.ridable-in-water", horseRidableInWater); if (PurpurConfig.version < 10) { -@@ -895,6 +914,7 @@ public class PurpurWorldConfig { +@@ -897,6 +916,7 @@ public class PurpurWorldConfig { horseJumpStrengthMax = getDouble("mobs.horse.attributes.jump_strength.max", horseJumpStrengthMax); horseMovementSpeedMin = getDouble("mobs.horse.attributes.movement_speed.min", horseMovementSpeedMin); horseMovementSpeedMax = getDouble("mobs.horse.attributes.movement_speed.max", horseMovementSpeedMax); @@ -630,7 +630,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean huskRidable = false; -@@ -965,6 +985,7 @@ public class PurpurWorldConfig { +@@ -967,6 +987,7 @@ public class PurpurWorldConfig { public double llamaJumpStrengthMax = 0.5D; public double llamaMovementSpeedMin = 0.175D; public double llamaMovementSpeedMax = 0.175D; @@ -638,7 +638,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void llamaSettings() { llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable); llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater); -@@ -981,6 +1002,7 @@ public class PurpurWorldConfig { +@@ -983,6 +1004,7 @@ public class PurpurWorldConfig { llamaJumpStrengthMax = getDouble("mobs.llama.attributes.jump_strength.max", llamaJumpStrengthMax); llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin); llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax); @@ -646,7 +646,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean magmaCubeRidable = false; -@@ -1000,6 +1022,7 @@ public class PurpurWorldConfig { +@@ -1002,6 +1024,7 @@ public class PurpurWorldConfig { public boolean mooshroomRidable = false; public boolean mooshroomRidableInWater = false; public double mooshroomMaxHealth = 10.0D; @@ -654,7 +654,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void mooshroomSettings() { mooshroomRidable = getBoolean("mobs.mooshroom.ridable", mooshroomRidable); mooshroomRidableInWater = getBoolean("mobs.mooshroom.ridable-in-water", mooshroomRidableInWater); -@@ -1009,6 +1032,7 @@ public class PurpurWorldConfig { +@@ -1011,6 +1034,7 @@ public class PurpurWorldConfig { set("mobs.mooshroom.attributes.max_health", oldValue); } mooshroomMaxHealth = getDouble("mobs.mooshroom.attributes.max_health", mooshroomMaxHealth); @@ -662,7 +662,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean muleRidableInWater = false; -@@ -1018,6 +1042,7 @@ public class PurpurWorldConfig { +@@ -1020,6 +1044,7 @@ public class PurpurWorldConfig { public double muleJumpStrengthMax = 0.5D; public double muleMovementSpeedMin = 0.175D; public double muleMovementSpeedMax = 0.175D; @@ -670,7 +670,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void muleSettings() { muleRidableInWater = getBoolean("mobs.mule.ridable-in-water", muleRidableInWater); if (PurpurConfig.version < 10) { -@@ -1033,11 +1058,13 @@ public class PurpurWorldConfig { +@@ -1035,11 +1060,13 @@ public class PurpurWorldConfig { muleJumpStrengthMax = getDouble("mobs.mule.attributes.jump_strength.max", muleJumpStrengthMax); muleMovementSpeedMin = getDouble("mobs.mule.attributes.movement_speed.min", muleMovementSpeedMin); muleMovementSpeedMax = getDouble("mobs.mule.attributes.movement_speed.max", muleMovementSpeedMax); @@ -684,7 +684,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void ocelotSettings() { ocelotRidable = getBoolean("mobs.ocelot.ridable", ocelotRidable); ocelotRidableInWater = getBoolean("mobs.ocelot.ridable-in-water", ocelotRidableInWater); -@@ -1047,11 +1074,13 @@ public class PurpurWorldConfig { +@@ -1049,11 +1076,13 @@ public class PurpurWorldConfig { set("mobs.ocelot.attributes.max_health", oldValue); } ocelotMaxHealth = getDouble("mobs.ocelot.attributes.max_health", ocelotMaxHealth); @@ -698,7 +698,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void pandaSettings() { pandaRidable = getBoolean("mobs.panda.ridable", pandaRidable); pandaRidableInWater = getBoolean("mobs.panda.ridable-in-water", pandaRidableInWater); -@@ -1061,6 +1090,7 @@ public class PurpurWorldConfig { +@@ -1063,6 +1092,7 @@ public class PurpurWorldConfig { set("mobs.panda.attributes.max_health", oldValue); } pandaMaxHealth = getDouble("mobs.panda.attributes.max_health", pandaMaxHealth); @@ -706,7 +706,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean parrotRidable = false; -@@ -1141,6 +1171,7 @@ public class PurpurWorldConfig { +@@ -1143,6 +1173,7 @@ public class PurpurWorldConfig { public boolean pigRidableInWater = false; public double pigMaxHealth = 10.0D; public boolean pigGiveSaddleBack = false; @@ -714,7 +714,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void pigSettings() { pigRidable = getBoolean("mobs.pig.ridable", pigRidable); pigRidableInWater = getBoolean("mobs.pig.ridable-in-water", pigRidableInWater); -@@ -1151,6 +1182,7 @@ public class PurpurWorldConfig { +@@ -1153,6 +1184,7 @@ public class PurpurWorldConfig { } pigMaxHealth = getDouble("mobs.pig.attributes.max_health", pigMaxHealth); pigGiveSaddleBack = getBoolean("mobs.pig.give-saddle-back", pigGiveSaddleBack); @@ -722,7 +722,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean piglinRidable = false; -@@ -1200,6 +1232,7 @@ public class PurpurWorldConfig { +@@ -1202,6 +1234,7 @@ public class PurpurWorldConfig { public double polarBearMaxHealth = 30.0D; public String polarBearBreedableItemString = ""; public Item polarBearBreedableItem = null; @@ -730,7 +730,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void polarBearSettings() { polarBearRidable = getBoolean("mobs.polar_bear.ridable", polarBearRidable); polarBearRidableInWater = getBoolean("mobs.polar_bear.ridable-in-water", polarBearRidableInWater); -@@ -1212,6 +1245,7 @@ public class PurpurWorldConfig { +@@ -1214,6 +1247,7 @@ public class PurpurWorldConfig { polarBearBreedableItemString = getString("mobs.polar_bear.breedable-item", polarBearBreedableItemString); Item item = Registry.ITEM.get(new ResourceLocation(polarBearBreedableItemString)); if (item != Items.AIR) polarBearBreedableItem = item; @@ -738,7 +738,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean pufferfishRidable = false; -@@ -1231,6 +1265,7 @@ public class PurpurWorldConfig { +@@ -1233,6 +1267,7 @@ public class PurpurWorldConfig { public double rabbitMaxHealth = 3.0D; public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; @@ -746,7 +746,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void rabbitSettings() { rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable); rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater); -@@ -1242,6 +1277,7 @@ public class PurpurWorldConfig { +@@ -1244,6 +1279,7 @@ public class PurpurWorldConfig { rabbitMaxHealth = getDouble("mobs.rabbit.attributes.max_health", rabbitMaxHealth); rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast); rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller); @@ -754,7 +754,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean ravagerRidable = false; -@@ -1273,6 +1309,7 @@ public class PurpurWorldConfig { +@@ -1275,6 +1311,7 @@ public class PurpurWorldConfig { public boolean sheepRidable = false; public boolean sheepRidableInWater = false; public double sheepMaxHealth = 8.0D; @@ -762,7 +762,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void sheepSettings() { sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable); sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater); -@@ -1282,6 +1319,7 @@ public class PurpurWorldConfig { +@@ -1284,6 +1321,7 @@ public class PurpurWorldConfig { set("mobs.sheep.attributes.max_health", oldValue); } sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth); @@ -770,7 +770,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean shulkerRidable = false; -@@ -1436,6 +1474,7 @@ public class PurpurWorldConfig { +@@ -1438,6 +1476,7 @@ public class PurpurWorldConfig { public boolean striderRidable = false; public boolean striderRidableInWater = false; public double striderMaxHealth = 20.0D; @@ -778,7 +778,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void striderSettings() { striderRidable = getBoolean("mobs.strider.ridable", striderRidable); striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater); -@@ -1445,6 +1484,7 @@ public class PurpurWorldConfig { +@@ -1447,6 +1486,7 @@ public class PurpurWorldConfig { set("mobs.strider.attributes.max_health", oldValue); } striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth); @@ -786,7 +786,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean traderLlamaRidable = false; -@@ -1455,6 +1495,7 @@ public class PurpurWorldConfig { +@@ -1457,6 +1497,7 @@ public class PurpurWorldConfig { public double traderLlamaJumpStrengthMax = 0.5D; public double traderLlamaMovementSpeedMin = 0.175D; public double traderLlamaMovementSpeedMax = 0.175D; @@ -794,7 +794,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void traderLlamaSettings() { traderLlamaRidable = getBoolean("mobs.trader_llama.ridable", traderLlamaRidable); traderLlamaRidableInWater = getBoolean("mobs.trader_llama.ridable-in-water", traderLlamaRidableInWater); -@@ -1471,6 +1512,7 @@ public class PurpurWorldConfig { +@@ -1473,6 +1514,7 @@ public class PurpurWorldConfig { traderLlamaJumpStrengthMax = getDouble("mobs.trader_llama.attributes.jump_strength.max", traderLlamaJumpStrengthMax); traderLlamaMovementSpeedMin = getDouble("mobs.trader_llama.attributes.movement_speed.min", traderLlamaMovementSpeedMin); traderLlamaMovementSpeedMax = getDouble("mobs.trader_llama.attributes.movement_speed.max", traderLlamaMovementSpeedMax); @@ -802,7 +802,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean tropicalFishRidable = false; -@@ -1491,6 +1533,7 @@ public class PurpurWorldConfig { +@@ -1493,6 +1535,7 @@ public class PurpurWorldConfig { public boolean turtleEggsBreakFromExpOrbs = true; public boolean turtleEggsBreakFromItems = true; public boolean turtleEggsBreakFromMinecarts = true; @@ -810,7 +810,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void turtleEggSettings() { turtleRidable = getBoolean("mobs.turtle.ridable", turtleRidable); turtleRidableInWater = getBoolean("mobs.turtle.ridable-in-water", turtleRidableInWater); -@@ -1503,6 +1546,7 @@ public class PurpurWorldConfig { +@@ -1505,6 +1548,7 @@ public class PurpurWorldConfig { turtleEggsBreakFromExpOrbs = getBoolean("blocks.turtle_egg.break-from-exp-orbs", turtleEggsBreakFromExpOrbs); turtleEggsBreakFromItems = getBoolean("blocks.turtle_egg.break-from-items", turtleEggsBreakFromItems); turtleEggsBreakFromMinecarts = getBoolean("blocks.turtle_egg.break-from-minecarts", turtleEggsBreakFromMinecarts); @@ -818,7 +818,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean vexRidable = false; -@@ -1531,6 +1575,7 @@ public class PurpurWorldConfig { +@@ -1533,6 +1577,7 @@ public class PurpurWorldConfig { public int villagerSpawnIronGolemRadius = 0; public int villagerSpawnIronGolemLimit = 0; public boolean villagerCanBreed = true; @@ -826,7 +826,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1547,6 +1592,7 @@ public class PurpurWorldConfig { +@@ -1549,6 +1594,7 @@ public class PurpurWorldConfig { villagerSpawnIronGolemRadius = getInt("mobs.villager.spawn-iron-golem.radius", villagerSpawnIronGolemRadius); villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); @@ -834,7 +834,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e } public boolean vindicatorRidable = false; -@@ -1640,6 +1686,7 @@ public class PurpurWorldConfig { +@@ -1642,6 +1688,7 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -842,7 +842,7 @@ index dd93c5252cf0b53b23fca410e856852bbfda3d39..8b4656abb11787573bcadb79e2f7070e private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -1649,6 +1696,7 @@ public class PurpurWorldConfig { +@@ -1651,6 +1698,7 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch index b9901b4b4..d5e300ab0 100644 --- a/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch +++ b/patches/server/0121-Apply-display-names-from-item-forms-of-entities-to-e.patch @@ -142,7 +142,7 @@ index 282bfe4904637aaff1bd29e30ed18ba843c07cab..ddd50db8bb92c147d7c1eef4d1df3ac5 if (((HangingEntity) object).survives()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8b4656abb11787573bcadb79e2f7070e7e8938ae..8d79d5737cf21f0f85d2110c77a045b033a9d7b9 100644 +index 8777f901c5b04e0465559aa00382dbfa3b3cbef3..8cbbe6bcebe67ac1613747a94312994534395fa9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -90,8 +90,10 @@ public class PurpurWorldConfig { @@ -156,7 +156,7 @@ index 8b4656abb11787573bcadb79e2f7070e7e8938ae..8d79d5737cf21f0f85d2110c77a045b0 } public int daytimeTicks = 12000; -@@ -331,6 +333,7 @@ public class PurpurWorldConfig { +@@ -333,6 +335,7 @@ public class PurpurWorldConfig { public boolean entitiesCanUsePortals = true; public boolean milkCuresBadOmen = true; public boolean persistentTileEntityDisplayNames = false; @@ -164,7 +164,7 @@ index 8b4656abb11787573bcadb79e2f7070e7e8938ae..8d79d5737cf21f0f85d2110c77a045b0 public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; -@@ -343,6 +346,7 @@ public class PurpurWorldConfig { +@@ -345,6 +348,7 @@ public class PurpurWorldConfig { entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames); diff --git a/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch index 7359d570f..3783d6e85 100644 --- a/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch +++ b/patches/server/0123-Add-twisting-and-weeping-vines-growth-rates.patch @@ -82,10 +82,10 @@ index 35b2bad76c45b5a94ba7f2e9c7a8cfeb8c3f498b..d2cb1a7e7ea364cb8e2af4c4e756d8e4 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2634fef87b0535e048f51e53a351540ab0c23584..6d28d0f324ff174d8392059d34597da8316f62bc 100644 +index 18ddc7b26898a1f63bbdba02b63a0abcf10edd85..a5dee4b756e4e66255f634e025c069f874f592f4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -399,6 +399,11 @@ public class PurpurWorldConfig { +@@ -401,6 +401,11 @@ public class PurpurWorldConfig { } } @@ -97,7 +97,7 @@ index 2634fef87b0535e048f51e53a351540ab0c23584..6d28d0f324ff174d8392059d34597da8 public boolean dispenserApplyCursedArmor = true; public boolean dispenserPlaceAnvils = false; private void dispenserSettings() { -@@ -462,6 +467,16 @@ public class PurpurWorldConfig { +@@ -464,6 +469,16 @@ public class PurpurWorldConfig { stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage); } diff --git a/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index af3a092fa..3a21a2f3c 100644 --- a/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0124-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -103,10 +103,10 @@ index d2cb1a7e7ea364cb8e2af4c4e756d8e45bc0ca10..bb99dda3c5167f23b2500a1f37cbc1ca // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6d28d0f324ff174d8392059d34597da8316f62bc..c62d3619559efadf0fb2b9085b8c5a05208fb0cc 100644 +index a5dee4b756e4e66255f634e025c069f874f592f4..0888eaf81da0700f5dbb36ae3a89fbf653af92f7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -400,8 +400,10 @@ public class PurpurWorldConfig { +@@ -402,8 +402,10 @@ public class PurpurWorldConfig { } public double caveVinesGrowthModifier = 0.10D; @@ -117,7 +117,7 @@ index 6d28d0f324ff174d8392059d34597da8316f62bc..c62d3619559efadf0fb2b9085b8c5a05 } public boolean dispenserApplyCursedArmor = true; -@@ -434,6 +436,11 @@ public class PurpurWorldConfig { +@@ -436,6 +438,11 @@ public class PurpurWorldConfig { lavaSpeedNotNether = getInt("blocks.lava.speed.not-nether", lavaSpeedNotNether); } @@ -129,7 +129,7 @@ index 6d28d0f324ff174d8392059d34597da8316f62bc..c62d3619559efadf0fb2b9085b8c5a05 public boolean respawnAnchorExplode = true; public double respawnAnchorExplosionPower = 5.0D; public boolean respawnAnchorExplosionFire = true; -@@ -468,13 +475,17 @@ public class PurpurWorldConfig { +@@ -470,13 +477,17 @@ public class PurpurWorldConfig { } public double twistingVinesGrowthModifier = 0.10D; diff --git a/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch index 26a66f8b8..d3f9e1b3d 100644 --- a/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch +++ b/patches/server/0125-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch @@ -21,10 +21,10 @@ index 5ebedd6a156b06e98aded57c817f63429a1ae380..c99d295b999a28dd1eb504179250445d private static class EndermanFreezeWhenLookedAt extends Goal { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c62d3619559efadf0fb2b9085b8c5a05208fb0cc..147681048f24ea75ba7ddb0a019a83703a191e74 100644 +index 0888eaf81da0700f5dbb36ae3a89fbf653af92f7..cd4ea52298aa54c08363125888e18c0bc2046319 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -771,6 +771,7 @@ public class PurpurWorldConfig { +@@ -773,6 +773,7 @@ public class PurpurWorldConfig { public boolean endermanRidableInWater = false; public double endermanMaxHealth = 40.0D; public boolean endermanAllowGriefing = true; @@ -32,7 +32,7 @@ index c62d3619559efadf0fb2b9085b8c5a05208fb0cc..147681048f24ea75ba7ddb0a019a8370 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -781,6 +782,7 @@ public class PurpurWorldConfig { +@@ -783,6 +784,7 @@ public class PurpurWorldConfig { } endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth); endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing); diff --git a/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch b/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch index 280924383..8ff574d72 100644 --- a/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch +++ b/patches/server/0128-Zombie-break-door-minimum-difficulty-option.patch @@ -44,10 +44,10 @@ index fe045f8e35fe2aac51032a67ce52b27a53a8eff0..03bc86c776596ca5964c22adb757115d + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index aaca5c8007ce8a33ecec0b9ff057c59a4c2778a3..ef742c14be5920db31fb291f1b93b671c5f59e30 100644 +index 05238fefda24c5f2c21eae51a7ded213e10e9de0..bfaf307b04d20d6c9fa009ac7138a51a984e1e40 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1760,6 +1760,7 @@ public class PurpurWorldConfig { +@@ -1762,6 +1762,7 @@ public class PurpurWorldConfig { public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; @@ -55,7 +55,7 @@ index aaca5c8007ce8a33ecec0b9ff057c59a4c2778a3..ef742c14be5920db31fb291f1b93b671 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1774,6 +1775,11 @@ public class PurpurWorldConfig { +@@ -1776,6 +1777,11 @@ public class PurpurWorldConfig { zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance); zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); diff --git a/patches/server/0131-Add-boat-fall-damage-config.patch b/patches/server/0131-Add-boat-fall-damage-config.patch index 40fe8009e..a18604744 100644 --- a/patches/server/0131-Add-boat-fall-damage-config.patch +++ b/patches/server/0131-Add-boat-fall-damage-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 045bdac43418ff34381e5908cb666e616c77ece2..d362c9efbad593a7cd7efbcdba4acf1457abe4f7 100644 +index 1fbb9242f2dcc83befc1c91e55565e73f721af95..790a60e9375e4eea741e0b3769dda3937338746e 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -986,7 +986,16 @@ public class ServerPlayer extends Player { @@ -27,10 +27,10 @@ index 045bdac43418ff34381e5908cb666e616c77ece2..d362c9efbad593a7cd7efbcdba4acf14 if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3572f04b329be012172451f552df3d0a0aaf72ae..995abae6515eedf4c2737bf9e080b5ed6a541f7f 100644 +index 02f129b381a9fe6e0c187658776d82679aed9926..89d26b983060315473d1eb9980dd913f75d341ba 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -338,6 +338,7 @@ public class PurpurWorldConfig { +@@ -340,6 +340,7 @@ public class PurpurWorldConfig { public boolean useBetterMending = false; public boolean boatEjectPlayersOnLand = false; @@ -38,7 +38,7 @@ index 3572f04b329be012172451f552df3d0a0aaf72ae..995abae6515eedf4c2737bf9e080b5ed public boolean disableDropsOnCrammingDeath = false; public boolean entitiesCanUsePortals = true; public boolean milkCuresBadOmen = true; -@@ -351,6 +352,7 @@ public class PurpurWorldConfig { +@@ -353,6 +354,7 @@ public class PurpurWorldConfig { private void miscGameplayMechanicsSettings() { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); diff --git a/patches/server/0132-Snow-Golem-rate-of-fire-config.patch b/patches/server/0132-Snow-Golem-rate-of-fire-config.patch index e880217d5..f091dd4c0 100644 --- a/patches/server/0132-Snow-Golem-rate-of-fire-config.patch +++ b/patches/server/0132-Snow-Golem-rate-of-fire-config.patch @@ -23,10 +23,10 @@ index 0733f9c057fef17fd79a4769f19b78f4c83a7784..1697b573ffd0c5d17d2d538c40f5ce4b this.goalSelector.addGoal(3, new LookAtPlayerGoal(this, Player.class, 6.0F)); this.goalSelector.addGoal(4, new RandomLookAroundGoal(this)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 995abae6515eedf4c2737bf9e080b5ed6a541f7f..607d569f73e41dafc0c0f0f27fa9e2edbc247626 100644 +index 89d26b983060315473d1eb9980dd913f75d341ba..dade4cb0165e8ff5bab2164995dede96b8f17023 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1454,6 +1454,10 @@ public class PurpurWorldConfig { +@@ -1456,6 +1456,10 @@ public class PurpurWorldConfig { public double snowGolemMaxHealth = 4.0D; public boolean snowGolemDropsPumpkin = true; public boolean snowGolemPutPumpkinBack = false; @@ -37,7 +37,7 @@ index 995abae6515eedf4c2737bf9e080b5ed6a541f7f..607d569f73e41dafc0c0f0f27fa9e2ed private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -1466,6 +1470,10 @@ public class PurpurWorldConfig { +@@ -1468,6 +1472,10 @@ public class PurpurWorldConfig { snowGolemMaxHealth = getDouble("mobs.snow_golem.attributes.max_health", snowGolemMaxHealth); snowGolemDropsPumpkin = getBoolean("mobs.snow_golem.drop-pumpkin-when-sheared", snowGolemDropsPumpkin); snowGolemPutPumpkinBack = getBoolean("mobs.snow_golem.pumpkin-can-be-added-back", snowGolemPutPumpkinBack); diff --git a/patches/server/0135-Lobotomize-stuck-villagers.patch b/patches/server/0135-Lobotomize-stuck-villagers.patch index c0241668c..10a1d675a 100644 --- a/patches/server/0135-Lobotomize-stuck-villagers.patch +++ b/patches/server/0135-Lobotomize-stuck-villagers.patch @@ -53,10 +53,10 @@ index 1e05cc98a332e5b115c4670e5331e679117c6629..84142a42111ff03827297c522b7ce164 if (this.assignProfessionWhenSpawned) { this.assignProfessionWhenSpawned = false; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 607d569f73e41dafc0c0f0f27fa9e2edbc247626..c313fce9497908fcbdff4148f20bbb8ab0d5864b 100644 +index dade4cb0165e8ff5bab2164995dede96b8f17023..f7acaa7742b9a0e79db7d26d08de5128ae683f6a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1627,6 +1627,8 @@ public class PurpurWorldConfig { +@@ -1629,6 +1629,8 @@ public class PurpurWorldConfig { public int villagerSpawnIronGolemLimit = 0; public boolean villagerCanBreed = true; public int villagerBreedingTicks = 6000; @@ -65,7 +65,7 @@ index 607d569f73e41dafc0c0f0f27fa9e2edbc247626..c313fce9497908fcbdff4148f20bbb8a private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1644,6 +1646,13 @@ public class PurpurWorldConfig { +@@ -1646,6 +1648,13 @@ public class PurpurWorldConfig { villagerSpawnIronGolemLimit = getInt("mobs.villager.spawn-iron-golem.limit", villagerSpawnIronGolemLimit); villagerCanBreed = getBoolean("mobs.villager.can-breed", villagerCanBreed); villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); diff --git a/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index ebe8556d2..b0eb49526 100644 --- a/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0136-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -185,10 +185,10 @@ index 901fc6520d58a5fa5f2cf1b4fa78fec6008aa409..9050cd25663c71197c597aac0ab2e612 public static final VillagerProfession FISHERMAN = register("fisherman", PoiType.FISHERMAN, SoundEvents.VILLAGER_WORK_FISHERMAN); public static final VillagerProfession FLETCHER = register("fletcher", PoiType.FLETCHER, SoundEvents.VILLAGER_WORK_FLETCHER); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c313fce9497908fcbdff4148f20bbb8ab0d5864b..5cc4a0acf25af20262da4885af7c6119eb134742 100644 +index f7acaa7742b9a0e79db7d26d08de5128ae683f6a..13b445ded8bfe80617dd5e58ed94ebce630b786a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1629,6 +1629,8 @@ public class PurpurWorldConfig { +@@ -1631,6 +1631,8 @@ public class PurpurWorldConfig { public int villagerBreedingTicks = 6000; public boolean villagerLobotomizeEnabled = false; public int villagerLobotomizeCheck = 60; @@ -197,7 +197,7 @@ index c313fce9497908fcbdff4148f20bbb8ab0d5864b..5cc4a0acf25af20262da4885af7c6119 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1653,6 +1655,8 @@ public class PurpurWorldConfig { +@@ -1655,6 +1657,8 @@ public class PurpurWorldConfig { } villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled); villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); diff --git a/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index 9a6ba65b5..cf05b555d 100644 --- a/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0137-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,10 +35,10 @@ index 43ef93d2c0c59e0d7021ee9aa2b44345192cc0a9..ce780a2ba7dcbd9c1c9dc24c07387861 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5cc4a0acf25af20262da4885af7c6119eb134742..516e8cde32951fe825865e5814ddbe62d52f86a6 100644 +index 13b445ded8bfe80617dd5e58ed94ebce630b786a..e664e7bcecbe69894e3bf950374faf202f05c667 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1863,6 +1863,7 @@ public class PurpurWorldConfig { +@@ -1865,6 +1865,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; @@ -46,7 +46,7 @@ index 5cc4a0acf25af20262da4885af7c6119eb134742..516e8cde32951fe825865e5814ddbe62 private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1876,5 +1877,6 @@ public class PurpurWorldConfig { +@@ -1878,5 +1879,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/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch index 8be188eb1..3245314aa 100644 --- a/patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0139-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -201,10 +201,10 @@ index ef4abaf68de01b0879f7d0b330d2d57cc6bd10f9..3e7409ebf1f94b9cf55f2d0b0fe17ca8 return super.mobInteract(player, hand); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 516e8cde32951fe825865e5814ddbe62d52f86a6..37ece27cee2202236373ae3031e56869b3f073eb 100644 +index e664e7bcecbe69894e3bf950374faf202f05c667..f5e385a371f7bd2da4d2d738b009e4ad62209019 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1750,6 +1750,8 @@ public class PurpurWorldConfig { +@@ -1752,6 +1752,8 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -213,7 +213,7 @@ index 516e8cde32951fe825865e5814ddbe62d52f86a6..37ece27cee2202236373ae3031e56869 public int wolfBreedingTicks = 6000; private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); -@@ -1760,6 +1762,8 @@ public class PurpurWorldConfig { +@@ -1762,6 +1764,8 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0140-Configurable-default-wolf-collar-color.patch b/patches/server/0140-Configurable-default-wolf-collar-color.patch index 9cc32d83c..41a94d13b 100644 --- a/patches/server/0140-Configurable-default-wolf-collar-color.patch +++ b/patches/server/0140-Configurable-default-wolf-collar-color.patch @@ -24,10 +24,10 @@ index 3e7409ebf1f94b9cf55f2d0b0fe17ca8ec44659f..518dd0e6b4889c049e438b393baa795a @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 37ece27cee2202236373ae3031e56869b3f073eb..ed0f3531e11e5742a6a72acc0cea0bb741505fb6 100644 +index f5e385a371f7bd2da4d2d738b009e4ad62209019..28a4e632d2c760d0b3a4d911a97fef0784a14b10 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1750,6 +1750,7 @@ public class PurpurWorldConfig { +@@ -1752,6 +1752,7 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -35,7 +35,7 @@ index 37ece27cee2202236373ae3031e56869b3f073eb..ed0f3531e11e5742a6a72acc0cea0bb7 public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; -@@ -1762,6 +1763,11 @@ public class PurpurWorldConfig { +@@ -1764,6 +1765,11 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0141-Phantom-flames-on-swoop.patch b/patches/server/0141-Phantom-flames-on-swoop.patch index 58cfb06af..a9145ff4f 100644 --- a/patches/server/0141-Phantom-flames-on-swoop.patch +++ b/patches/server/0141-Phantom-flames-on-swoop.patch @@ -17,10 +17,10 @@ index c55aba456aa144e58fc35877c61eff309eaa391f..c39e2d05fa81279a684532ee796880b1 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ed0f3531e11e5742a6a72acc0cea0bb741505fb6..8b9955408d846db69268ddf1698009994c3e6cee 100644 +index 28a4e632d2c760d0b3a4d911a97fef0784a14b10..635c6ed621823b127b4806cee1e498b7f934640e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1158,6 +1158,7 @@ public class PurpurWorldConfig { +@@ -1160,6 +1160,7 @@ public class PurpurWorldConfig { public float phantomFlameDamage = 1.0F; public int phantomFlameFireTime = 8; public boolean phantomAllowGriefing = false; @@ -28,7 +28,7 @@ index ed0f3531e11e5742a6a72acc0cea0bb741505fb6..8b9955408d846db69268ddf169800999 public double phantomMaxHealth = 20.0D; public double phantomAttackedByCrystalRadius = 0.0D; public float phantomAttackedByCrystalDamage = 1.0F; -@@ -1184,6 +1185,7 @@ public class PurpurWorldConfig { +@@ -1186,6 +1187,7 @@ public class PurpurWorldConfig { phantomFlameDamage = (float) getDouble("mobs.phantom.flames.damage", phantomFlameDamage); phantomFlameFireTime = getInt("mobs.phantom.flames.fire-time", phantomFlameFireTime); phantomAllowGriefing = getBoolean("mobs.phantom.allow-griefing", phantomAllowGriefing); diff --git a/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch index a3ec09d50..750c424fd 100644 --- a/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0142-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,10 +17,10 @@ index d980a556785b52fe827310b83638139df0816b11..3c8c02fc92374def12254f7ffad604b2 return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8b9955408d846db69268ddf1698009994c3e6cee..c9567e29dcd272e8a5e1cd40ed37beea3ce01a34 100644 +index 635c6ed621823b127b4806cee1e498b7f934640e..a2ed1d40fbca48d227010a98c5bfceb7afb917c3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -415,6 +415,11 @@ public class PurpurWorldConfig { +@@ -417,6 +417,11 @@ public class PurpurWorldConfig { caveVinesMaxGrowthAge = getInt("blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge); } diff --git a/patches/server/0144-Striders-give-saddle-back.patch b/patches/server/0144-Striders-give-saddle-back.patch index d6d63a8d1..c062a6b4d 100644 --- a/patches/server/0144-Striders-give-saddle-back.patch +++ b/patches/server/0144-Striders-give-saddle-back.patch @@ -28,10 +28,10 @@ index 294f276fa8d2d754abde11ebc3d39e5e68996b05..b3928617f732b49cfc124e9bdb879110 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c9567e29dcd272e8a5e1cd40ed37beea3ce01a34..4309aff1fed072f63ed466fcd0dfb9872f0e91ea 100644 +index a2ed1d40fbca48d227010a98c5bfceb7afb917c3..c70a6b4e706fedb3aceb9df0371bceff44f86492 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1533,6 +1533,7 @@ public class PurpurWorldConfig { +@@ -1535,6 +1535,7 @@ public class PurpurWorldConfig { public boolean striderRidableInWater = false; public double striderMaxHealth = 20.0D; public int striderBreedingTicks = 6000; @@ -39,7 +39,7 @@ index c9567e29dcd272e8a5e1cd40ed37beea3ce01a34..4309aff1fed072f63ed466fcd0dfb987 private void striderSettings() { striderRidable = getBoolean("mobs.strider.ridable", striderRidable); striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater); -@@ -1543,6 +1544,7 @@ public class PurpurWorldConfig { +@@ -1545,6 +1546,7 @@ public class PurpurWorldConfig { } striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth); striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks); diff --git a/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch index a66eec1e0..ab4c7e8c8 100644 --- a/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0149-Add-mobGriefing-bypass-to-everything-affected.patch @@ -393,10 +393,10 @@ index e98fc3c235f9160f1928a8afb0d7991a6d3430cb..db35f756b7adb6b113659ae13b08ab89 return true; // Purpur end diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5ef2fa37ad 100644 +index 070960881e097c69a9227893153ae352493e4f37..19fe72cb76aaf6ed87de8aae49f31aa9d5668c00 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -354,9 +354,12 @@ public class PurpurWorldConfig { +@@ -356,9 +356,12 @@ public class PurpurWorldConfig { public boolean boatsDoFallDamage = true; public boolean disableDropsOnCrammingDeath = false; public boolean entitiesCanUsePortals = true; @@ -409,7 +409,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; -@@ -368,9 +371,12 @@ public class PurpurWorldConfig { +@@ -370,9 +373,12 @@ public class PurpurWorldConfig { boatsDoFallDamage = getBoolean("gameplay-mechanics.boat.do-fall-damage", boatsDoFallDamage); disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath); entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals); @@ -422,7 +422,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight); voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight); voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt); -@@ -440,9 +446,11 @@ public class PurpurWorldConfig { +@@ -442,9 +448,11 @@ public class PurpurWorldConfig { dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils); } @@ -434,7 +434,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e farmlandGetsMoistFromBelow = getBoolean("blocks.farmland.gets-moist-from-below", farmlandGetsMoistFromBelow); farmlandAlpha = getBoolean("blocks.farmland.use-alpha-farmland", farmlandAlpha); } -@@ -468,6 +476,11 @@ public class PurpurWorldConfig { +@@ -470,6 +478,11 @@ public class PurpurWorldConfig { kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge); } @@ -446,7 +446,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e public boolean respawnAnchorExplode = true; public double respawnAnchorExplosionPower = 5.0D; public boolean respawnAnchorExplosionFire = true; -@@ -501,6 +514,11 @@ public class PurpurWorldConfig { +@@ -503,6 +516,11 @@ public class PurpurWorldConfig { stonecutterDamage = (float) getDouble("blocks.stonecutter.damage", stonecutterDamage); } @@ -458,7 +458,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e public double twistingVinesGrowthModifier = 0.10D; public int twistingVinesMaxGrowthAge = 25; private void twistingVinesSettings() { -@@ -679,6 +697,7 @@ public class PurpurWorldConfig { +@@ -681,6 +699,7 @@ public class PurpurWorldConfig { public double creeperMaxHealth = 20.0D; public double creeperChargedChance = 0.0D; public boolean creeperAllowGriefing = true; @@ -466,7 +466,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void creeperSettings() { creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); -@@ -690,6 +709,7 @@ public class PurpurWorldConfig { +@@ -692,6 +711,7 @@ public class PurpurWorldConfig { creeperMaxHealth = getDouble("mobs.creeper.attributes.max_health", creeperMaxHealth); creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing); @@ -474,7 +474,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean dolphinRidable = false; -@@ -777,6 +797,7 @@ public class PurpurWorldConfig { +@@ -779,6 +799,7 @@ public class PurpurWorldConfig { public double enderDragonMaxY = 256D; public double enderDragonMaxHealth = 200.0D; public boolean enderDragonAlwaysDropsFullExp = false; @@ -482,7 +482,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void enderDragonSettings() { enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable); enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater); -@@ -792,6 +813,7 @@ public class PurpurWorldConfig { +@@ -794,6 +815,7 @@ public class PurpurWorldConfig { } enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth); enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp); @@ -490,7 +490,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean endermanRidable = false; -@@ -799,6 +821,7 @@ public class PurpurWorldConfig { +@@ -801,6 +823,7 @@ public class PurpurWorldConfig { public double endermanMaxHealth = 40.0D; public boolean endermanAllowGriefing = true; public boolean endermanDespawnEvenWithBlock = false; @@ -498,7 +498,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -810,6 +833,7 @@ public class PurpurWorldConfig { +@@ -812,6 +835,7 @@ public class PurpurWorldConfig { endermanMaxHealth = getDouble("mobs.enderman.attributes.max_health", endermanMaxHealth); endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing); endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock); @@ -506,7 +506,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean endermiteRidable = false; -@@ -829,6 +853,7 @@ public class PurpurWorldConfig { +@@ -831,6 +855,7 @@ public class PurpurWorldConfig { public boolean evokerRidable = false; public boolean evokerRidableInWater = false; public double evokerMaxHealth = 24.0D; @@ -514,7 +514,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void evokerSettings() { evokerRidable = getBoolean("mobs.evoker.ridable", evokerRidable); evokerRidableInWater = getBoolean("mobs.evoker.ridable-in-water", evokerRidableInWater); -@@ -838,6 +863,7 @@ public class PurpurWorldConfig { +@@ -840,6 +865,7 @@ public class PurpurWorldConfig { set("mobs.evoker.attributes.max_health", oldValue); } evokerMaxHealth = getDouble("mobs.evoker.attributes.max_health", evokerMaxHealth); @@ -522,7 +522,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean foxRidable = false; -@@ -845,6 +871,7 @@ public class PurpurWorldConfig { +@@ -847,6 +873,7 @@ public class PurpurWorldConfig { public double foxMaxHealth = 10.0D; public boolean foxTypeChangesWithTulips = false; public int foxBreedingTicks = 6000; @@ -530,7 +530,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void foxSettings() { foxRidable = getBoolean("mobs.fox.ridable", foxRidable); foxRidableInWater = getBoolean("mobs.fox.ridable-in-water", foxRidableInWater); -@@ -856,6 +883,7 @@ public class PurpurWorldConfig { +@@ -858,6 +885,7 @@ public class PurpurWorldConfig { foxMaxHealth = getDouble("mobs.fox.attributes.max_health", foxMaxHealth); foxTypeChangesWithTulips = getBoolean("mobs.fox.tulips-change-type", foxTypeChangesWithTulips); foxBreedingTicks = getInt("mobs.fox.breeding-delay-ticks", foxBreedingTicks); @@ -538,7 +538,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean ghastRidable = false; -@@ -1251,6 +1279,7 @@ public class PurpurWorldConfig { +@@ -1253,6 +1281,7 @@ public class PurpurWorldConfig { public boolean piglinRidable = false; public boolean piglinRidableInWater = false; public double piglinMaxHealth = 16.0D; @@ -546,7 +546,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void piglinSettings() { piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable); piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater); -@@ -1260,6 +1289,7 @@ public class PurpurWorldConfig { +@@ -1262,6 +1291,7 @@ public class PurpurWorldConfig { set("mobs.piglin.attributes.max_health", oldValue); } piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth); @@ -554,7 +554,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean piglinBruteRidable = false; -@@ -1279,6 +1309,7 @@ public class PurpurWorldConfig { +@@ -1281,6 +1311,7 @@ public class PurpurWorldConfig { public boolean pillagerRidable = false; public boolean pillagerRidableInWater = false; public double pillagerMaxHealth = 24.0D; @@ -562,7 +562,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void pillagerSettings() { pillagerRidable = getBoolean("mobs.pillager.ridable", pillagerRidable); pillagerRidableInWater = getBoolean("mobs.pillager.ridable-in-water", pillagerRidableInWater); -@@ -1288,6 +1319,7 @@ public class PurpurWorldConfig { +@@ -1290,6 +1321,7 @@ public class PurpurWorldConfig { set("mobs.pillager.attributes.max_health", oldValue); } pillagerMaxHealth = getDouble("mobs.pillager.attributes.max_health", pillagerMaxHealth); @@ -570,7 +570,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean polarBearRidable = false; -@@ -1329,6 +1361,7 @@ public class PurpurWorldConfig { +@@ -1331,6 +1363,7 @@ public class PurpurWorldConfig { public double rabbitNaturalToast = 0.0D; public double rabbitNaturalKiller = 0.0D; public int rabbitBreedingTicks = 6000; @@ -578,7 +578,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void rabbitSettings() { rabbitRidable = getBoolean("mobs.rabbit.ridable", rabbitRidable); rabbitRidableInWater = getBoolean("mobs.rabbit.ridable-in-water", rabbitRidableInWater); -@@ -1341,11 +1374,13 @@ public class PurpurWorldConfig { +@@ -1343,11 +1376,13 @@ public class PurpurWorldConfig { rabbitNaturalToast = getDouble("mobs.rabbit.spawn-toast-chance", rabbitNaturalToast); rabbitNaturalKiller = getDouble("mobs.rabbit.spawn-killer-rabbit-chance", rabbitNaturalKiller); rabbitBreedingTicks = getInt("mobs.rabbit.breeding-delay-ticks", rabbitBreedingTicks); @@ -592,7 +592,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void ravagerSettings() { ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable); ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater); -@@ -1355,6 +1390,7 @@ public class PurpurWorldConfig { +@@ -1357,6 +1392,7 @@ public class PurpurWorldConfig { set("mobs.ravager.attributes.max_health", oldValue); } ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth); @@ -600,7 +600,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean salmonRidable = false; -@@ -1373,6 +1409,7 @@ public class PurpurWorldConfig { +@@ -1375,6 +1411,7 @@ public class PurpurWorldConfig { public boolean sheepRidableInWater = false; public double sheepMaxHealth = 8.0D; public int sheepBreedingTicks = 6000; @@ -608,7 +608,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void sheepSettings() { sheepRidable = getBoolean("mobs.sheep.ridable", sheepRidable); sheepRidableInWater = getBoolean("mobs.sheep.ridable-in-water", sheepRidableInWater); -@@ -1383,6 +1420,7 @@ public class PurpurWorldConfig { +@@ -1385,6 +1422,7 @@ public class PurpurWorldConfig { } sheepMaxHealth = getDouble("mobs.sheep.attributes.max_health", sheepMaxHealth); sheepBreedingTicks = getInt("mobs.sheep.breeding-delay-ticks", sheepBreedingTicks); @@ -616,7 +616,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean shulkerRidable = false; -@@ -1402,6 +1440,7 @@ public class PurpurWorldConfig { +@@ -1404,6 +1442,7 @@ public class PurpurWorldConfig { public boolean silverfishRidable = false; public boolean silverfishRidableInWater = false; public double silverfishMaxHealth = 8.0D; @@ -624,7 +624,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void silverfishSettings() { silverfishRidable = getBoolean("mobs.silverfish.ridable", silverfishRidable); silverfishRidableInWater = getBoolean("mobs.silverfish.ridable-in-water", silverfishRidableInWater); -@@ -1411,6 +1450,7 @@ public class PurpurWorldConfig { +@@ -1413,6 +1452,7 @@ public class PurpurWorldConfig { set("mobs.silverfish.attributes.max_health", oldValue); } silverfishMaxHealth = getDouble("mobs.silverfish.attributes.max_health", silverfishMaxHealth); @@ -632,7 +632,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean skeletonRidable = false; -@@ -1478,6 +1518,7 @@ public class PurpurWorldConfig { +@@ -1480,6 +1520,7 @@ public class PurpurWorldConfig { public int snowGolemSnowBallMax = 20; public float snowGolemSnowBallModifier = 10.0F; public double snowGolemAttackDistance = 1.25D; @@ -640,7 +640,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -1494,6 +1535,7 @@ public class PurpurWorldConfig { +@@ -1496,6 +1537,7 @@ public class PurpurWorldConfig { snowGolemSnowBallMax = getInt("mobs.snow_golem.max-shoot-interval-ticks", snowGolemSnowBallMax); snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier); snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance); @@ -648,7 +648,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean squidRidable = false; -@@ -1653,6 +1695,7 @@ public class PurpurWorldConfig { +@@ -1655,6 +1697,7 @@ public class PurpurWorldConfig { public int villagerLobotomizeCheck = 60; public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; @@ -656,7 +656,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1679,6 +1722,7 @@ public class PurpurWorldConfig { +@@ -1681,6 +1724,7 @@ public class PurpurWorldConfig { villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); @@ -664,7 +664,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean vindicatorRidable = false; -@@ -1735,6 +1779,7 @@ public class PurpurWorldConfig { +@@ -1737,6 +1781,7 @@ public class PurpurWorldConfig { public double witherMaxHealth = 300.0D; public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; @@ -672,7 +672,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1751,6 +1796,7 @@ public class PurpurWorldConfig { +@@ -1753,6 +1798,7 @@ public class PurpurWorldConfig { witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth); witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount); witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); @@ -680,7 +680,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e } public boolean witherSkeletonRidable = false; -@@ -1818,6 +1864,7 @@ public class PurpurWorldConfig { +@@ -1820,6 +1866,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public Difficulty zombieBreakDoorMinDifficulty = Difficulty.HARD; @@ -688,7 +688,7 @@ index cfff7b76f993d5bf134d1de27052d6e33dd03a66..d23f0116e3836887a014e714effd8f5e private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1837,6 +1884,7 @@ public class PurpurWorldConfig { +@@ -1839,6 +1886,7 @@ public class PurpurWorldConfig { } catch (IllegalArgumentException ignore) { zombieBreakDoorMinDifficulty = Difficulty.HARD; } diff --git a/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch index 68c6452e9..0b4d6bc99 100644 --- a/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0150-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,10 +22,10 @@ index d3c8fd8399629efb8bcbaf7d9a0c43340fcdfeda..c74df3b5c2a25469ad3fb6a853438bbc org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE)); if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d23f0116e3836887a014e714effd8f5ef2fa37ad..606055390f94a48bd660c31a59f79d4b18fe773c 100644 +index 19fe72cb76aaf6ed87de8aae49f31aa9d5668c00..3d100010d35c3c13a9bef186d2b1620c91fc0ecb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -357,6 +357,7 @@ public class PurpurWorldConfig { +@@ -359,6 +359,7 @@ public class PurpurWorldConfig { public boolean entitiesPickUpLootBypassMobGriefing = false; public boolean fireballsBypassMobGriefing = false; public boolean milkCuresBadOmen = true; @@ -33,7 +33,7 @@ index d23f0116e3836887a014e714effd8f5ef2fa37ad..606055390f94a48bd660c31a59f79d4b public boolean persistentTileEntityDisplayNames = false; public boolean persistentDroppableEntityDisplayNames = false; public boolean projectilesBypassMobGriefing = false; -@@ -374,6 +375,7 @@ public class PurpurWorldConfig { +@@ -376,6 +377,7 @@ public class PurpurWorldConfig { entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing); fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing); milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen); diff --git a/patches/server/0151-Add-EntityTeleportHinderedEvent.patch b/patches/server/0151-Add-EntityTeleportHinderedEvent.patch index f75774c5a..e286547ab 100644 --- a/patches/server/0151-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0151-Add-EntityTeleportHinderedEvent.patch @@ -78,10 +78,10 @@ index 09cbce5aec6eabfa220f7de81b492a180cb8ca1e..265770975ad1190283103b04cdd52a07 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 606055390f94a48bd660c31a59f79d4b18fe773c..b8b58d3ac28d038db9eefa57b46864738e17d8d1 100644 +index 3d100010d35c3c13a9bef186d2b1620c91fc0ecb..5e6a1e95d410abf68ee44abaa93fe15913ccba73 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -356,6 +356,7 @@ public class PurpurWorldConfig { +@@ -358,6 +358,7 @@ public class PurpurWorldConfig { public boolean entitiesCanUsePortals = true; public boolean entitiesPickUpLootBypassMobGriefing = false; public boolean fireballsBypassMobGriefing = false; @@ -89,7 +89,7 @@ index 606055390f94a48bd660c31a59f79d4b18fe773c..b8b58d3ac28d038db9eefa57b4686473 public boolean milkCuresBadOmen = true; public boolean noteBlockIgnoreAbove = false; public boolean persistentTileEntityDisplayNames = false; -@@ -374,6 +375,7 @@ public class PurpurWorldConfig { +@@ -376,6 +377,7 @@ public class PurpurWorldConfig { entitiesCanUsePortals = getBoolean("gameplay-mechanics.entities-can-use-portals", entitiesCanUsePortals); entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing); fireballsBypassMobGriefing = getBoolean("gameplay-mechanics.fireballs-bypass-mob-griefing", fireballsBypassMobGriefing); diff --git a/patches/server/0153-Farmland-trampling-changes.patch b/patches/server/0153-Farmland-trampling-changes.patch index 34d2c513c..831040c0a 100644 --- a/patches/server/0153-Farmland-trampling-changes.patch +++ b/patches/server/0153-Farmland-trampling-changes.patch @@ -37,10 +37,10 @@ index aad204181c4f54ee533bfe3fc04a8705b847e371..16eb80e7926cf4fe421c17d7d851d457 if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b8b58d3ac28d038db9eefa57b46864738e17d8d1..3fc168278c29de591e989e38acf24c39bc6aea3f 100644 +index 5e6a1e95d410abf68ee44abaa93fe15913ccba73..8b5c90fd29696aadd0c897de6ca1be82790511c0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -453,10 +453,16 @@ public class PurpurWorldConfig { +@@ -455,10 +455,16 @@ public class PurpurWorldConfig { public boolean farmlandBypassMobGriefing = false; public boolean farmlandGetsMoistFromBelow = false; public boolean farmlandAlpha = false; diff --git a/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch index 271666f0c..d33b4b4b2 100644 --- a/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0156-Toggle-for-water-sensitive-mob-damage.patch @@ -70,10 +70,10 @@ index b3928617f732b49cfc124e9bdb879110413defd7..1c6d29a30df66e9971cd50e264bb4455 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc34f77d64f 100644 +index 0727c7755f81ac1b0f29f7d874892b5ad32c5f53..ddf51a9e9771e4c9a40751d9b860ea76ad5648d8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -614,6 +614,7 @@ public class PurpurWorldConfig { +@@ -616,6 +616,7 @@ public class PurpurWorldConfig { public boolean blazeRidableInWater = false; public double blazeMaxY = 256D; public double blazeMaxHealth = 20.0D; @@ -81,7 +81,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 private void blazeSettings() { blazeRidable = getBoolean("mobs.blaze.ridable", blazeRidable); blazeRidableInWater = getBoolean("mobs.blaze.ridable-in-water", blazeRidableInWater); -@@ -624,6 +625,7 @@ public class PurpurWorldConfig { +@@ -626,6 +627,7 @@ public class PurpurWorldConfig { set("mobs.blaze.attributes.max_health", oldValue); } blazeMaxHealth = getDouble("mobs.blaze.attributes.max_health", blazeMaxHealth); @@ -89,7 +89,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 } public boolean catRidable = false; -@@ -840,6 +842,7 @@ public class PurpurWorldConfig { +@@ -842,6 +844,7 @@ public class PurpurWorldConfig { public boolean endermanAllowGriefing = true; public boolean endermanDespawnEvenWithBlock = false; public boolean endermanBypassMobGriefing = false; @@ -97,7 +97,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -852,6 +855,7 @@ public class PurpurWorldConfig { +@@ -854,6 +857,7 @@ public class PurpurWorldConfig { endermanAllowGriefing = getBoolean("mobs.enderman.allow-griefing", endermanAllowGriefing); endermanDespawnEvenWithBlock = getBoolean("mobs.enderman.can-despawn-with-held-block", endermanDespawnEvenWithBlock); endermanBypassMobGriefing = getBoolean("mobs.enderman.bypass-mob-griefing", endermanBypassMobGriefing); @@ -105,7 +105,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 } public boolean endermiteRidable = false; -@@ -1537,6 +1541,7 @@ public class PurpurWorldConfig { +@@ -1539,6 +1543,7 @@ public class PurpurWorldConfig { public float snowGolemSnowBallModifier = 10.0F; public double snowGolemAttackDistance = 1.25D; public boolean snowGolemBypassMobGriefing = false; @@ -113,7 +113,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 private void snowGolemSettings() { snowGolemRidable = getBoolean("mobs.snow_golem.ridable", snowGolemRidable); snowGolemRidableInWater = getBoolean("mobs.snow_golem.ridable-in-water", snowGolemRidableInWater); -@@ -1554,6 +1559,7 @@ public class PurpurWorldConfig { +@@ -1556,6 +1561,7 @@ public class PurpurWorldConfig { snowGolemSnowBallModifier = (float) getDouble("mobs.snow_golem.snow-ball-modifier", snowGolemSnowBallModifier); snowGolemAttackDistance = getDouble("mobs.snow_golem.attack-distance", snowGolemAttackDistance); snowGolemBypassMobGriefing = getBoolean("mobs.snow_golem.bypass-mob-griefing", snowGolemBypassMobGriefing); @@ -121,7 +121,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 } public boolean squidRidable = false; -@@ -1607,6 +1613,7 @@ public class PurpurWorldConfig { +@@ -1609,6 +1615,7 @@ public class PurpurWorldConfig { public double striderMaxHealth = 20.0D; public int striderBreedingTicks = 6000; public boolean striderGiveSaddleBack = false; @@ -129,7 +129,7 @@ index a621a705fba7b6cdd255eda900296defbe4476b5..e67254a644e1af029fe76b6770751bc3 private void striderSettings() { striderRidable = getBoolean("mobs.strider.ridable", striderRidable); striderRidableInWater = getBoolean("mobs.strider.ridable-in-water", striderRidableInWater); -@@ -1618,6 +1625,7 @@ public class PurpurWorldConfig { +@@ -1620,6 +1627,7 @@ public class PurpurWorldConfig { striderMaxHealth = getDouble("mobs.strider.attributes.max_health", striderMaxHealth); striderBreedingTicks = getInt("mobs.strider.breeding-delay-ticks", striderBreedingTicks); striderGiveSaddleBack = getBoolean("mobs.strider.give-saddle-back", striderGiveSaddleBack); diff --git a/patches/server/0157-Config-to-always-tame-in-Creative.patch b/patches/server/0157-Config-to-always-tame-in-Creative.patch index 55838d834..c0beaa587 100644 --- a/patches/server/0157-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0157-Config-to-always-tame-in-Creative.patch @@ -59,10 +59,10 @@ index 518dd0e6b4889c049e438b393baa795a5eac3e7d..21e154c4e7fe261a41c891b481072fbd this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e67254a644e1af029fe76b6770751bc34f77d64f..5a09eff3d6a0c4542cb8f647fb0cee45358bdcdd 100644 +index ddf51a9e9771e4c9a40751d9b860ea76ad5648d8..707bd788b637ab7663dc7d83c974c6f0560ded6b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -358,6 +358,7 @@ public class PurpurWorldConfig { +@@ -360,6 +360,7 @@ public class PurpurWorldConfig { } public boolean useBetterMending = false; @@ -70,7 +70,7 @@ index e67254a644e1af029fe76b6770751bc34f77d64f..5a09eff3d6a0c4542cb8f647fb0cee45 public boolean boatEjectPlayersOnLand = false; public boolean boatsDoFallDamage = true; public boolean disableDropsOnCrammingDeath = false; -@@ -377,6 +378,7 @@ public class PurpurWorldConfig { +@@ -379,6 +380,7 @@ public class PurpurWorldConfig { public int animalBreedingCooldownSeconds = 0; private void miscGameplayMechanicsSettings() { useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending); diff --git a/patches/server/0158-End-crystal-explosion-options.patch b/patches/server/0158-End-crystal-explosion-options.patch index d40653d08..59676af5b 100644 --- a/patches/server/0158-End-crystal-explosion-options.patch +++ b/patches/server/0158-End-crystal-explosion-options.patch @@ -52,10 +52,10 @@ index 92e65f3fbc8f5d77bb8cc31e7a7780c2589f4227..0c46507ab0b904fb1f79bc5421c88c03 this.onDestroyedBy(source); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5a09eff3d6a0c4542cb8f647fb0cee45358bdcdd..b74cbdc1789b4fd6c6e93f639e25d84829d1d933 100644 +index 707bd788b637ab7663dc7d83c974c6f0560ded6b..e2acaee70a19c4cfadcf75ab176c3492965d8314 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -460,6 +460,35 @@ public class PurpurWorldConfig { +@@ -462,6 +462,35 @@ public class PurpurWorldConfig { dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils); } diff --git a/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index c0b775ecf..1e2214c27 100644 --- a/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0160-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -29,10 +29,10 @@ index 15d35d325b66e1a417eb7ba699597d627bd4eb54..36745f845f33c877595d572e46bd8e96 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b74cbdc1789b4fd6c6e93f639e25d84829d1d933..e56519d674ef5031c642b99497bf46f9cfab03a0 100644 +index e2acaee70a19c4cfadcf75ab176c3492965d8314..8762fbd0e8ee7e016dda12b70ec5e4e5f4b467da 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -849,6 +849,7 @@ public class PurpurWorldConfig { +@@ -851,6 +851,7 @@ public class PurpurWorldConfig { public double enderDragonMaxHealth = 200.0D; public boolean enderDragonAlwaysDropsFullExp = false; public boolean enderDragonBypassMobGriefing = false; @@ -40,7 +40,7 @@ index b74cbdc1789b4fd6c6e93f639e25d84829d1d933..e56519d674ef5031c642b99497bf46f9 private void enderDragonSettings() { enderDragonRidable = getBoolean("mobs.ender_dragon.ridable", enderDragonRidable); enderDragonRidableInWater = getBoolean("mobs.ender_dragon.ridable-in-water", enderDragonRidableInWater); -@@ -865,6 +866,7 @@ public class PurpurWorldConfig { +@@ -867,6 +868,7 @@ public class PurpurWorldConfig { enderDragonMaxHealth = getDouble("mobs.ender_dragon.attributes.max_health", enderDragonMaxHealth); enderDragonAlwaysDropsFullExp = getBoolean("mobs.ender_dragon.always-drop-full-exp", enderDragonAlwaysDropsFullExp); enderDragonBypassMobGriefing = getBoolean("mobs.ender_dragon.bypass-mob-griefing", enderDragonBypassMobGriefing); @@ -48,7 +48,7 @@ index b74cbdc1789b4fd6c6e93f639e25d84829d1d933..e56519d674ef5031c642b99497bf46f9 } public boolean endermanRidable = false; -@@ -1837,6 +1839,7 @@ public class PurpurWorldConfig { +@@ -1839,6 +1841,7 @@ public class PurpurWorldConfig { public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; public boolean witherBypassMobGriefing = false; @@ -56,7 +56,7 @@ index b74cbdc1789b4fd6c6e93f639e25d84829d1d933..e56519d674ef5031c642b99497bf46f9 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1854,6 +1857,7 @@ public class PurpurWorldConfig { +@@ -1856,6 +1859,7 @@ public class PurpurWorldConfig { witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount); witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); diff --git a/patches/server/0163-Add-config-for-snow-on-blue-ice.patch b/patches/server/0163-Add-config-for-snow-on-blue-ice.patch index 4be45e3b3..702578895 100644 --- a/patches/server/0163-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0163-Add-config-for-snow-on-blue-ice.patch @@ -29,10 +29,10 @@ index 0169d874247a96c2e10a65ecb9c0c093f5a6ecfb..b760e2d014b3ae70671878082bb853b7 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 260153f7f32558766b75985e6d7a76c21c2b49ac..39b2dcd904a222bdcb4e723af43dfc6762d8518e 100644 +index d76a2b7e8976c20d60dd3aeb4c5c67c1f5f17b36..e316f24579498a53c4e79bbb086adde4e3cd460c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -515,6 +515,11 @@ public class PurpurWorldConfig { +@@ -517,6 +517,11 @@ public class PurpurWorldConfig { furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel); } diff --git a/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch index 034ded334..c2cda3f2f 100644 --- a/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0167-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -18,10 +18,10 @@ index 3907b7cb559dabdd3cc347678d42071215c66a6c..e8779b23b5e1a399dde19fc66d820101 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3cdf1832a1552e10d8fc36d06200439bc36de7e1..f324621df51c8f84b0761e2ef60d57d37aecf1a8 100644 +index 3bf5226ab5e94880761a35c6c1c4eaf1c80754cd..cd8efb49bea29fb6b0ad8037af16a02de6d9d98c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -897,6 +897,8 @@ public class PurpurWorldConfig { +@@ -899,6 +899,8 @@ public class PurpurWorldConfig { public boolean endermanDespawnEvenWithBlock = false; public boolean endermanBypassMobGriefing = false; public boolean endermanTakeDamageFromWater = true; @@ -30,7 +30,7 @@ index 3cdf1832a1552e10d8fc36d06200439bc36de7e1..f324621df51c8f84b0761e2ef60d57d3 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -905,11 +907,17 @@ public class PurpurWorldConfig { +@@ -907,11 +909,17 @@ public class PurpurWorldConfig { set("mobs.enderman.attributes.max-health", null); set("mobs.enderman.attributes.max_health", oldValue); } diff --git a/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index b51f78434..462f91f12 100644 --- a/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0168-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -20,10 +20,10 @@ index e8779b23b5e1a399dde19fc66d820101d61f36bc..ba61f78874d8578b862f317fe00a3162 } else { Vec3 vec3d = player.getViewVector(1.0F).normalize(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f324621df51c8f84b0761e2ef60d57d37aecf1a8..973820013187457ee9dbae89159103e9140b3115 100644 +index cd8efb49bea29fb6b0ad8037af16a02de6d9d98c..9551a20dfefd8b917a84d5051d2510e1d4a68dcb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -899,6 +899,8 @@ public class PurpurWorldConfig { +@@ -901,6 +901,8 @@ public class PurpurWorldConfig { public boolean endermanTakeDamageFromWater = true; public boolean endermanAggroEndermites = true; public boolean endermanAggroEndermitesOnlyIfPlayerSpawned = false; @@ -32,7 +32,7 @@ index f324621df51c8f84b0761e2ef60d57d37aecf1a8..973820013187457ee9dbae89159103e9 private void endermanSettings() { endermanRidable = getBoolean("mobs.enderman.ridable", endermanRidable); endermanRidableInWater = getBoolean("mobs.enderman.ridable-in-water", endermanRidableInWater); -@@ -918,6 +920,8 @@ public class PurpurWorldConfig { +@@ -920,6 +922,8 @@ public class PurpurWorldConfig { endermanTakeDamageFromWater = getBoolean("mobs.enderman.takes-damage-from-water", endermanTakeDamageFromWater); endermanAggroEndermites = getBoolean("mobs.enderman.aggressive-towards-endermites", endermanAggroEndermites); endermanAggroEndermitesOnlyIfPlayerSpawned = getBoolean("mobs.enderman.aggressive-towards-endermites-only-spawned-by-player-thrown-ender-pearls", endermanAggroEndermitesOnlyIfPlayerSpawned); diff --git a/patches/server/0169-Tick-fluids-config.patch b/patches/server/0169-Tick-fluids-config.patch index 2edf304dd..6f60422fa 100644 --- a/patches/server/0169-Tick-fluids-config.patch +++ b/patches/server/0169-Tick-fluids-config.patch @@ -36,10 +36,10 @@ index 087601ffdeea97ec4cbb9959607bdcbcbae7c6fa..ad24daa0c727df15dbe0549036290a6c } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 973820013187457ee9dbae89159103e9140b3115..bf20d52a22390b8b61bf5d7d7f12632133d0e7c5 100644 +index 9551a20dfefd8b917a84d5051d2510e1d4a68dcb..29adeade6cfa4bcd3f0c058ea337c784be0f39ee 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -387,6 +387,7 @@ public class PurpurWorldConfig { +@@ -389,6 +389,7 @@ public class PurpurWorldConfig { public boolean persistentTileEntityDisplayNames = false; public boolean persistentDroppableEntityDisplayNames = false; public boolean projectilesBypassMobGriefing = false; @@ -47,7 +47,7 @@ index 973820013187457ee9dbae89159103e9140b3115..bf20d52a22390b8b61bf5d7d7f126321 public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; -@@ -407,6 +408,7 @@ public class PurpurWorldConfig { +@@ -409,6 +410,7 @@ public class PurpurWorldConfig { persistentTileEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-tileentity-display-names-and-lore", persistentTileEntityDisplayNames); persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames); projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing); diff --git a/patches/server/0170-Config-to-disable-Llama-caravans.patch b/patches/server/0170-Config-to-disable-Llama-caravans.patch index f169e1601..0b29bb6e0 100644 --- a/patches/server/0170-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0170-Config-to-disable-Llama-caravans.patch @@ -19,7 +19,7 @@ index 34dec0a94840a8865f1d80857ec54a1022ae5b84..5fc930a75d6bedb2b841a6c601ed6a45 List list = this.llama.level.getEntities(this.llama, this.llama.getBoundingBox().inflate(9.0D, 4.0D, 9.0D), (entity) -> { EntityType entityType = entity.getType(); diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java -index 873e1d64b917e961c9d9b5217fe664a91d0ab5bc..c31ffb302dba05d9771db7bd17993a1e03374417 100644 +index 93a05b945ac248df0ea7a0b9d7264a9c129c3bcf..8f12851f220bb23102f52f523a4c5d9855a46e95 100644 --- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java +++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java @@ -502,7 +502,7 @@ public class Llama extends AbstractChestedHorse implements RangedAttackMob { @@ -32,10 +32,10 @@ index 873e1d64b917e961c9d9b5217fe664a91d0ab5bc..c31ffb302dba05d9771db7bd17993a1e this.caravanHead.caravanTail = this; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index bf20d52a22390b8b61bf5d7d7f12632133d0e7c5..7026ac6e77d248be658e223e662e69a952fe9181 100644 +index 29adeade6cfa4bcd3f0c058ea337c784be0f39ee..5bbd9de46131c56aa6c5fb7df88d6f39527202c6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1165,6 +1165,7 @@ public class PurpurWorldConfig { +@@ -1167,6 +1167,7 @@ public class PurpurWorldConfig { public double llamaMovementSpeedMin = 0.175D; public double llamaMovementSpeedMax = 0.175D; public int llamaBreedingTicks = 6000; @@ -43,7 +43,7 @@ index bf20d52a22390b8b61bf5d7d7f12632133d0e7c5..7026ac6e77d248be658e223e662e69a9 private void llamaSettings() { llamaRidable = getBoolean("mobs.llama.ridable", llamaRidable); llamaRidableInWater = getBoolean("mobs.llama.ridable-in-water", llamaRidableInWater); -@@ -1182,6 +1183,7 @@ public class PurpurWorldConfig { +@@ -1184,6 +1185,7 @@ public class PurpurWorldConfig { llamaMovementSpeedMin = getDouble("mobs.llama.attributes.movement_speed.min", llamaMovementSpeedMin); llamaMovementSpeedMax = getDouble("mobs.llama.attributes.movement_speed.max", llamaMovementSpeedMax); llamaBreedingTicks = getInt("mobs.llama.breeding-delay-ticks", llamaBreedingTicks); diff --git a/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch index df5f33a8b..1208e5f7d 100644 --- a/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0171-Config-to-make-Creepers-explode-on-death.patch @@ -50,10 +50,10 @@ index c550b8c19837ed9bf730a3eb777bc00de4e7ceb2..02494dcc8a342f65b2855612aebeb019 private void spawnLingeringCloud() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7026ac6e77d248be658e223e662e69a952fe9181..353e220c37997f8d48645e811b2c75ac29f1dd72 100644 +index 5bbd9de46131c56aa6c5fb7df88d6f39527202c6..a7e993f9325dfa00085a7445270b68bc64b4b676 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -772,6 +772,7 @@ public class PurpurWorldConfig { +@@ -774,6 +774,7 @@ public class PurpurWorldConfig { public double creeperChargedChance = 0.0D; public boolean creeperAllowGriefing = true; public boolean creeperBypassMobGriefing = false; @@ -61,7 +61,7 @@ index 7026ac6e77d248be658e223e662e69a952fe9181..353e220c37997f8d48645e811b2c75ac private void creeperSettings() { creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); -@@ -784,6 +785,7 @@ public class PurpurWorldConfig { +@@ -786,6 +787,7 @@ public class PurpurWorldConfig { creeperChargedChance = getDouble("mobs.creeper.naturally-charged-chance", creeperChargedChance); creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing); creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing); diff --git a/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch index 0dac71724..9713d979a 100644 --- a/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0172-Configurable-ravager-griefable-blocks-list.patch @@ -31,10 +31,10 @@ index 3c51e6d419a244b9270119590aa299527163c331..b466b0430dd94777975a1e7ab9792166 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 353e220c37997f8d48645e811b2c75ac29f1dd72..256dd7999edbeb7f64509aea2f9bfad55564cf53 100644 +index a7e993f9325dfa00085a7445270b68bc64b4b676..e314a4dc6cd686897ed5409110be5861659b3ef6 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1475,6 +1475,7 @@ public class PurpurWorldConfig { +@@ -1477,6 +1477,7 @@ public class PurpurWorldConfig { public boolean ravagerRidableInWater = false; public double ravagerMaxHealth = 100.0D; public boolean ravagerBypassMobGriefing = false; @@ -42,7 +42,7 @@ index 353e220c37997f8d48645e811b2c75ac29f1dd72..256dd7999edbeb7f64509aea2f9bfad5 private void ravagerSettings() { ravagerRidable = getBoolean("mobs.ravager.ridable", ravagerRidable); ravagerRidableInWater = getBoolean("mobs.ravager.ridable-in-water", ravagerRidableInWater); -@@ -1485,6 +1486,23 @@ public class PurpurWorldConfig { +@@ -1487,6 +1488,23 @@ public class PurpurWorldConfig { } ravagerMaxHealth = getDouble("mobs.ravager.attributes.max_health", ravagerMaxHealth); ravagerBypassMobGriefing = getBoolean("mobs.ravager.bypass-mob-griefing", ravagerBypassMobGriefing); diff --git a/patches/server/0173-Sneak-to-bulk-process-composter.patch b/patches/server/0173-Sneak-to-bulk-process-composter.patch index 15c66cbe1..fc63c1d26 100644 --- a/patches/server/0173-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0173-Sneak-to-bulk-process-composter.patch @@ -62,10 +62,10 @@ index 4c9ae6bdb2f0358798f84928271a2d783dcba7b4..47bf769a031ae39cc72d2191195d1378 int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 256dd7999edbeb7f64509aea2f9bfad55564cf53..0bf00191954f1b08661677f88b0c1c43f483eb5d 100644 +index e314a4dc6cd686897ed5409110be5861659b3ef6..b8f73bf7bb771e4b04ac7d07323bb774f9be612c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -471,6 +471,11 @@ public class PurpurWorldConfig { +@@ -473,6 +473,11 @@ public class PurpurWorldConfig { chestOpenWithBlockOnTop = getBoolean("blocks.chest.open-with-solid-block-on-top", chestOpenWithBlockOnTop); } diff --git a/patches/server/0175-Add-config-for-villager-trading.patch b/patches/server/0175-Add-config-for-villager-trading.patch index cb2a0dec4..948e2b535 100644 --- a/patches/server/0175-Add-config-for-villager-trading.patch +++ b/patches/server/0175-Add-config-for-villager-trading.patch @@ -31,10 +31,10 @@ index c48935d35a6141c41db22e3ec172d5994fd317a2..fa4644c11cbb252734a6f5dc21c861d2 this.openTradingScreen(player, this.getDisplayName(), 1); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3cae0929bd136ec3cfa5893980fa686fec9c9770..8e711033337bacb669deb1986a2a47f17ad8dc98 100644 +index 8084386be71afd0138c7092e9a8a57bf7a0fc99b..763b4087eb9325aa4b34a4e47aa126dd9bcbfcbe 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1819,6 +1819,7 @@ public class PurpurWorldConfig { +@@ -1821,6 +1821,7 @@ public class PurpurWorldConfig { public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; public boolean villagerBypassMobGriefing = false; @@ -42,7 +42,7 @@ index 3cae0929bd136ec3cfa5893980fa686fec9c9770..8e711033337bacb669deb1986a2a47f1 private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1846,6 +1847,7 @@ public class PurpurWorldConfig { +@@ -1848,6 +1849,7 @@ public class PurpurWorldConfig { villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); @@ -50,7 +50,7 @@ index 3cae0929bd136ec3cfa5893980fa686fec9c9770..8e711033337bacb669deb1986a2a47f1 } public boolean vindicatorRidable = false; -@@ -1869,6 +1871,7 @@ public class PurpurWorldConfig { +@@ -1871,6 +1873,7 @@ public class PurpurWorldConfig { public double wanderingTraderMaxHealth = 20.0D; public boolean wanderingTraderFollowEmeraldBlock = false; public boolean wanderingTraderCanBeLeashed = false; @@ -58,7 +58,7 @@ index 3cae0929bd136ec3cfa5893980fa686fec9c9770..8e711033337bacb669deb1986a2a47f1 private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -1880,6 +1883,7 @@ public class PurpurWorldConfig { +@@ -1882,6 +1885,7 @@ public class PurpurWorldConfig { wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth); wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); diff --git a/patches/server/0178-Break-individual-slabs-when-sneaking.patch b/patches/server/0178-Break-individual-slabs-when-sneaking.patch index 9d143a82e..470e06548 100644 --- a/patches/server/0178-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0178-Break-individual-slabs-when-sneaking.patch @@ -47,10 +47,10 @@ index eb7f8907bb362c0461194bbaf62917ce71c669f3..89f5e0d26500f1806dff9f91390546cd + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index b2af89516f18d16c87c949e66519cc693675d8e4..593603eb6b014fe711ffecd8d4397366633878d2 100644 +index 373ffc8229f35eb5268f8e8e3c52fe79c456587e..1e8aed0423c4eab66a3cf42bc5c459cb66c2b8c3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -592,6 +592,11 @@ public class PurpurWorldConfig { +@@ -594,6 +594,11 @@ public class PurpurWorldConfig { signRightClickEdit = getBoolean("blocks.sign.right-click-edit", signRightClickEdit); } diff --git a/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch index 8eb222572..417810509 100644 --- a/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0179-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -22,10 +22,10 @@ index fc34cfa8bfb3b82a8e1b28d261f0e901d837467e..35d47bb0d8c4a2b8374564133f040899 return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 593603eb6b014fe711ffecd8d4397366633878d2..3517de061b0278e2107be1539dd9e8ac7c2a75fe 100644 +index 1e8aed0423c4eab66a3cf42bc5c459cb66c2b8c3..67b5c6d2f516b6b90dbb1cda9366580eaf7b3b34 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -544,8 +544,12 @@ public class PurpurWorldConfig { +@@ -546,8 +546,12 @@ public class PurpurWorldConfig { } public boolean snowOnBlueIce = true; diff --git a/patches/server/0181-Option-to-make-doors-require-redstone.patch b/patches/server/0181-Option-to-make-doors-require-redstone.patch index d361d42b2..92b1c5ffa 100644 --- a/patches/server/0181-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0181-Option-to-make-doors-require-redstone.patch @@ -67,10 +67,10 @@ index c903a1a8d2234bb0fa354d1c44ff3ab2275b04c7..d01e4064a772710c1383927e0848b9b3 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 897ab21292b3ec1dfff3802caa6cd4ee3b1c45b7..cf27ecc93f92d57d25d1721fbb54af334ac725f8 100644 +index f342958c4b46d3c81cd93c0cf8ad3255e6b7782b..2f91119af4f3880aa71cc4957ac0276f867fcf71 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -496,6 +496,16 @@ public class PurpurWorldConfig { +@@ -498,6 +498,16 @@ public class PurpurWorldConfig { dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils); } diff --git a/patches/server/0183-Configurable-sponge-absorption.patch b/patches/server/0183-Configurable-sponge-absorption.patch index 978391d7d..9ea8b7360 100644 --- a/patches/server/0183-Configurable-sponge-absorption.patch +++ b/patches/server/0183-Configurable-sponge-absorption.patch @@ -43,10 +43,10 @@ index 1ef8eadd4e59f2e5d2bbd84f6f9bcf37b59db5bd..5b10e1110f938745c8f9ed0b55960566 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cf27ecc93f92d57d25d1721fbb54af334ac725f8..fd195e7263cd3efdd0a8161b474e2dc910261543 100644 +index 2f91119af4f3880aa71cc4957ac0276f867fcf71..f80a22855c7c7b26f9af087f2c0c70c608b3d2fb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -618,6 +618,13 @@ public class PurpurWorldConfig { +@@ -620,6 +620,13 @@ public class PurpurWorldConfig { spawnerDeactivateByRedstone = getBoolean("blocks.spawner.deactivate-by-redstone", spawnerDeactivateByRedstone); } diff --git a/patches/server/0185-Config-for-powered-rail-activation-distance.patch b/patches/server/0185-Config-for-powered-rail-activation-distance.patch index 63529f590..2ea15bf68 100644 --- a/patches/server/0185-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0185-Config-for-powered-rail-activation-distance.patch @@ -18,10 +18,10 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b } else { int j = pos.getX(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 061db49f1c88a34e055fd8da01a7a68d3b067cca..7dee737fdfed09ac46490a5f2b785f150007d66a 100644 +index 4031de37a352217720a47046920798e362411a16..40ec3f14213767a877920b6fc8135d2a13177d92 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -630,6 +630,11 @@ public class PurpurWorldConfig { +@@ -632,6 +632,11 @@ public class PurpurWorldConfig { slabHalfBreak = getBoolean("blocks.slab.break-individual-slabs-when-sneaking", slabHalfBreak); } diff --git a/patches/server/0186-Piglin-portal-spawn-modifier.patch b/patches/server/0186-Piglin-portal-spawn-modifier.patch index 954ba34f6..54b1c58c7 100644 --- a/patches/server/0186-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0186-Piglin-portal-spawn-modifier.patch @@ -31,10 +31,10 @@ index fef1027829c44957e23c0a121033bfb7640d06f0..c42349d0f6b0025525278295b36f4030 pos = pos.below(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7dee737fdfed09ac46490a5f2b785f150007d66a..75b6c771f2a127202280a583ab6588295c3152bc 100644 +index 40ec3f14213767a877920b6fc8135d2a13177d92..bb12871baa29c20f04b9116f35dde608df267652 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1440,6 +1440,7 @@ public class PurpurWorldConfig { +@@ -1442,6 +1442,7 @@ public class PurpurWorldConfig { public boolean piglinRidableInWater = false; public double piglinMaxHealth = 16.0D; public boolean piglinBypassMobGriefing = false; @@ -42,7 +42,7 @@ index 7dee737fdfed09ac46490a5f2b785f150007d66a..75b6c771f2a127202280a583ab658829 private void piglinSettings() { piglinRidable = getBoolean("mobs.piglin.ridable", piglinRidable); piglinRidableInWater = getBoolean("mobs.piglin.ridable-in-water", piglinRidableInWater); -@@ -1450,6 +1451,7 @@ public class PurpurWorldConfig { +@@ -1452,6 +1453,7 @@ public class PurpurWorldConfig { } piglinMaxHealth = getDouble("mobs.piglin.attributes.max_health", piglinMaxHealth); piglinBypassMobGriefing = getBoolean("mobs.piglin.bypass-mob-griefing", piglinBypassMobGriefing); diff --git a/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch index 6798d9540..589eddb20 100644 --- a/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0188-Configurable-damage-settings-for-magma-blocks.patch @@ -31,10 +31,10 @@ index 5d844ed98b916298a657d5e9766ab7f383a304e0..0129460ce1ca199a47b6657f824c75fd entity.hurt(DamageSource.HOT_FLOOR, 1.0F); org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 75b6c771f2a127202280a583ab6588295c3152bc..7e4a41ea3b842dd2fe1e7b8159d59286c9c884ef 100644 +index bb12871baa29c20f04b9116f35dde608df267652..bcaa7aab4942a745a724fb9ff4f0e3947806250b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -597,6 +597,13 @@ public class PurpurWorldConfig { +@@ -599,6 +599,13 @@ public class PurpurWorldConfig { kelpMaxGrowthAge = getInt("blocks.kelp.max-growth-age", kelpMaxGrowthAge); } diff --git a/patches/server/0189-Config-for-wither-explosion-radius.patch b/patches/server/0189-Config-for-wither-explosion-radius.patch index 4b78f0dc5..0bca0b99f 100644 --- a/patches/server/0189-Config-for-wither-explosion-radius.patch +++ b/patches/server/0189-Config-for-wither-explosion-radius.patch @@ -18,10 +18,10 @@ index 430aa10101d9f21561155941ff24441fd0c4103a..de91f0dd7f9a62e5a96b4cc3e4f505ec if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7e4a41ea3b842dd2fe1e7b8159d59286c9c884ef..f374f4feee29c798416eec156af3f90af96199b2 100644 +index bcaa7aab4942a745a724fb9ff4f0e3947806250b..e0d3cb85d3522fa0f679af7d04db806032fcffaa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1976,6 +1976,7 @@ public class PurpurWorldConfig { +@@ -1978,6 +1978,7 @@ public class PurpurWorldConfig { public int witherHealthRegenDelay = 20; public boolean witherBypassMobGriefing = false; public boolean witherCanRideVehicles = false; @@ -29,7 +29,7 @@ index 7e4a41ea3b842dd2fe1e7b8159d59286c9c884ef..f374f4feee29c798416eec156af3f90a private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1994,6 +1995,7 @@ public class PurpurWorldConfig { +@@ -1996,6 +1997,7 @@ public class PurpurWorldConfig { witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles); diff --git a/patches/server/0192-Configurable-piston-push-limit.patch b/patches/server/0192-Configurable-piston-push-limit.patch index 3892d7ce7..81805183a 100644 --- a/patches/server/0192-Configurable-piston-push-limit.patch +++ b/patches/server/0192-Configurable-piston-push-limit.patch @@ -36,10 +36,10 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c5dd8489877f6ff62db785bc0811b506d5556350..21470690bc7acda4b9d5c32eb7ee80498bacd940 100644 +index b726e74ef08626770450eb739afa66cba3a9d596..0c9d1d34b96a1624b346258702d03a6dbcea89e3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -619,6 +619,11 @@ public class PurpurWorldConfig { +@@ -621,6 +621,11 @@ public class PurpurWorldConfig { magmaBlockDamageWithFrostWalker = getBoolean("blocks.magma-block.damage-with-frost-walker", magmaBlockDamageWithFrostWalker); } diff --git a/patches/server/0195-Configurable-mob-blindness.patch b/patches/server/0195-Configurable-mob-blindness.patch index 9b7a437ce..ed195b585 100644 --- a/patches/server/0195-Configurable-mob-blindness.patch +++ b/patches/server/0195-Configurable-mob-blindness.patch @@ -28,10 +28,10 @@ index 0a50c0d3450430de9b6251aa65a8bfc8633a8502..521a353a1de6573b7e4fcebc673494cd return d0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 21470690bc7acda4b9d5c32eb7ee80498bacd940..8481c6e6b4efacdabdd679fb3d36c6b7ff9e1fd7 100644 +index 0c9d1d34b96a1624b346258702d03a6dbcea89e3..6bb05e0f8c575c0a163ca1f8e8571401e9acd161 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -433,6 +433,7 @@ public class PurpurWorldConfig { +@@ -435,6 +435,7 @@ public class PurpurWorldConfig { public boolean persistentDroppableEntityDisplayNames = false; public boolean projectilesBypassMobGriefing = false; public boolean tickFluids = true; @@ -39,7 +39,7 @@ index 21470690bc7acda4b9d5c32eb7ee80498bacd940..8481c6e6b4efacdabdd679fb3d36c6b7 public double tridentLoyaltyVoidReturnHeight = 0.0D; public double voidDamageHeight = -64.0D; public double voidDamageDealt = 4.0D; -@@ -454,6 +455,7 @@ public class PurpurWorldConfig { +@@ -456,6 +457,7 @@ public class PurpurWorldConfig { persistentDroppableEntityDisplayNames = getBoolean("gameplay-mechanics.persistent-droppable-entity-display-names", persistentDroppableEntityDisplayNames); projectilesBypassMobGriefing = getBoolean("gameplay-mechanics.projectiles-bypass-mob-griefing", projectilesBypassMobGriefing); tickFluids = getBoolean("gameplay-mechanics.tick-fluids", tickFluids); diff --git a/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch index 690b43c9e..c4e66b0d0 100644 --- a/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0197-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -21,10 +21,10 @@ index 02494dcc8a342f65b2855612aebeb019095abf65..d66c8866f3c6b1412a6c1876c62e3b29 if (!event.isCancelled()) { this.dead = true; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8481c6e6b4efacdabdd679fb3d36c6b7ff9e1fd7..0f5085a4d36c0f36043618cfd724141ec88de44b 100644 +index 6bb05e0f8c575c0a163ca1f8e8571401e9acd161..78d9845d53a3af8d8bd20389590e9250cd418e36 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -868,6 +868,7 @@ public class PurpurWorldConfig { +@@ -870,6 +870,7 @@ public class PurpurWorldConfig { public boolean creeperAllowGriefing = true; public boolean creeperBypassMobGriefing = false; public boolean creeperExplodeWhenKilled = false; @@ -32,7 +32,7 @@ index 8481c6e6b4efacdabdd679fb3d36c6b7ff9e1fd7..0f5085a4d36c0f36043618cfd724141e private void creeperSettings() { creeperRidable = getBoolean("mobs.creeper.ridable", creeperRidable); creeperRidableInWater = getBoolean("mobs.creeper.ridable-in-water", creeperRidableInWater); -@@ -881,6 +882,7 @@ public class PurpurWorldConfig { +@@ -883,6 +884,7 @@ public class PurpurWorldConfig { creeperAllowGriefing = getBoolean("mobs.creeper.allow-griefing", creeperAllowGriefing); creeperBypassMobGriefing = getBoolean("mobs.creeper.bypass-mob-griefing", creeperBypassMobGriefing); creeperExplodeWhenKilled = getBoolean("mobs.creeper.explode-when-killed", creeperExplodeWhenKilled); diff --git a/patches/server/0198-Iron-golem-poppy-calms-anger.patch b/patches/server/0198-Iron-golem-poppy-calms-anger.patch index 73cf61d85..66de49b50 100644 --- a/patches/server/0198-Iron-golem-poppy-calms-anger.patch +++ b/patches/server/0198-Iron-golem-poppy-calms-anger.patch @@ -17,10 +17,10 @@ index f4e983da7206923ee0b0f984e65a6c2b3a6a8aeb..cea3725009af1bc746a593c4db63ed63 this.goalSelector.addGoal(2, new MoveTowardsTargetGoal(this, 0.9D, 32.0F)); this.goalSelector.addGoal(2, new MoveBackToVillageGoal(this, 0.6D, false)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0f5085a4d36c0f36043618cfd724141ec88de44b..92f0c19656f852fa2c6688e7d638362f7ce9022c 100644 +index 78d9845d53a3af8d8bd20389590e9250cd418e36..2ec81e3523c0ecc80e57dfb0b9985985a4d48265 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1243,6 +1243,7 @@ public class PurpurWorldConfig { +@@ -1245,6 +1245,7 @@ public class PurpurWorldConfig { public boolean ironGolemRidableInWater = false; public boolean ironGolemCanSwim = false; public double ironGolemMaxHealth = 100.0D; @@ -28,7 +28,7 @@ index 0f5085a4d36c0f36043618cfd724141ec88de44b..92f0c19656f852fa2c6688e7d638362f private void ironGolemSettings() { ironGolemRidable = getBoolean("mobs.iron_golem.ridable", ironGolemRidable); ironGolemRidableInWater = getBoolean("mobs.iron_golem.ridable-in-water", ironGolemRidableInWater); -@@ -1253,6 +1254,7 @@ public class PurpurWorldConfig { +@@ -1255,6 +1256,7 @@ public class PurpurWorldConfig { set("mobs.iron_golem.attributes.max_health", oldValue); } ironGolemMaxHealth = getDouble("mobs.iron_golem.attributes.max_health", ironGolemMaxHealth); diff --git a/patches/server/0199-Breedable-parrots.patch b/patches/server/0199-Breedable-parrots.patch index 554f5e79a..e3e62df91 100644 --- a/patches/server/0199-Breedable-parrots.patch +++ b/patches/server/0199-Breedable-parrots.patch @@ -50,10 +50,10 @@ index 553b0aff0ccc5baf41d5faae1a2fd88249dd5a74..3da2b68fb03a80676d7a5eed271499f6 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 92f0c19656f852fa2c6688e7d638362f7ce9022c..d479eed0bccc72b5dd38c308f0ed60ca969c6a32 100644 +index 2ec81e3523c0ecc80e57dfb0b9985985a4d48265..114bc422088e7a443c71ec0253f12d72c329a8ab 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1379,6 +1379,7 @@ public class PurpurWorldConfig { +@@ -1381,6 +1381,7 @@ public class PurpurWorldConfig { public boolean parrotRidableInWater = false; public double parrotMaxY = 256D; public double parrotMaxHealth = 6.0D; @@ -61,7 +61,7 @@ index 92f0c19656f852fa2c6688e7d638362f7ce9022c..d479eed0bccc72b5dd38c308f0ed60ca private void parrotSettings() { parrotRidable = getBoolean("mobs.parrot.ridable", parrotRidable); parrotRidableInWater = getBoolean("mobs.parrot.ridable-in-water", parrotRidableInWater); -@@ -1389,6 +1390,7 @@ public class PurpurWorldConfig { +@@ -1391,6 +1392,7 @@ public class PurpurWorldConfig { set("mobs.parrot.attributes.max_health", oldValue); } parrotMaxHealth = getDouble("mobs.parrot.attributes.max_health", parrotMaxHealth); diff --git a/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch index 0739f91ad..a8e93bf4f 100644 --- a/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0202-Option-to-disable-dragon-egg-teleporting.patch @@ -17,10 +17,10 @@ index 78f51f3dd0e7249af69228479da932e9aea982d6..d9d4421f7f316281487828739168cfd6 BlockPos blockposition1 = pos.offset(world.random.nextInt(16) - world.random.nextInt(16), world.random.nextInt(8) - world.random.nextInt(8), world.random.nextInt(16) - world.random.nextInt(16)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index db3fc52dd68f351d3719ce706a1577348324d904..5bc7dcb5934d3e4f755db5623fa115800a46bd87 100644 +index 13b689c908857902f937bea6313af2952d62760c..1d2c735375bee28347fdc7ce7b1e6ba42d3d3f9b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -544,6 +544,11 @@ public class PurpurWorldConfig { +@@ -546,6 +546,11 @@ public class PurpurWorldConfig { }); } diff --git a/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch index 905e15058..d2166edb1 100644 --- a/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0205-ShulkerBox-allow-oversized-stacks.patch @@ -35,10 +35,10 @@ index b9c558060024d380e89116489c7fc12ad88db8ad..0a0a4be15bed899812fcd4af0e311f5f CompoundTag compoundTag = shulkerBoxBlockEntity.saveToTag(new CompoundTag()); if (!compoundTag.isEmpty()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5bc7dcb5934d3e4f755db5623fa115800a46bd87..94136f0a74e71fedbf64b17e760bf2093a090a23 100644 +index 1d2c735375bee28347fdc7ce7b1e6ba42d3d3f9b..9417b8d4ee80b18fa2c500055e3015eb4d8a2f0a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -656,6 +656,11 @@ public class PurpurWorldConfig { +@@ -658,6 +658,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch index d7042671e..2efb01a67 100644 --- a/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0206-Bee-can-work-when-raining-or-at-night.patch @@ -31,10 +31,10 @@ index ffacc4b8cc3ab8285c4131aec58e48ffa9e1952e..e0e039e2f614f2df48d8d1b6e8bbbe7a return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 94136f0a74e71fedbf64b17e760bf2093a090a23..69bad8e2f93f888000ab8bfa195660413025048c 100644 +index 9417b8d4ee80b18fa2c500055e3015eb4d8a2f0a..0c40c38a956e4b4be9e58904160973ef4f67e769 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -760,6 +760,8 @@ public class PurpurWorldConfig { +@@ -762,6 +762,8 @@ public class PurpurWorldConfig { public double beeMaxY = 256D; public double beeMaxHealth = 10.0D; public int beeBreedingTicks = 6000; @@ -43,7 +43,7 @@ index 94136f0a74e71fedbf64b17e760bf2093a090a23..69bad8e2f93f888000ab8bfa19566041 private void beeSettings() { beeRidable = getBoolean("mobs.bee.ridable", beeRidable); beeRidableInWater = getBoolean("mobs.bee.ridable-in-water", beeRidableInWater); -@@ -771,6 +773,8 @@ public class PurpurWorldConfig { +@@ -773,6 +775,8 @@ public class PurpurWorldConfig { } beeMaxHealth = getDouble("mobs.bee.attributes.max_health", beeMaxHealth); beeBreedingTicks = getInt("mobs.bee.breeding-delay-ticks", beeBreedingTicks); diff --git a/patches/server/0210-Beacon-Activation-Range-Configurable.patch b/patches/server/0210-Beacon-Activation-Range-Configurable.patch index f139ab65e..ce5770c73 100644 --- a/patches/server/0210-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0210-Beacon-Activation-Range-Configurable.patch @@ -26,10 +26,10 @@ index c1a0b0d77b8783fd127b68449a209ec0e62e6005..4e7f7ac51a4777bbda4939c6ecc3edc9 } else { return effectRange; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index d7a26b6388ef65b44b607b89af75b3bb470b5ba6..9418035053aab66926b12f57915a6abeb7f18cd2 100644 +index 0c3c0eea65b6936c92939125fa3c20ad7895c94c..f003a4d2173cc104adca05001d538b0e41bc2c41 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -509,6 +509,17 @@ public class PurpurWorldConfig { +@@ -511,6 +511,17 @@ public class PurpurWorldConfig { anvilAllowColors = getBoolean("blocks.anvil.allow-colors", anvilAllowColors); } diff --git a/patches/server/0211-Add-toggle-for-sand-duping-fix.patch b/patches/server/0211-Add-toggle-for-sand-duping-fix.patch index fa35b4bff..173e5169c 100644 --- a/patches/server/0211-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0211-Add-toggle-for-sand-duping-fix.patch @@ -27,10 +27,10 @@ index 8336ea928faa92c6f58f8cdfb9faf1d8e26c9ccf..c765c182081fe83eb0f30dcbf97d8126 } // Paper end - fix sand duping diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9418035053aab66926b12f57915a6abeb7f18cd2..31846035dbfd3320b8ad144e5f2737a0fa9e074c 100644 +index f003a4d2173cc104adca05001d538b0e41bc2c41..fd20551af50eb6532b4ee4dd7cfa140b77f7a284 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -682,6 +682,11 @@ public class PurpurWorldConfig { +@@ -684,6 +684,11 @@ public class PurpurWorldConfig { } } diff --git a/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch index 7c30de0c4..3cf1abd43 100644 --- a/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0212-Add-toggle-for-end-portal-safe-teleporting.patch @@ -45,10 +45,10 @@ index 197482e1ace23c3de002242097a68c6cc297cd3f..428875a6a99a619d337e2a7bbd2cb182 entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 31846035dbfd3320b8ad144e5f2737a0fa9e074c..1a94a68e206eef5f9d4c3e5af49ef03690ee13ea 100644 +index fd20551af50eb6532b4ee4dd7cfa140b77f7a284..d8edac782ae15cb14d38661c597e1d461b4717b1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -624,6 +624,11 @@ public class PurpurWorldConfig { +@@ -626,6 +626,11 @@ public class PurpurWorldConfig { furnaceInfiniteFuel = getBoolean("blocks.furnace.infinite-fuel", furnaceInfiniteFuel); } diff --git a/patches/server/0217-Populator-seed-controls.patch b/patches/server/0217-Populator-seed-controls.patch index f26f00619..1bbd1224d 100644 --- a/patches/server/0217-Populator-seed-controls.patch +++ b/patches/server/0217-Populator-seed-controls.patch @@ -39,10 +39,10 @@ index a7a7e6cd87270e64a92448f03f8b0b0c7e375ec7..9fb19162c0e436122087d03d37b502a1 try { region.setCurrentlyGenerating(supplier3); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6629addad421042fae15d1b70c0a8d51ecf5f3e2..de47ddf70c993a1f8600062005eab6dd44475b56 100644 +index 0df2b22c3da0b4ecf85c7d0cb334a62f4d53195f..70e06737ac5166fc6ba34028e236c449497d6edf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2242,4 +2242,20 @@ public class PurpurWorldConfig { +@@ -2244,4 +2244,20 @@ 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); } diff --git a/patches/server/0219-Shulker-spawn-from-bullet-options.patch b/patches/server/0219-Shulker-spawn-from-bullet-options.patch index ce5c2d89c..f3cc4007d 100644 --- a/patches/server/0219-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0219-Shulker-spawn-from-bullet-options.patch @@ -61,10 +61,10 @@ index f812a75985d26785639491c9a980387a3f261f2d..b11fb39b69f5225ca7da72ca1a2200c7 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index de47ddf70c993a1f8600062005eab6dd44475b56..fee63c51d52da28ca6c72216a95c874e8e55e52d 100644 +index 70e06737ac5166fc6ba34028e236c449497d6edf..6622a27104810ee33564ec4ffe07b909db0d181e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1697,6 +1697,11 @@ public class PurpurWorldConfig { +@@ -1699,6 +1699,11 @@ public class PurpurWorldConfig { public boolean shulkerRidable = false; public boolean shulkerRidableInWater = false; public double shulkerMaxHealth = 30.0D; @@ -76,7 +76,7 @@ index de47ddf70c993a1f8600062005eab6dd44475b56..fee63c51d52da28ca6c72216a95c874e private void shulkerSettings() { shulkerRidable = getBoolean("mobs.shulker.ridable", shulkerRidable); shulkerRidableInWater = getBoolean("mobs.shulker.ridable-in-water", shulkerRidableInWater); -@@ -1706,6 +1711,11 @@ public class PurpurWorldConfig { +@@ -1708,6 +1713,11 @@ public class PurpurWorldConfig { set("mobs.shulker.attributes.max_health", oldValue); } shulkerMaxHealth = getDouble("mobs.shulker.attributes.max_health", shulkerMaxHealth); diff --git a/patches/server/0221-Option-to-make-drowned-break-doors.patch b/patches/server/0221-Option-to-make-drowned-break-doors.patch index 7c2f5e5b8..5382958ff 100644 --- a/patches/server/0221-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0221-Option-to-make-drowned-break-doors.patch @@ -34,10 +34,10 @@ index 8d3ce6c97a8734c0d13844cafca251a3f4dce8a4..a004d59483dc3ffb404ae28daf76c807 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 273ef02ba9f3bc5aea17ef082cf87005005d0927..7ed3df8f559fa721058b80b359cedafa103041c8 100644 +index f53c01554f2a8968b0f9dc15a7b80b0c5a9565db..d1e014402b166a56c8f4ebfd7d167e3d0af58ce8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -996,6 +996,7 @@ public class PurpurWorldConfig { +@@ -998,6 +998,7 @@ public class PurpurWorldConfig { public boolean drownedJockeyOnlyBaby = true; public double drownedJockeyChance = 0.05D; public boolean drownedJockeyTryExistingChickens = true; @@ -45,7 +45,7 @@ index 273ef02ba9f3bc5aea17ef082cf87005005d0927..7ed3df8f559fa721058b80b359cedafa private void drownedSettings() { drownedRidable = getBoolean("mobs.drowned.ridable", drownedRidable); drownedRidableInWater = getBoolean("mobs.drowned.ridable-in-water", drownedRidableInWater); -@@ -1009,6 +1010,7 @@ public class PurpurWorldConfig { +@@ -1011,6 +1012,7 @@ public class PurpurWorldConfig { drownedJockeyOnlyBaby = getBoolean("mobs.drowned.jockey.only-babies", drownedJockeyOnlyBaby); drownedJockeyChance = getDouble("mobs.drowned.jockey.chance", drownedJockeyChance); drownedJockeyTryExistingChickens = getBoolean("mobs.drowned.jockey.try-existing-chickens", drownedJockeyTryExistingChickens); diff --git a/patches/server/0222-Configurable-hunger-starvation-damage.patch b/patches/server/0222-Configurable-hunger-starvation-damage.patch index 0ed59ba5b..e21155ade 100644 --- a/patches/server/0222-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0222-Configurable-hunger-starvation-damage.patch @@ -18,10 +18,10 @@ index c1130952e3fa22abaa27fcc1c4761c831dc56cc3..1ac08eca469739cb52abd38483c431b6 this.tickTimer = 0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7ed3df8f559fa721058b80b359cedafa103041c8..e3cba672d74930d2a8e160412d155eea0ca8b46a 100644 +index d1e014402b166a56c8f4ebfd7d167e3d0af58ce8..fc4afb4873eecb12b85f2449b319b846c34fea98 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2272,4 +2272,9 @@ public class PurpurWorldConfig { +@@ -2274,4 +2274,9 @@ public class PurpurWorldConfig { } randomPopulatorSeed = getBoolean("seed.random-populator-seed", randomPopulatorSeed); }