From 9e5a8b19370fd4c7a73a5ab35bbc829bb1dbff09 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Thu, 25 Nov 2021 12:41:01 -0500 Subject: [PATCH] drop patches --- ...032-Dont-send-useless-entity-packets.patch | 57 ------------- ...atch => 0032-Tulips-change-fox-type.patch} | 0 ...patch => 0033-Breedable-Polar-Bears.patch} | 0 ...atch => 0034-Chickens-can-retaliate.patch} | 0 ...ption-to-set-armorstand-step-height.patch} | 0 ....patch => 0036-Cat-spawning-options.patch} | 0 ...n-black-cats-spawning-in-swamp-huts.patch} | 0 ...ms.patch => 0038-Cows-eat-mushrooms.patch} | 0 ...ow-rotation-when-shearing-mooshroom.patch} | 0 ...patch => 0040-Pigs-give-saddle-back.patch} | 0 ...1-Snowman-drop-and-put-back-pumpkin.patch} | 0 ...2-Ender-dragon-always-drop-full-exp.patch} | 0 ... 0043-Signs-editable-on-right-click.patch} | 0 ...oisten-from-water-directly-under-it.patch} | 0 ...Minecart-settings-and-WASD-controls.patch} | 0 ...ble-loot-drops-on-death-by-cramming.patch} | 0 ...tion-to-toggle-milk-curing-bad-omen.patch} | 0 ...ould-check-if-entity-can-use-portal.patch} | 0 ...049-Fix-the-dead-lagging-the-server.patch} | 2 +- ...Skip-events-if-there-s-no-listeners.patch} | 0 ... 0051-Add-permission-for-F3-N-debug.patch} | 0 ...ch => 0052-Configurable-TPS-Catchup.patch} | 4 +- ...ow-loyalty-on-tridents-to-work-in-t.patch} | 0 ...erman-and-creeper-griefing-controls.patch} | 0 ...055-Villagers-follow-emerald-blocks.patch} | 0 ...ch => 0056-Allow-leashing-villagers.patch} | 0 ...rable-search-radius-for-villagers-t.patch} | 0 ... => 0058-Implement-infinite-liquids.patch} | 0 ...9-Make-lava-flow-speed-configurable.patch} | 0 ...dd-player-death-exp-control-options.patch} | 0 ...rable-void-damage-height-and-damage.patch} | 2 +- ...=> 0062-Add-canSaveToDisk-to-Entity.patch} | 4 +- ...spenser-curse-of-binding-protection.patch} | 0 ...-for-boats-to-eject-players-on-land.patch} | 0 ...-mends-most-damages-equipment-first.patch} | 0 ...066-Add-5-second-tps-average-in-tps.patch} | 0 ...h => 0067-Implement-elytra-settings.patch} | 0 ...atch => 0068-Item-entity-immunities.patch} | 2 +- ...mand.patch => 0069-Add-ping-command.patch} | 2 +- ...mand.patch => 0070-Add-demo-command.patch} | 2 +- ...d.patch => 0071-Add-credits-command.patch} | 2 +- ...=> 0072-Configurable-jockey-options.patch} | 0 ...d-to-crystals-and-crystals-shoot-ph.patch} | 0 ...> 0074-Add-phantom-spawning-options.patch} | 0 ...075-Implement-bed-explosion-options.patch} | 0 ...nt-respawn-anchor-explosion-options.patch} | 0 ...Add-allow-water-in-end-world-option.patch} | 6 +- ... => 0078-Allow-color-codes-in-books.patch} | 0 ...espan.patch => 0079-Entity-lifespan.patch} | 0 ...eport-to-spawn-if-outside-world-bor.patch} | 0 ...ty.patch => 0081-Squid-EAR-immunity.patch} | 0 ...atch => 0082-Phantoms-burn-in-light.patch} | 0 ...0083-Configurable-villager-breeding.patch} | 0 ... 0084-Redstone-deactivates-spawners.patch} | 0 ...ch => 0085-Totems-work-in-inventory.patch} | 0 ...-Add-vindicator-johnny-spawn-chance.patch} | 0 ...on-to-disable-certain-block-updates.patch} | 4 +- ...0088-Dispensers-place-anvils-option.patch} | 0 ...rs.patch => 0089-Allow-anvil-colors.patch} | 0 ...-disable-dolphin-treasure-searching.patch} | 0 ...patch => 0091-Short-enderman-height.patch} | 8 +- ...top-squids-floating-on-top-of-water.patch} | 2 +- ...ng-obsidian-valid-for-portal-frames.patch} | 2 +- ...ities-can-use-portals-configuration.patch} | 2 +- ...095-LivingEntity-broadcastItemBreak.patch} | 0 ...tomizable-wither-health-and-healing.patch} | 2 +- ...gling-special-MobSpawners-per-world.patch} | 0 ...patch => 0098-Raid-cooldown-setting.patch} | 0 ...-config-options-per-projectile-type.patch} | 0 ...able-zombie-aggressiveness-towards-.patch} | 0 ...-to-recipe-s-ExactChoice-ingredient.patch} | 0 ...y.patch => 0102-Flying-squids-Oh-my.patch} | 0 ...patch => 0103-Infinity-bow-settings.patch} | 0 ...ge.patch => 0104-Stonecutter-damage.patch} | 2 +- ...=> 0105-Configurable-daylight-cycle.patch} | 0 ...e-and-mending-enchantments-together.patch} | 2 +- ...7-Furnace-uses-lava-from-underneath.patch} | 0 ...ws-should-not-reset-despawn-counter.patch} | 0 ...e-add-farmland-mechanics-from-Alpha.patch} | 0 ...ustable-breeding-cooldown-to-config.patch} | 0 ...-entity-breeding-times-configurable.patch} | 0 ...es-from-item-forms-of-entities-to-e.patch} | 0 ...when-using-a-Name-Tag-on-an-Armor-S.patch} | 0 ...ting-and-weeping-vines-growth-rates.patch} | 0 ...twisting-vines-configurable-max-gro.patch} | 0 ...lowing-Endermen-to-despawn-even-whi.patch} | 0 ...17-Add-configurable-snowball-damage.patch} | 0 ...8-Changeable-Mob-Left-Handed-Chance.patch} | 0 ...=> 0119-Add-boat-fall-damage-config.patch} | 2 +- ...0120-Snow-Golem-rate-of-fire-config.patch} | 0 ...-Configurable-disable-give-dropping.patch} | 2 +- ...illager-Clerics-to-farm-Nether-Wart.patch} | 22 ++--- .../0123-Lobotomize-stuck-villagers.patch | 81 ------------------- ...ied-Piglin-death-always-counting-as.patch} | 6 +- ...timise-player-list-ticksSpread-out-.patch} | 0 ...le-chance-for-wolves-to-spawn-rabid.patch} | 6 +- ...6-Configurable-default-collar-color.patch} | 6 +- ...tch => 0127-Phantom-flames-on-swoop.patch} | 2 +- ...-to-open-even-with-a-solid-block-on.patch} | 2 +- ...SBar.patch => 0129-Implement-TPSBar.patch} | 2 +- ...h => 0130-Striders-give-saddle-back.patch} | 2 +- ...tch => 0131-PlayerBookTooLargeEvent.patch} | 0 ...herite-armor-grants-fire-resistance.patch} | 2 +- ...133-Fix-rotating-UP-DOWN-CW-and-CCW.patch} | 0 ...efing-bypass-to-everything-affected.patch} | 20 ++--- ...llow-Note-Block-sounds-when-blocked.patch} | 2 +- ...136-Add-EntityTeleportHinderedEvent.patch} | 2 +- ... => 0137-Farmland-trampling-changes.patch} | 2 +- ...8-Movement-options-for-armor-stands.patch} | 2 +- ....patch => 0139-Fix-stuck-in-portals.patch} | 2 +- ...ggle-for-water-sensitive-mob-damage.patch} | 50 ++++++------ ...1-Config-to-always-tame-in-Creative.patch} | 2 +- ... 0142-End-crystal-explosion-options.patch} | 2 +- ...ther-Ender-Dragon-can-ride-vehicles.patch} | 6 +- ...atch => 0144-Dont-run-with-scissors.patch} | 4 +- ...nch-Man.patch => 0145-One-Punch-Man.patch} | 2 +- ...146-Add-config-for-snow-on-blue-ice.patch} | 2 +- ...r-Pearl-cooldown-damage-and-Endermi.patch} | 2 +- ...to-ignore-nearby-mobs-when-sleeping.patch} | 2 +- ...d-back-player-spawned-endermite-API.patch} | 0 ...n-aggressiveness-towards-Endermites.patch} | 2 +- ...Dragon-Head-wearers-and-stare-aggro.patch} | 2 +- ...ig.patch => 0152-Tick-fluids-config.patch} | 2 +- ...53-Config-to-disable-Llama-caravans.patch} | 2 +- ...g-to-make-Creepers-explode-on-death.patch} | 2 +- ...rable-ravager-griefable-blocks-list.patch} | 2 +- ...156-Sneak-to-bulk-process-composter.patch} | 2 +- ...h => 0157-Config-for-skipping-night.patch} | 2 +- ...158-Add-config-for-villager-trading.patch} | 14 ++-- ...=> 0159-Allow-infinity-on-crossbows.patch} | 2 +- ...ngs.patch => 0160-Drowning-Settings.patch} | 2 +- ...reak-individual-slabs-when-sneaking.patch} | 2 +- ...to-disable-hostile-mob-spawn-on-ice.patch} | 2 +- ...g-to-show-Armor-Stand-arms-on-spawn.patch} | 2 +- ...tion-to-make-doors-require-redstone.patch} | 2 +- ...Config-to-allow-for-unsafe-enchants.patch} | 2 +- ...0166-Configurable-sponge-absorption.patch} | 2 +- ...ch => 0167-Projectile-offset-config.patch} | 2 +- ...or-powered-rail-activation-distance.patch} | 2 +- ...> 0169-Piglin-portal-spawn-modifier.patch} | 2 +- ...Config-to-change-max-number-of-bees.patch} | 2 +- ...le-damage-settings-for-magma-blocks.patch} | 2 +- ...-Config-for-wither-explosion-radius.patch} | 6 +- ... => 0173-Gamemode-extra-permissions.patch} | 2 +- ...ng-the-blocks-that-turn-into-dirt-p.patch} | 2 +- ...0175-Configurable-piston-push-limit.patch} | 2 +- ...176-Configurable-broadcast-settings.patch} | 2 +- ...-6278.patch => 0177-Fix-SPIGOT-6278.patch} | 0 ... => 0178-Configurable-mob-blindness.patch} | 2 +- ...hidden-players-from-entity-selector.patch} | 2 +- ...-to-impact-Creeper-explosion-radius.patch} | 2 +- ...> 0181-Iron-golem-poppy-calms-anger.patch} | 2 +- ...ots.patch => 0182-Breedable-parrots.patch} | 2 +- ...gurable-powered-rail-boost-modifier.patch} | 2 +- ...ge-multiplier-critical-damage-value.patch} | 2 +- ...n-to-disable-dragon-egg-teleporting.patch} | 2 +- ...fig-for-unverified-username-message.patch} | 2 +- ...-anvil-cumulative-cost-configurable.patch} | 2 +- ...8-ShulkerBox-allow-oversized-stacks.patch} | 2 +- ...e-can-work-when-raining-or-at-night.patch} | 2 +- ...90-API-for-any-mob-to-burn-daylight.patch} | 0 ...dvancement-triggers-on-entity-death.patch} | 0 ...h => 0192-Config-MobEffect-by-world.patch} | 2 +- ...eacon-Activation-Range-Configurable.patch} | 2 +- ...0194-Add-toggle-for-sand-duping-fix.patch} | 2 +- ...gle-for-end-portal-safe-teleporting.patch} | 2 +- ...atch => 0196-Flying-Fall-Damage-API.patch} | 0 ...ke-lightning-rod-range-configurable.patch} | 2 +- ...ng-food-fills-hunger-bar-completely.patch} | 2 +- ...ayer-join-full-server-by-permission.patch} | 0 ...ermission-bypass-for-portal-waiting.patch} | 0 ...1-Shulker-spawn-from-bullet-options.patch} | 2 +- ...ating-glow-berries-adds-glow-effect.patch} | 2 +- ...-Option-to-make-drowned-break-doors.patch} | 2 +- ...nfigurable-hunger-starvation-damage.patch} | 4 +- ...-System.out-calls-to-plugin-loggers.patch} | 0 ...h => 0206-Armor-click-equip-options.patch} | 2 +- ...nd.patch => 0207-Add-uptime-command.patch} | 2 +- ...atch => 0208-Structure-seed-options.patch} | 2 +- ...tch => 0209-Tool-actionable-options.patch} | 2 +- ...0-Store-placer-on-Block-when-placed.patch} | 0 ...oner-API.patch => 0211-Summoner-API.patch} | 0 ...mizable-sleeping-actionbar-messages.patch} | 2 +- ...-shulker-box-items-from-dropping-co.patch} | 2 +- ...214-Silk-touchable-budding-amethyst.patch} | 2 +- ...tch => 0215-Big-dripleaf-tilt-delay.patch} | 2 +- ...0216-Player-ridable-in-water-option.patch} | 2 +- ...-Enderman-teleport-on-projectile-hi.patch} | 2 +- ...d.patch => 0218-Add-compass-command.patch} | 4 +- ...nt-horses-from-standing-with-riders.patch} | 2 +- ...h => 0220-Toggle-for-kinetic-damage.patch} | 2 +- ...-Option-for-disable-observer-clocks.patch} | 2 +- ...zeable-Zombie-Villager-curing-times.patch} | 6 +- ...-Option-for-sponges-to-work-on-lava.patch} | 2 +- ...224-Toggle-for-Wither-s-spawn-sound.patch} | 6 +- ...-breaks-from-solid-neighbors-config.patch} | 2 +- ...move-curse-of-binding-with-weakness.patch} | 2 +- ...0227-Conduit-behavior-configuration.patch} | 4 +- ...patch => 0228-Cauldron-fill-chances.patch} | 4 +- ...o-allow-mobs-to-pathfind-over-rails.patch} | 2 +- ...mpt-parameters-to-resource-pack-api.patch} | 0 ... 0231-Shulker-change-color-with-dye.patch} | 2 +- ... => 0232-Extended-OfflinePlayer-API.patch} | 0 ...he-ability-to-add-combustible-items.patch} | 0 ...in-and-thunder-should-stop-on-sleep.patch} | 2 +- ...-blocks-to-grow-into-trees-naturall.patch} | 2 +- ...-right-click-to-use-exp-for-mending.patch} | 2 +- ...urally-aggressive-to-players-chance.patch} | 2 +- ...urally-aggressive-to-players-chance.patch} | 2 +- ...r-beds-to-explode-on-villager-sleep.patch} | 6 +- ...Halloween-options-and-optimizations.patch} | 2 +- ...fig-for-Grindstones-ignoring-curses.patch} | 2 +- ....patch => 0242-UPnP-Port-Forwarding.patch} | 4 +- ...Campfire-option-for-lit-when-placed.patch} | 2 +- ...tinguish-fire-blocks-with-snowballs.patch} | 2 +- ...on-to-disable-zombie-villagers-cure.patch} | 6 +- 216 files changed, 208 insertions(+), 346 deletions(-) delete mode 100644 patches/server/0032-Dont-send-useless-entity-packets.patch rename patches/server/{0033-Tulips-change-fox-type.patch => 0032-Tulips-change-fox-type.patch} (100%) rename patches/server/{0034-Breedable-Polar-Bears.patch => 0033-Breedable-Polar-Bears.patch} (100%) rename patches/server/{0035-Chickens-can-retaliate.patch => 0034-Chickens-can-retaliate.patch} (100%) rename patches/server/{0036-Add-option-to-set-armorstand-step-height.patch => 0035-Add-option-to-set-armorstand-step-height.patch} (100%) rename patches/server/{0037-Cat-spawning-options.patch => 0036-Cat-spawning-options.patch} (100%) rename patches/server/{0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch => 0037-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch} (100%) rename patches/server/{0039-Cows-eat-mushrooms.patch => 0038-Cows-eat-mushrooms.patch} (100%) rename patches/server/{0040-Fix-cow-rotation-when-shearing-mooshroom.patch => 0039-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%) rename patches/server/{0041-Pigs-give-saddle-back.patch => 0040-Pigs-give-saddle-back.patch} (100%) rename patches/server/{0042-Snowman-drop-and-put-back-pumpkin.patch => 0041-Snowman-drop-and-put-back-pumpkin.patch} (100%) rename patches/server/{0043-Ender-dragon-always-drop-full-exp.patch => 0042-Ender-dragon-always-drop-full-exp.patch} (100%) rename patches/server/{0044-Signs-editable-on-right-click.patch => 0043-Signs-editable-on-right-click.patch} (100%) rename patches/server/{0045-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0044-Allow-soil-to-moisten-from-water-directly-under-it.patch} (100%) rename patches/server/{0046-Minecart-settings-and-WASD-controls.patch => 0045-Minecart-settings-and-WASD-controls.patch} (100%) rename patches/server/{0047-Disable-loot-drops-on-death-by-cramming.patch => 0046-Disable-loot-drops-on-death-by-cramming.patch} (100%) rename patches/server/{0048-Option-to-toggle-milk-curing-bad-omen.patch => 0047-Option-to-toggle-milk-curing-bad-omen.patch} (100%) rename patches/server/{0049-End-gateway-should-check-if-entity-can-use-portal.patch => 0048-End-gateway-should-check-if-entity-can-use-portal.patch} (100%) rename patches/server/{0050-Fix-the-dead-lagging-the-server.patch => 0049-Fix-the-dead-lagging-the-server.patch} (94%) rename patches/server/{0051-Skip-events-if-there-s-no-listeners.patch => 0050-Skip-events-if-there-s-no-listeners.patch} (100%) rename patches/server/{0052-Add-permission-for-F3-N-debug.patch => 0051-Add-permission-for-F3-N-debug.patch} (100%) rename patches/server/{0053-Configurable-TPS-Catchup.patch => 0052-Configurable-TPS-Catchup.patch} (93%) rename patches/server/{0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (100%) rename patches/server/{0055-Add-enderman-and-creeper-griefing-controls.patch => 0054-Add-enderman-and-creeper-griefing-controls.patch} (100%) rename patches/server/{0056-Villagers-follow-emerald-blocks.patch => 0055-Villagers-follow-emerald-blocks.patch} (100%) rename patches/server/{0057-Allow-leashing-villagers.patch => 0056-Allow-leashing-villagers.patch} (100%) rename patches/server/{0058-Implement-configurable-search-radius-for-villagers-t.patch => 0057-Implement-configurable-search-radius-for-villagers-t.patch} (100%) rename patches/server/{0059-Implement-infinite-liquids.patch => 0058-Implement-infinite-liquids.patch} (100%) rename patches/server/{0060-Make-lava-flow-speed-configurable.patch => 0059-Make-lava-flow-speed-configurable.patch} (100%) rename patches/server/{0061-Add-player-death-exp-control-options.patch => 0060-Add-player-death-exp-control-options.patch} (100%) rename patches/server/{0062-Configurable-void-damage-height-and-damage.patch => 0061-Configurable-void-damage-height-and-damage.patch} (97%) rename patches/server/{0063-Add-canSaveToDisk-to-Entity.patch => 0062-Add-canSaveToDisk-to-Entity.patch} (95%) rename patches/server/{0064-Dispenser-curse-of-binding-protection.patch => 0063-Dispenser-curse-of-binding-protection.patch} (100%) rename patches/server/{0065-Add-option-for-boats-to-eject-players-on-land.patch => 0064-Add-option-for-boats-to-eject-players-on-land.patch} (100%) rename patches/server/{0066-Mending-mends-most-damages-equipment-first.patch => 0065-Mending-mends-most-damages-equipment-first.patch} (100%) rename patches/server/{0067-Add-5-second-tps-average-in-tps.patch => 0066-Add-5-second-tps-average-in-tps.patch} (100%) rename patches/server/{0068-Implement-elytra-settings.patch => 0067-Implement-elytra-settings.patch} (100%) rename patches/server/{0069-Item-entity-immunities.patch => 0068-Item-entity-immunities.patch} (99%) rename patches/server/{0070-Add-ping-command.patch => 0069-Add-ping-command.patch} (97%) rename patches/server/{0071-Add-demo-command.patch => 0070-Add-demo-command.patch} (97%) rename patches/server/{0072-Add-credits-command.patch => 0071-Add-credits-command.patch} (97%) rename patches/server/{0073-Configurable-jockey-options.patch => 0072-Configurable-jockey-options.patch} (100%) rename patches/server/{0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (100%) rename patches/server/{0075-Add-phantom-spawning-options.patch => 0074-Add-phantom-spawning-options.patch} (100%) rename patches/server/{0076-Implement-bed-explosion-options.patch => 0075-Implement-bed-explosion-options.patch} (100%) rename patches/server/{0077-Implement-respawn-anchor-explosion-options.patch => 0076-Implement-respawn-anchor-explosion-options.patch} (100%) rename patches/server/{0078-Add-allow-water-in-end-world-option.patch => 0077-Add-allow-water-in-end-world-option.patch} (94%) rename patches/server/{0079-Allow-color-codes-in-books.patch => 0078-Allow-color-codes-in-books.patch} (100%) rename patches/server/{0080-Entity-lifespan.patch => 0079-Entity-lifespan.patch} (100%) rename patches/server/{0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (100%) rename patches/server/{0082-Squid-EAR-immunity.patch => 0081-Squid-EAR-immunity.patch} (100%) rename patches/server/{0083-Phantoms-burn-in-light.patch => 0082-Phantoms-burn-in-light.patch} (100%) rename patches/server/{0084-Configurable-villager-breeding.patch => 0083-Configurable-villager-breeding.patch} (100%) rename patches/server/{0085-Redstone-deactivates-spawners.patch => 0084-Redstone-deactivates-spawners.patch} (100%) rename patches/server/{0086-Totems-work-in-inventory.patch => 0085-Totems-work-in-inventory.patch} (100%) rename patches/server/{0087-Add-vindicator-johnny-spawn-chance.patch => 0086-Add-vindicator-johnny-spawn-chance.patch} (100%) rename patches/server/{0088-Add-option-to-disable-certain-block-updates.patch => 0087-Add-option-to-disable-certain-block-updates.patch} (98%) rename patches/server/{0089-Dispensers-place-anvils-option.patch => 0088-Dispensers-place-anvils-option.patch} (100%) rename patches/server/{0090-Allow-anvil-colors.patch => 0089-Allow-anvil-colors.patch} (100%) rename patches/server/{0091-Add-option-to-disable-dolphin-treasure-searching.patch => 0090-Add-option-to-disable-dolphin-treasure-searching.patch} (100%) rename patches/server/{0092-Short-enderman-height.patch => 0091-Short-enderman-height.patch} (89%) rename patches/server/{0093-Stop-squids-floating-on-top-of-water.patch => 0092-Stop-squids-floating-on-top-of-water.patch} (97%) rename patches/server/{0094-Crying-obsidian-valid-for-portal-frames.patch => 0093-Crying-obsidian-valid-for-portal-frames.patch} (96%) rename patches/server/{0095-Entities-can-use-portals-configuration.patch => 0094-Entities-can-use-portals-configuration.patch} (96%) rename patches/server/{0096-LivingEntity-broadcastItemBreak.patch => 0095-LivingEntity-broadcastItemBreak.patch} (100%) rename patches/server/{0097-Customizable-wither-health-and-healing.patch => 0096-Customizable-wither-health-and-healing.patch} (96%) rename patches/server/{0098-Allow-toggling-special-MobSpawners-per-world.patch => 0097-Allow-toggling-special-MobSpawners-per-world.patch} (100%) rename patches/server/{0099-Raid-cooldown-setting.patch => 0098-Raid-cooldown-setting.patch} (100%) rename patches/server/{0100-Despawn-rate-config-options-per-projectile-type.patch => 0099-Despawn-rate-config-options-per-projectile-type.patch} (100%) rename patches/server/{0101-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%) rename patches/server/{0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%) rename patches/server/{0103-Flying-squids-Oh-my.patch => 0102-Flying-squids-Oh-my.patch} (100%) rename patches/server/{0104-Infinity-bow-settings.patch => 0103-Infinity-bow-settings.patch} (100%) rename patches/server/{0105-Stonecutter-damage.patch => 0104-Stonecutter-damage.patch} (97%) rename patches/server/{0106-Configurable-daylight-cycle.patch => 0105-Configurable-daylight-cycle.patch} (100%) rename patches/server/{0107-Allow-infinite-and-mending-enchantments-together.patch => 0106-Allow-infinite-and-mending-enchantments-together.patch} (95%) rename patches/server/{0108-Furnace-uses-lava-from-underneath.patch => 0107-Furnace-uses-lava-from-underneath.patch} (100%) rename patches/server/{0109-Arrows-should-not-reset-despawn-counter.patch => 0108-Arrows-should-not-reset-despawn-counter.patch} (100%) rename patches/server/{0110-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (100%) rename patches/server/{0111-Add-adjustable-breeding-cooldown-to-config.patch => 0110-Add-adjustable-breeding-cooldown-to-config.patch} (100%) rename patches/server/{0112-Make-entity-breeding-times-configurable.patch => 0111-Make-entity-breeding-times-configurable.patch} (100%) rename patches/server/{0113-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0112-Apply-display-names-from-item-forms-of-entities-to-e.patch} (100%) rename patches/server/{0114-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch => 0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch} (100%) rename patches/server/{0115-Add-twisting-and-weeping-vines-growth-rates.patch => 0114-Add-twisting-and-weeping-vines-growth-rates.patch} (100%) rename patches/server/{0116-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (100%) rename patches/server/{0117-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (100%) rename patches/server/{0118-Add-configurable-snowball-damage.patch => 0117-Add-configurable-snowball-damage.patch} (100%) rename patches/server/{0119-Changeable-Mob-Left-Handed-Chance.patch => 0118-Changeable-Mob-Left-Handed-Chance.patch} (100%) rename patches/server/{0120-Add-boat-fall-damage-config.patch => 0119-Add-boat-fall-damage-config.patch} (97%) rename patches/server/{0121-Snow-Golem-rate-of-fire-config.patch => 0120-Snow-Golem-rate-of-fire-config.patch} (100%) rename patches/server/{0122-EMC-Configurable-disable-give-dropping.patch => 0121-EMC-Configurable-disable-give-dropping.patch} (95%) rename patches/server/{0124-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (94%) delete mode 100644 patches/server/0123-Lobotomize-stuck-villagers.patch rename patches/server/{0125-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (93%) rename patches/server/{0126-Spread-out-and-optimise-player-list-ticksSpread-out-.patch => 0124-Spread-out-and-optimise-player-list-ticksSpread-out-.patch} (100%) rename patches/server/{0127-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0125-Configurable-chance-for-wolves-to-spawn-rabid.patch} (98%) rename patches/server/{0128-Configurable-default-collar-color.patch => 0126-Configurable-default-collar-color.patch} (95%) rename patches/server/{0129-Phantom-flames-on-swoop.patch => 0127-Phantom-flames-on-swoop.patch} (95%) rename patches/server/{0130-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (95%) rename patches/server/{0131-Implement-TPSBar.patch => 0129-Implement-TPSBar.patch} (99%) rename patches/server/{0132-Striders-give-saddle-back.patch => 0130-Striders-give-saddle-back.patch} (96%) rename patches/server/{0133-PlayerBookTooLargeEvent.patch => 0131-PlayerBookTooLargeEvent.patch} (100%) rename patches/server/{0134-Full-netherite-armor-grants-fire-resistance.patch => 0132-Full-netherite-armor-grants-fire-resistance.patch} (97%) rename patches/server/{0135-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0133-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%) rename patches/server/{0136-Add-mobGriefing-bypass-to-everything-affected.patch => 0134-Add-mobGriefing-bypass-to-everything-affected.patch} (98%) rename patches/server/{0137-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0135-Config-to-allow-Note-Block-sounds-when-blocked.patch} (97%) rename patches/server/{0138-Add-EntityTeleportHinderedEvent.patch => 0136-Add-EntityTeleportHinderedEvent.patch} (99%) rename patches/server/{0139-Farmland-trampling-changes.patch => 0137-Farmland-trampling-changes.patch} (97%) rename patches/server/{0140-Movement-options-for-armor-stands.patch => 0138-Movement-options-for-armor-stands.patch} (98%) rename patches/server/{0141-Fix-stuck-in-portals.patch => 0139-Fix-stuck-in-portals.patch} (97%) rename patches/server/{0142-Toggle-for-water-sensitive-mob-damage.patch => 0140-Toggle-for-water-sensitive-mob-damage.patch} (98%) rename patches/server/{0143-Config-to-always-tame-in-Creative.patch => 0141-Config-to-always-tame-in-Creative.patch} (98%) rename patches/server/{0144-End-crystal-explosion-options.patch => 0142-End-crystal-explosion-options.patch} (98%) rename patches/server/{0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (95%) rename patches/server/{0146-Dont-run-with-scissors.patch => 0144-Dont-run-with-scissors.patch} (96%) rename patches/server/{0147-One-Punch-Man.patch => 0145-One-Punch-Man.patch} (96%) rename patches/server/{0148-Add-config-for-snow-on-blue-ice.patch => 0146-Add-config-for-snow-on-blue-ice.patch} (96%) rename patches/server/{0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (98%) rename patches/server/{0150-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0148-Config-to-ignore-nearby-mobs-when-sleeping.patch} (96%) rename patches/server/{0151-Add-back-player-spawned-endermite-API.patch => 0149-Add-back-player-spawned-endermite-API.patch} (100%) rename patches/server/{0152-Config-Enderman-aggressiveness-towards-Endermites.patch => 0150-Config-Enderman-aggressiveness-towards-Endermites.patch} (97%) rename patches/server/{0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (96%) rename patches/server/{0154-Tick-fluids-config.patch => 0152-Tick-fluids-config.patch} (97%) rename patches/server/{0155-Config-to-disable-Llama-caravans.patch => 0153-Config-to-disable-Llama-caravans.patch} (97%) rename patches/server/{0156-Config-to-make-Creepers-explode-on-death.patch => 0154-Config-to-make-Creepers-explode-on-death.patch} (97%) rename patches/server/{0157-Configurable-ravager-griefable-blocks-list.patch => 0155-Configurable-ravager-griefable-blocks-list.patch} (98%) rename patches/server/{0158-Sneak-to-bulk-process-composter.patch => 0156-Sneak-to-bulk-process-composter.patch} (98%) rename patches/server/{0159-Config-for-skipping-night.patch => 0157-Config-for-skipping-night.patch} (96%) rename patches/server/{0160-Add-config-for-villager-trading.patch => 0158-Add-config-for-villager-trading.patch} (89%) rename patches/server/{0161-Allow-infinity-on-crossbows.patch => 0159-Allow-infinity-on-crossbows.patch} (98%) rename patches/server/{0162-Drowning-Settings.patch => 0160-Drowning-Settings.patch} (97%) rename patches/server/{0163-Break-individual-slabs-when-sneaking.patch => 0161-Break-individual-slabs-when-sneaking.patch} (97%) rename patches/server/{0164-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0162-Config-to-disable-hostile-mob-spawn-on-ice.patch} (95%) rename patches/server/{0165-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0163-Config-to-show-Armor-Stand-arms-on-spawn.patch} (96%) rename patches/server/{0166-Option-to-make-doors-require-redstone.patch => 0164-Option-to-make-doors-require-redstone.patch} (98%) rename patches/server/{0167-Config-to-allow-for-unsafe-enchants.patch => 0165-Config-to-allow-for-unsafe-enchants.patch} (98%) rename patches/server/{0168-Configurable-sponge-absorption.patch => 0166-Configurable-sponge-absorption.patch} (97%) rename patches/server/{0169-Projectile-offset-config.patch => 0167-Projectile-offset-config.patch} (99%) rename patches/server/{0170-Config-for-powered-rail-activation-distance.patch => 0168-Config-for-powered-rail-activation-distance.patch} (94%) rename patches/server/{0171-Piglin-portal-spawn-modifier.patch => 0169-Piglin-portal-spawn-modifier.patch} (96%) rename patches/server/{0172-Config-to-change-max-number-of-bees.patch => 0170-Config-to-change-max-number-of-bees.patch} (96%) rename patches/server/{0173-Configurable-damage-settings-for-magma-blocks.patch => 0171-Configurable-damage-settings-for-magma-blocks.patch} (97%) rename patches/server/{0174-Config-for-wither-explosion-radius.patch => 0172-Config-for-wither-explosion-radius.patch} (91%) rename patches/server/{0175-Gamemode-extra-permissions.patch => 0173-Gamemode-extra-permissions.patch} (98%) rename patches/server/{0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch => 0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch} (96%) rename patches/server/{0177-Configurable-piston-push-limit.patch => 0175-Configurable-piston-push-limit.patch} (96%) rename patches/server/{0178-Configurable-broadcast-settings.patch => 0176-Configurable-broadcast-settings.patch} (97%) rename patches/server/{0179-Fix-SPIGOT-6278.patch => 0177-Fix-SPIGOT-6278.patch} (100%) rename patches/server/{0180-Configurable-mob-blindness.patch => 0178-Configurable-mob-blindness.patch} (96%) rename patches/server/{0181-Hide-hidden-players-from-entity-selector.patch => 0179-Hide-hidden-players-from-entity-selector.patch} (98%) rename patches/server/{0182-Config-for-health-to-impact-Creeper-explosion-radius.patch => 0180-Config-for-health-to-impact-Creeper-explosion-radius.patch} (96%) rename patches/server/{0183-Iron-golem-poppy-calms-anger.patch => 0181-Iron-golem-poppy-calms-anger.patch} (98%) rename patches/server/{0184-Breedable-parrots.patch => 0182-Breedable-parrots.patch} (97%) rename patches/server/{0185-Configurable-powered-rail-boost-modifier.patch => 0183-Configurable-powered-rail-boost-modifier.patch} (96%) rename patches/server/{0186-Add-config-change-multiplier-critical-damage-value.patch => 0184-Add-config-change-multiplier-critical-damage-value.patch} (95%) rename patches/server/{0187-Option-to-disable-dragon-egg-teleporting.patch => 0185-Option-to-disable-dragon-egg-teleporting.patch} (95%) rename patches/server/{0188-Config-for-unverified-username-message.patch => 0186-Config-for-unverified-username-message.patch} (97%) rename patches/server/{0189-Make-anvil-cumulative-cost-configurable.patch => 0187-Make-anvil-cumulative-cost-configurable.patch} (95%) rename patches/server/{0190-ShulkerBox-allow-oversized-stacks.patch => 0188-ShulkerBox-allow-oversized-stacks.patch} (97%) rename patches/server/{0191-Bee-can-work-when-raining-or-at-night.patch => 0189-Bee-can-work-when-raining-or-at-night.patch} (97%) rename patches/server/{0192-API-for-any-mob-to-burn-daylight.patch => 0190-API-for-any-mob-to-burn-daylight.patch} (100%) rename patches/server/{0193-Fix-advancement-triggers-on-entity-death.patch => 0191-Fix-advancement-triggers-on-entity-death.patch} (100%) rename patches/server/{0194-Config-MobEffect-by-world.patch => 0192-Config-MobEffect-by-world.patch} (98%) rename patches/server/{0195-Beacon-Activation-Range-Configurable.patch => 0193-Beacon-Activation-Range-Configurable.patch} (96%) rename patches/server/{0196-Add-toggle-for-sand-duping-fix.patch => 0194-Add-toggle-for-sand-duping-fix.patch} (95%) rename patches/server/{0197-Add-toggle-for-end-portal-safe-teleporting.patch => 0195-Add-toggle-for-end-portal-safe-teleporting.patch} (97%) rename patches/server/{0198-Flying-Fall-Damage-API.patch => 0196-Flying-Fall-Damage-API.patch} (100%) rename patches/server/{0199-Make-lightning-rod-range-configurable.patch => 0197-Make-lightning-rod-range-configurable.patch} (96%) rename patches/server/{0200-Burp-after-eating-food-fills-hunger-bar-completely.patch => 0198-Burp-after-eating-food-fills-hunger-bar-completely.patch} (97%) rename patches/server/{0201-Allow-player-join-full-server-by-permission.patch => 0199-Allow-player-join-full-server-by-permission.patch} (100%) rename patches/server/{0202-Add-permission-bypass-for-portal-waiting.patch => 0200-Add-permission-bypass-for-portal-waiting.patch} (100%) rename patches/server/{0203-Shulker-spawn-from-bullet-options.patch => 0201-Shulker-spawn-from-bullet-options.patch} (98%) rename patches/server/{0204-Eating-glow-berries-adds-glow-effect.patch => 0202-Eating-glow-berries-adds-glow-effect.patch} (97%) rename patches/server/{0205-Option-to-make-drowned-break-doors.patch => 0203-Option-to-make-drowned-break-doors.patch} (97%) rename patches/server/{0206-Configurable-hunger-starvation-damage.patch => 0204-Configurable-hunger-starvation-damage.patch} (92%) rename patches/server/{0207-Redirect-System.out-calls-to-plugin-loggers.patch => 0205-Redirect-System.out-calls-to-plugin-loggers.patch} (100%) rename patches/server/{0208-Armor-click-equip-options.patch => 0206-Armor-click-equip-options.patch} (98%) rename patches/server/{0209-Add-uptime-command.patch => 0207-Add-uptime-command.patch} (98%) rename patches/server/{0210-Structure-seed-options.patch => 0208-Structure-seed-options.patch} (97%) rename patches/server/{0211-Tool-actionable-options.patch => 0209-Tool-actionable-options.patch} (99%) rename patches/server/{0212-Store-placer-on-Block-when-placed.patch => 0210-Store-placer-on-Block-when-placed.patch} (100%) rename patches/server/{0213-Summoner-API.patch => 0211-Summoner-API.patch} (100%) rename patches/server/{0214-Customizable-sleeping-actionbar-messages.patch => 0212-Customizable-sleeping-actionbar-messages.patch} (97%) rename patches/server/{0215-option-to-disable-shulker-box-items-from-dropping-co.patch => 0213-option-to-disable-shulker-box-items-from-dropping-co.patch} (96%) rename patches/server/{0216-Silk-touchable-budding-amethyst.patch => 0214-Silk-touchable-budding-amethyst.patch} (95%) rename patches/server/{0217-Big-dripleaf-tilt-delay.patch => 0215-Big-dripleaf-tilt-delay.patch} (96%) rename patches/server/{0218-Player-ridable-in-water-option.patch => 0216-Player-ridable-in-water-option.patch} (96%) rename patches/server/{0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch => 0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch} (96%) rename patches/server/{0220-Add-compass-command.patch => 0218-Add-compass-command.patch} (98%) rename patches/server/{0221-Config-to-prevent-horses-from-standing-with-riders.patch => 0219-Config-to-prevent-horses-from-standing-with-riders.patch} (96%) rename patches/server/{0222-Toggle-for-kinetic-damage.patch => 0220-Toggle-for-kinetic-damage.patch} (96%) rename patches/server/{0223-Add-Option-for-disable-observer-clocks.patch => 0221-Add-Option-for-disable-observer-clocks.patch} (95%) rename patches/server/{0224-Customizeable-Zombie-Villager-curing-times.patch => 0222-Customizeable-Zombie-Villager-curing-times.patch} (92%) rename patches/server/{0225-Option-for-sponges-to-work-on-lava.patch => 0223-Option-for-sponges-to-work-on-lava.patch} (95%) rename patches/server/{0226-Toggle-for-Wither-s-spawn-sound.patch => 0224-Toggle-for-Wither-s-spawn-sound.patch} (92%) rename patches/server/{0227-Cactus-breaks-from-solid-neighbors-config.patch => 0225-Cactus-breaks-from-solid-neighbors-config.patch} (95%) rename patches/server/{0228-Config-to-remove-curse-of-binding-with-weakness.patch => 0226-Config-to-remove-curse-of-binding-with-weakness.patch} (96%) rename patches/server/{0229-Conduit-behavior-configuration.patch => 0227-Conduit-behavior-configuration.patch} (96%) rename patches/server/{0230-Cauldron-fill-chances.patch => 0228-Cauldron-fill-chances.patch} (92%) rename patches/server/{0231-Config-to-allow-mobs-to-pathfind-over-rails.patch => 0229-Config-to-allow-mobs-to-pathfind-over-rails.patch} (96%) rename patches/server/{0232-Add-force-and-prompt-parameters-to-resource-pack-api.patch => 0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch} (100%) rename patches/server/{0233-Shulker-change-color-with-dye.patch => 0231-Shulker-change-color-with-dye.patch} (97%) rename patches/server/{0234-Extended-OfflinePlayer-API.patch => 0232-Extended-OfflinePlayer-API.patch} (100%) rename patches/server/{0235-Added-the-ability-to-add-combustible-items.patch => 0233-Added-the-ability-to-add-combustible-items.patch} (100%) rename patches/server/{0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch => 0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch} (97%) rename patches/server/{0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch => 0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch} (98%) rename patches/server/{0238-Shift-right-click-to-use-exp-for-mending.patch => 0236-Shift-right-click-to-use-exp-for-mending.patch} (98%) rename patches/server/{0239-Dolphins-naturally-aggressive-to-players-chance.patch => 0237-Dolphins-naturally-aggressive-to-players-chance.patch} (98%) rename patches/server/{0240-Cows-naturally-aggressive-to-players-chance.patch => 0238-Cows-naturally-aggressive-to-players-chance.patch} (98%) rename patches/server/{0241-Option-for-beds-to-explode-on-villager-sleep.patch => 0239-Option-for-beds-to-explode-on-villager-sleep.patch} (90%) rename patches/server/{0242-Halloween-options-and-optimizations.patch => 0240-Halloween-options-and-optimizations.patch} (98%) rename patches/server/{0243-Config-for-Grindstones-ignoring-curses.patch => 0241-Config-for-Grindstones-ignoring-curses.patch} (97%) rename patches/server/{0244-UPnP-Port-Forwarding.patch => 0242-UPnP-Port-Forwarding.patch} (96%) rename patches/server/{0245-Campfire-option-for-lit-when-placed.patch => 0243-Campfire-option-for-lit-when-placed.patch} (96%) rename patches/server/{0246-options-to-extinguish-fire-blocks-with-snowballs.patch => 0244-options-to-extinguish-fire-blocks-with-snowballs.patch} (98%) rename patches/server/{0247-Add-option-to-disable-zombie-villagers-cure.patch => 0245-Add-option-to-disable-zombie-villagers-cure.patch} (92%) diff --git a/patches/server/0032-Dont-send-useless-entity-packets.patch b/patches/server/0032-Dont-send-useless-entity-packets.patch deleted file mode 100644 index 31013892f..000000000 --- a/patches/server/0032-Dont-send-useless-entity-packets.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 6 Jul 2019 17:00:04 -0500 -Subject: [PATCH] Dont send useless entity packets - - -diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 94704a258ce7183aeb0ccec0b9106e40efd08821..de0b2ff7044c1b80e872ea59743c4d3254d6af64 100644 ---- a/src/main/java/net/minecraft/server/level/ServerEntity.java -+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java -@@ -187,6 +187,7 @@ public class ServerEntity { - this.teleportDelay = 0; - packet1 = new ClientboundTeleportEntityPacket(this.entity); - } -+ if (net.pl3x.purpur.PurpurConfig.dontSendUselessEntityPackets && isUselessPacket(packet1)) packet1 = null; // Purpur - } - - if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) { -@@ -255,6 +256,22 @@ public class ServerEntity { - - } - -+ // Purpur start -+ private boolean isUselessPacket(Packet possibleUselessPacket) { -+ if (possibleUselessPacket instanceof ClientboundMoveEntityPacket) { -+ ClientboundMoveEntityPacket packet = (ClientboundMoveEntityPacket) possibleUselessPacket; -+ if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.Pos) { -+ return packet.getXa() == 0 && packet.getYa() == 0 && packet.getZa() == 0; -+ } else if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.PosRot) { -+ return packet.getXa() == 0 && packet.getYa() == 0 && packet.getZa() == 0 && packet.getyRot() == 0 && packet.getxRot() == 0; -+ } else if (possibleUselessPacket instanceof ClientboundMoveEntityPacket.Rot) { -+ return packet.getyRot() == 0 && packet.getxRot() == 0; -+ } -+ } -+ return false; -+ } -+ // Purpur end -+ - public void removePairing(ServerPlayer player) { - this.entity.stopSeenByPlayer(player); - player.connection.send(new ClientboundRemoveEntitiesPacket(new int[]{this.entity.getId()})); -diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7f08a6a0e92300825ca90aeb55379a07474b76e5..504e8d2f9c0a2c8c8f6a710c0ad1d438f53d1439 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -233,6 +233,11 @@ public class PurpurConfig { - enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); - } - -+ public static boolean dontSendUselessEntityPackets = false; -+ private static void dontSendUselessEntityPackets() { -+ dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); -+ } -+ - public static boolean loggerSuppressInitLegacyMaterialError = false; - public static boolean loggerSuppressIgnoredAdvancementWarnings = false; - public static boolean loggerSuppressUnrecognizedRecipeErrors = false; diff --git a/patches/server/0033-Tulips-change-fox-type.patch b/patches/server/0032-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0033-Tulips-change-fox-type.patch rename to patches/server/0032-Tulips-change-fox-type.patch diff --git a/patches/server/0034-Breedable-Polar-Bears.patch b/patches/server/0033-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0034-Breedable-Polar-Bears.patch rename to patches/server/0033-Breedable-Polar-Bears.patch diff --git a/patches/server/0035-Chickens-can-retaliate.patch b/patches/server/0034-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0035-Chickens-can-retaliate.patch rename to patches/server/0034-Chickens-can-retaliate.patch diff --git a/patches/server/0036-Add-option-to-set-armorstand-step-height.patch b/patches/server/0035-Add-option-to-set-armorstand-step-height.patch similarity index 100% rename from patches/server/0036-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0035-Add-option-to-set-armorstand-step-height.patch diff --git a/patches/server/0037-Cat-spawning-options.patch b/patches/server/0036-Cat-spawning-options.patch similarity index 100% rename from patches/server/0037-Cat-spawning-options.patch rename to patches/server/0036-Cat-spawning-options.patch diff --git a/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0037-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch similarity index 100% rename from patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch rename to patches/server/0037-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0039-Cows-eat-mushrooms.patch b/patches/server/0038-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0039-Cows-eat-mushrooms.patch rename to patches/server/0038-Cows-eat-mushrooms.patch diff --git a/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0039-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 100% rename from patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0039-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0041-Pigs-give-saddle-back.patch b/patches/server/0040-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0041-Pigs-give-saddle-back.patch rename to patches/server/0040-Pigs-give-saddle-back.patch diff --git a/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch similarity index 100% rename from patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch rename to patches/server/0041-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0043-Ender-dragon-always-drop-full-exp.patch b/patches/server/0042-Ender-dragon-always-drop-full-exp.patch similarity index 100% rename from patches/server/0043-Ender-dragon-always-drop-full-exp.patch rename to patches/server/0042-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0044-Signs-editable-on-right-click.patch b/patches/server/0043-Signs-editable-on-right-click.patch similarity index 100% rename from patches/server/0044-Signs-editable-on-right-click.patch rename to patches/server/0043-Signs-editable-on-right-click.patch diff --git a/patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 100% rename from patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0044-Allow-soil-to-moisten-from-water-directly-under-it.patch diff --git a/patches/server/0046-Minecart-settings-and-WASD-controls.patch b/patches/server/0045-Minecart-settings-and-WASD-controls.patch similarity index 100% rename from patches/server/0046-Minecart-settings-and-WASD-controls.patch rename to patches/server/0045-Minecart-settings-and-WASD-controls.patch diff --git a/patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch similarity index 100% rename from patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0046-Disable-loot-drops-on-death-by-cramming.patch diff --git a/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch similarity index 100% rename from patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0047-Option-to-toggle-milk-curing-bad-omen.patch diff --git a/patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0048-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 100% rename from patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0048-End-gateway-should-check-if-entity-can-use-portal.patch diff --git a/patches/server/0050-Fix-the-dead-lagging-the-server.patch b/patches/server/0049-Fix-the-dead-lagging-the-server.patch similarity index 94% rename from patches/server/0050-Fix-the-dead-lagging-the-server.patch rename to patches/server/0049-Fix-the-dead-lagging-the-server.patch index 215cfab53..30356ca88 100644 --- a/patches/server/0050-Fix-the-dead-lagging-the-server.patch +++ b/patches/server/0049-Fix-the-dead-lagging-the-server.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1582bba7fa315c539cf8b57ae8b760d74091b6ed..646972f9b7205f79b4577984d0407be4eb5f5d4a 100644 +index 0f34da80fe3dabe264c7cbb894f6f732d068a4b6..b8dbd508a25035e899fbc38643f4b38510688c47 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1650,6 +1650,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i diff --git a/patches/server/0051-Skip-events-if-there-s-no-listeners.patch b/patches/server/0050-Skip-events-if-there-s-no-listeners.patch similarity index 100% rename from patches/server/0051-Skip-events-if-there-s-no-listeners.patch rename to patches/server/0050-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0052-Add-permission-for-F3-N-debug.patch b/patches/server/0051-Add-permission-for-F3-N-debug.patch similarity index 100% rename from patches/server/0052-Add-permission-for-F3-N-debug.patch rename to patches/server/0051-Add-permission-for-F3-N-debug.patch diff --git a/patches/server/0053-Configurable-TPS-Catchup.patch b/patches/server/0052-Configurable-TPS-Catchup.patch similarity index 93% rename from patches/server/0053-Configurable-TPS-Catchup.patch rename to patches/server/0052-Configurable-TPS-Catchup.patch index c071a8b9a..7cafc5f64 100644 --- a/patches/server/0053-Configurable-TPS-Catchup.patch +++ b/patches/server/0052-Configurable-TPS-Catchup.patch @@ -24,10 +24,10 @@ index e6c6fe80e2fddceec4cd16b08cf7aab888c7fd9d..a98785ec0e51a242ff29a0a5ae3a6bbb this.profiler.pop(); this.endMetricsRecordingTick(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 504e8d2f9c0a2c8c8f6a710c0ad1d438f53d1439..c27088998dca02124c0381dd4166d63e75a634f6 100644 +index 7f08a6a0e92300825ca90aeb55379a07474b76e5..ae15754986ea4367ccc5853cc10b1c8040bda1fb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -246,4 +246,9 @@ public class PurpurConfig { +@@ -241,4 +241,9 @@ public class PurpurConfig { loggerSuppressIgnoredAdvancementWarnings = getBoolean("settings.logger.suppress-ignored-advancement-warnings", loggerSuppressIgnoredAdvancementWarnings); loggerSuppressUnrecognizedRecipeErrors = getBoolean("settings.logger.suppress-unrecognized-recipe-errors", loggerSuppressUnrecognizedRecipeErrors); } diff --git a/patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 100% rename from patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0053-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch diff --git a/patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch similarity index 100% rename from patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch rename to patches/server/0054-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0056-Villagers-follow-emerald-blocks.patch b/patches/server/0055-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0056-Villagers-follow-emerald-blocks.patch rename to patches/server/0055-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0057-Allow-leashing-villagers.patch b/patches/server/0056-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0057-Allow-leashing-villagers.patch rename to patches/server/0056-Allow-leashing-villagers.patch diff --git a/patches/server/0058-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0057-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0058-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0057-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0059-Implement-infinite-liquids.patch b/patches/server/0058-Implement-infinite-liquids.patch similarity index 100% rename from patches/server/0059-Implement-infinite-liquids.patch rename to patches/server/0058-Implement-infinite-liquids.patch diff --git a/patches/server/0060-Make-lava-flow-speed-configurable.patch b/patches/server/0059-Make-lava-flow-speed-configurable.patch similarity index 100% rename from patches/server/0060-Make-lava-flow-speed-configurable.patch rename to patches/server/0059-Make-lava-flow-speed-configurable.patch diff --git a/patches/server/0061-Add-player-death-exp-control-options.patch b/patches/server/0060-Add-player-death-exp-control-options.patch similarity index 100% rename from patches/server/0061-Add-player-death-exp-control-options.patch rename to patches/server/0060-Add-player-death-exp-control-options.patch diff --git a/patches/server/0062-Configurable-void-damage-height-and-damage.patch b/patches/server/0061-Configurable-void-damage-height-and-damage.patch similarity index 97% rename from patches/server/0062-Configurable-void-damage-height-and-damage.patch rename to patches/server/0061-Configurable-void-damage-height-and-damage.patch index d7fac3d2e..d141b0a36 100644 --- a/patches/server/0062-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0061-Configurable-void-damage-height-and-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 646972f9b7205f79b4577984d0407be4eb5f5d4a..8b62f8ce2f75e6e82dafc770333ccf33f5f94ca8 100644 +index b8dbd508a25035e899fbc38643f4b38510688c47..0e7f3dbde4e042a5942643b74dd40663d40c39de 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -778,7 +778,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i diff --git a/patches/server/0063-Add-canSaveToDisk-to-Entity.patch b/patches/server/0062-Add-canSaveToDisk-to-Entity.patch similarity index 95% rename from patches/server/0063-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0062-Add-canSaveToDisk-to-Entity.patch index de5713391..5708b7338 100644 --- a/patches/server/0063-Add-canSaveToDisk-to-Entity.patch +++ b/patches/server/0062-Add-canSaveToDisk-to-Entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add canSaveToDisk to Entity diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 8b62f8ce2f75e6e82dafc770333ccf33f5f94ca8..0c1b9a69b9e90f68b466865a0cd8e6632ecd988a 100644 +index 0e7f3dbde4e042a5942643b74dd40663d40c39de..7886a095c063978e90d74fb107049d934e7de9aa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4240,5 +4240,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i @@ -19,7 +19,7 @@ index 8b62f8ce2f75e6e82dafc770333ccf33f5f94ca8..0c1b9a69b9e90f68b466865a0cd8e663 // Purpur end } diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 8aa986e4fff1b74b95e59b9b2cbee1356411df7c..54ea9f591d31f3503a67b3b10f9f737843c03b79 100644 +index 098006e9d5c840db604be8603d465c2c43d56547..b106e046eaadd99dce3b48b222f29d57efe12f66 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -204,6 +204,11 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0064-Dispenser-curse-of-binding-protection.patch b/patches/server/0063-Dispenser-curse-of-binding-protection.patch similarity index 100% rename from patches/server/0064-Dispenser-curse-of-binding-protection.patch rename to patches/server/0063-Dispenser-curse-of-binding-protection.patch diff --git a/patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch similarity index 100% rename from patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch diff --git a/patches/server/0066-Mending-mends-most-damages-equipment-first.patch b/patches/server/0065-Mending-mends-most-damages-equipment-first.patch similarity index 100% rename from patches/server/0066-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0065-Mending-mends-most-damages-equipment-first.patch diff --git a/patches/server/0067-Add-5-second-tps-average-in-tps.patch b/patches/server/0066-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0067-Add-5-second-tps-average-in-tps.patch rename to patches/server/0066-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0068-Implement-elytra-settings.patch b/patches/server/0067-Implement-elytra-settings.patch similarity index 100% rename from patches/server/0068-Implement-elytra-settings.patch rename to patches/server/0067-Implement-elytra-settings.patch diff --git a/patches/server/0069-Item-entity-immunities.patch b/patches/server/0068-Item-entity-immunities.patch similarity index 99% rename from patches/server/0069-Item-entity-immunities.patch rename to patches/server/0068-Item-entity-immunities.patch index ea253eeb3..fe660cfde 100644 --- a/patches/server/0069-Item-entity-immunities.patch +++ b/patches/server/0068-Item-entity-immunities.patch @@ -18,7 +18,7 @@ index 3947e1f2823e8d077350b7e781c04a4b46a83939..9656e8f0338568d317d81f0a54e33546 private final int range; SectionPos lastSectionPos; diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index cc44994147e96e6b3f568921db5366a6ced25a1e..1472268e60159f5ada50ec3659268e82a7c22de0 100644 +index 703ac671b19636859648f16a5431b2700791e7d5..38d5e710146c817b1cd3d0930de3257f01667529 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -67,7 +67,7 @@ public class ServerEntity { diff --git a/patches/server/0070-Add-ping-command.patch b/patches/server/0069-Add-ping-command.patch similarity index 97% rename from patches/server/0070-Add-ping-command.patch rename to patches/server/0069-Add-ping-command.patch index 693df5da9..6afb3b3a5 100644 --- a/patches/server/0070-Add-ping-command.patch +++ b/patches/server/0069-Add-ping-command.patch @@ -17,7 +17,7 @@ index 2474594f165aff55d4a08ccf0a602203cc908f65..2778f58a9b506247cbf9abe2b5fe9ab0 if (environment.includeIntegrated) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c27088998dca02124c0381dd4166d63e75a634f6..10a3bcd31f6cd2ec27c79c622fecc4a24fda9f17 100644 +index ae15754986ea4367ccc5853cc10b1c8040bda1fb..b1ff36e0e39ff3e44ae7d71bbea10defd0ee4435 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -162,12 +162,14 @@ public class PurpurConfig { diff --git a/patches/server/0071-Add-demo-command.patch b/patches/server/0070-Add-demo-command.patch similarity index 97% rename from patches/server/0071-Add-demo-command.patch rename to patches/server/0070-Add-demo-command.patch index f45e9ee90..010dbc7a2 100644 --- a/patches/server/0071-Add-demo-command.patch +++ b/patches/server/0070-Add-demo-command.patch @@ -17,7 +17,7 @@ index 2778f58a9b506247cbf9abe2b5fe9ab0f84502de..eaa24bd6147f161e0a00df91a2375d7f } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 10a3bcd31f6cd2ec27c79c622fecc4a24fda9f17..196f57d3c7f1b9e57122c42c73de7157da477246 100644 +index b1ff36e0e39ff3e44ae7d71bbea10defd0ee4435..1e1784d181d07fe4927817dcee71970141b436be 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -162,6 +162,7 @@ public class PurpurConfig { diff --git a/patches/server/0072-Add-credits-command.patch b/patches/server/0071-Add-credits-command.patch similarity index 97% rename from patches/server/0072-Add-credits-command.patch rename to patches/server/0071-Add-credits-command.patch index dcf33ec5a..712f85466 100644 --- a/patches/server/0072-Add-credits-command.patch +++ b/patches/server/0071-Add-credits-command.patch @@ -17,7 +17,7 @@ index eaa24bd6147f161e0a00df91a2375d7f259ce0d2..d054bee8c7c6f6bf608252f21b2f5192 net.pl3x.purpur.command.PingCommand.register(this.dispatcher); // Purpur } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 196f57d3c7f1b9e57122c42c73de7157da477246..c202cb7e325b8ace1ed3aa3ba86419d7571d0f0e 100644 +index 1e1784d181d07fe4927817dcee71970141b436be..e236b8b64c867dab2b3d45df129df0260af4fccc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -162,6 +162,7 @@ public class PurpurConfig { diff --git a/patches/server/0073-Configurable-jockey-options.patch b/patches/server/0072-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0073-Configurable-jockey-options.patch rename to patches/server/0072-Configurable-jockey-options.patch diff --git a/patches/server/0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/server/0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/server/0075-Add-phantom-spawning-options.patch b/patches/server/0074-Add-phantom-spawning-options.patch similarity index 100% rename from patches/server/0075-Add-phantom-spawning-options.patch rename to patches/server/0074-Add-phantom-spawning-options.patch diff --git a/patches/server/0076-Implement-bed-explosion-options.patch b/patches/server/0075-Implement-bed-explosion-options.patch similarity index 100% rename from patches/server/0076-Implement-bed-explosion-options.patch rename to patches/server/0075-Implement-bed-explosion-options.patch diff --git a/patches/server/0077-Implement-respawn-anchor-explosion-options.patch b/patches/server/0076-Implement-respawn-anchor-explosion-options.patch similarity index 100% rename from patches/server/0077-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0076-Implement-respawn-anchor-explosion-options.patch diff --git a/patches/server/0078-Add-allow-water-in-end-world-option.patch b/patches/server/0077-Add-allow-water-in-end-world-option.patch similarity index 94% rename from patches/server/0078-Add-allow-water-in-end-world-option.patch rename to patches/server/0077-Add-allow-water-in-end-world-option.patch index 5d5b2e94c..8c0324bf2 100644 --- a/patches/server/0078-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0077-Add-allow-water-in-end-world-option.patch @@ -68,11 +68,11 @@ index 2676cddca511ea775766cec0001269407599df6e..096d6a07cd44cc674b53e5d3759e44f2 } else { world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState()); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c202cb7e325b8ace1ed3aa3ba86419d7571d0f0e..b2b7d0a89a6a0d3482caea8fcad1d46de7e4b8ee 100644 +index e236b8b64c867dab2b3d45df129df0260af4fccc..5252ce6eb6bd9b7383bef17ec5a3087db43dbeef 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -244,6 +244,11 @@ public class PurpurConfig { - dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); +@@ -239,6 +239,11 @@ public class PurpurConfig { + enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows); } + public static boolean allowWaterPlacementInTheEnd = true; diff --git a/patches/server/0079-Allow-color-codes-in-books.patch b/patches/server/0078-Allow-color-codes-in-books.patch similarity index 100% rename from patches/server/0079-Allow-color-codes-in-books.patch rename to patches/server/0078-Allow-color-codes-in-books.patch diff --git a/patches/server/0080-Entity-lifespan.patch b/patches/server/0079-Entity-lifespan.patch similarity index 100% rename from patches/server/0080-Entity-lifespan.patch rename to patches/server/0079-Entity-lifespan.patch diff --git a/patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 100% rename from patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch diff --git a/patches/server/0082-Squid-EAR-immunity.patch b/patches/server/0081-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0082-Squid-EAR-immunity.patch rename to patches/server/0081-Squid-EAR-immunity.patch diff --git a/patches/server/0083-Phantoms-burn-in-light.patch b/patches/server/0082-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0083-Phantoms-burn-in-light.patch rename to patches/server/0082-Phantoms-burn-in-light.patch diff --git a/patches/server/0084-Configurable-villager-breeding.patch b/patches/server/0083-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0084-Configurable-villager-breeding.patch rename to patches/server/0083-Configurable-villager-breeding.patch diff --git a/patches/server/0085-Redstone-deactivates-spawners.patch b/patches/server/0084-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0085-Redstone-deactivates-spawners.patch rename to patches/server/0084-Redstone-deactivates-spawners.patch diff --git a/patches/server/0086-Totems-work-in-inventory.patch b/patches/server/0085-Totems-work-in-inventory.patch similarity index 100% rename from patches/server/0086-Totems-work-in-inventory.patch rename to patches/server/0085-Totems-work-in-inventory.patch diff --git a/patches/server/0087-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0087-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0086-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0088-Add-option-to-disable-certain-block-updates.patch b/patches/server/0087-Add-option-to-disable-certain-block-updates.patch similarity index 98% rename from patches/server/0088-Add-option-to-disable-certain-block-updates.patch rename to patches/server/0087-Add-option-to-disable-certain-block-updates.patch index 2905d987b..fef380ce9 100644 --- a/patches/server/0088-Add-option-to-disable-certain-block-updates.patch +++ b/patches/server/0087-Add-option-to-disable-certain-block-updates.patch @@ -125,10 +125,10 @@ index 16e11e31077f160198e0b04abdfeabb97ed20c6f..0512b3701a3bf33891ab6281355c07af } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b2b7d0a89a6a0d3482caea8fcad1d46de7e4b8ee..c55f0be5437f36d42dacb2e61efcecac3cf379ee 100644 +index 5252ce6eb6bd9b7383bef17ec5a3087db43dbeef..01872f312cbbfc6ffd2fc2a8dff208bd026fe97f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -249,6 +249,15 @@ public class PurpurConfig { +@@ -244,6 +244,15 @@ public class PurpurConfig { allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); } diff --git a/patches/server/0089-Dispensers-place-anvils-option.patch b/patches/server/0088-Dispensers-place-anvils-option.patch similarity index 100% rename from patches/server/0089-Dispensers-place-anvils-option.patch rename to patches/server/0088-Dispensers-place-anvils-option.patch diff --git a/patches/server/0090-Allow-anvil-colors.patch b/patches/server/0089-Allow-anvil-colors.patch similarity index 100% rename from patches/server/0090-Allow-anvil-colors.patch rename to patches/server/0089-Allow-anvil-colors.patch diff --git a/patches/server/0091-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0091-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0092-Short-enderman-height.patch b/patches/server/0091-Short-enderman-height.patch similarity index 89% rename from patches/server/0092-Short-enderman-height.patch rename to patches/server/0091-Short-enderman-height.patch index 9e0c75341..0740dca9b 100644 --- a/patches/server/0092-Short-enderman-height.patch +++ b/patches/server/0091-Short-enderman-height.patch @@ -31,7 +31,7 @@ index 71b472e3fefe549fe959fda1702213bac3c3e7d4..490b8d674a0f1ae75de89fcadb2894da Entity entity = source.getDirectEntity(); boolean flag; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c55f0be5437f36d42dacb2e61efcecac3cf379ee..ee78e74edb95f29c42ae94e733fd44043191206e 100644 +index 01872f312cbbfc6ffd2fc2a8dff208bd026fe97f..f9f0fe89bba6279b4038fbf214b158774cea3032 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -239,6 +239,12 @@ public class PurpurConfig { @@ -44,6 +44,6 @@ index c55f0be5437f36d42dacb2e61efcecac3cf379ee..ee78e74edb95f29c42ae94e733fd4404 + if (endermanShortHeight) EntityType.ENDERMAN.setDimensions(EntityDimensions.scalable(0.6F, 1.9F)); + } + - public static boolean dontSendUselessEntityPackets = false; - private static void dontSendUselessEntityPackets() { - dontSendUselessEntityPackets = getBoolean("settings.dont-send-useless-entity-packets", dontSendUselessEntityPackets); + public static boolean allowWaterPlacementInTheEnd = true; + private static void allowWaterPlacementInEnd() { + allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); diff --git a/patches/server/0093-Stop-squids-floating-on-top-of-water.patch b/patches/server/0092-Stop-squids-floating-on-top-of-water.patch similarity index 97% rename from patches/server/0093-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0092-Stop-squids-floating-on-top-of-water.patch index e161998d0..73ca64f54 100644 --- a/patches/server/0093-Stop-squids-floating-on-top-of-water.patch +++ b/patches/server/0092-Stop-squids-floating-on-top-of-water.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stop squids floating on top of water diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 0c1b9a69b9e90f68b466865a0cd8e6632ecd988a..94601ee45d3d1e2829e25dc318f49e2dc7ff2d70 100644 +index 7886a095c063978e90d74fb107049d934e7de9aa..a12058f714b7f3ccb8f7121ac242af5bb2d4911e 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3793,6 +3793,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i diff --git a/patches/server/0094-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch similarity index 96% rename from patches/server/0094-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch index afeef7be2..4ea1162e1 100644 --- a/patches/server/0094-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch @@ -18,7 +18,7 @@ index 5d76674d5e181f012c0686e9915556bc93087706..4a7626819fe7c3cad694072b9ae57371 private final LevelAccessor level; private final Direction.Axis axis; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index ee78e74edb95f29c42ae94e733fd44043191206e..0af482784c7d9337b16c52ba52962f0380ae43e0 100644 +index f9f0fe89bba6279b4038fbf214b158774cea3032..2494c566ac34914f38484dafe1197dab0285515a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -207,6 +207,7 @@ public class PurpurConfig { diff --git a/patches/server/0095-Entities-can-use-portals-configuration.patch b/patches/server/0094-Entities-can-use-portals-configuration.patch similarity index 96% rename from patches/server/0095-Entities-can-use-portals-configuration.patch rename to patches/server/0094-Entities-can-use-portals-configuration.patch index 101266142..9585a6de5 100644 --- a/patches/server/0095-Entities-can-use-portals-configuration.patch +++ b/patches/server/0094-Entities-can-use-portals-configuration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 94601ee45d3d1e2829e25dc318f49e2dc7ff2d70..42e7d6d431591cf0edf8f3aa05a4ccf3b788c7b5 100644 +index a12058f714b7f3ccb8f7121ac242af5bb2d4911e..48cf0a22ff28c7e2ce87c7fcb5ceafac031f0038 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2629,7 +2629,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i diff --git a/patches/server/0096-LivingEntity-broadcastItemBreak.patch b/patches/server/0095-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0096-LivingEntity-broadcastItemBreak.patch rename to patches/server/0095-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0097-Customizable-wither-health-and-healing.patch b/patches/server/0096-Customizable-wither-health-and-healing.patch similarity index 96% rename from patches/server/0097-Customizable-wither-health-and-healing.patch rename to patches/server/0096-Customizable-wither-health-and-healing.patch index 6f6d2f908..074f6df8b 100644 --- a/patches/server/0097-Customizable-wither-health-and-healing.patch +++ b/patches/server/0096-Customizable-wither-health-and-healing.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often. diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 54ea9f591d31f3503a67b3b10f9f737843c03b79..10883671cb28e579445f17c7ed729a0edb987bac 100644 +index b106e046eaadd99dce3b48b222f29d57efe12f66..9ba855af05a80bef63be043f3672996af6bf411f 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -515,8 +515,10 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob diff --git a/patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch similarity index 100% rename from patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch diff --git a/patches/server/0099-Raid-cooldown-setting.patch b/patches/server/0098-Raid-cooldown-setting.patch similarity index 100% rename from patches/server/0099-Raid-cooldown-setting.patch rename to patches/server/0098-Raid-cooldown-setting.patch diff --git a/patches/server/0100-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch similarity index 100% rename from patches/server/0100-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch diff --git a/patches/server/0101-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0101-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0103-Flying-squids-Oh-my.patch b/patches/server/0102-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0103-Flying-squids-Oh-my.patch rename to patches/server/0102-Flying-squids-Oh-my.patch diff --git a/patches/server/0104-Infinity-bow-settings.patch b/patches/server/0103-Infinity-bow-settings.patch similarity index 100% rename from patches/server/0104-Infinity-bow-settings.patch rename to patches/server/0103-Infinity-bow-settings.patch diff --git a/patches/server/0105-Stonecutter-damage.patch b/patches/server/0104-Stonecutter-damage.patch similarity index 97% rename from patches/server/0105-Stonecutter-damage.patch rename to patches/server/0104-Stonecutter-damage.patch index 65abb0900..0ad63a430 100644 --- a/patches/server/0105-Stonecutter-damage.patch +++ b/patches/server/0104-Stonecutter-damage.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stonecutter damage diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 42e7d6d431591cf0edf8f3aa05a4ccf3b788c7b5..8766be89f7bc2f3ce427d4ec428d1fa65a10d995 100644 +index 48cf0a22ff28c7e2ce87c7fcb5ceafac031f0038..1d5ab54742ee9818ffd8cf1687e89269f449e6c4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1019,7 +1019,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i diff --git a/patches/server/0106-Configurable-daylight-cycle.patch b/patches/server/0105-Configurable-daylight-cycle.patch similarity index 100% rename from patches/server/0106-Configurable-daylight-cycle.patch rename to patches/server/0105-Configurable-daylight-cycle.patch diff --git a/patches/server/0107-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch similarity index 95% rename from patches/server/0107-Allow-infinite-and-mending-enchantments-together.patch rename to patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch index 7ffd05e00..6ad2cb120 100644 --- a/patches/server/0107-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch @@ -17,7 +17,7 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0af482784c7d9337b16c52ba52962f0380ae43e0..adcb7b6df1027fefc90f1affc9e6ab93b713e98e 100644 +index 2494c566ac34914f38484dafe1197dab0285515a..2f367f1e7ed64264577403a2c309ec426fcb7bbf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -241,6 +241,16 @@ public class PurpurConfig { diff --git a/patches/server/0108-Furnace-uses-lava-from-underneath.patch b/patches/server/0107-Furnace-uses-lava-from-underneath.patch similarity index 100% rename from patches/server/0108-Furnace-uses-lava-from-underneath.patch rename to patches/server/0107-Furnace-uses-lava-from-underneath.patch diff --git a/patches/server/0109-Arrows-should-not-reset-despawn-counter.patch b/patches/server/0108-Arrows-should-not-reset-despawn-counter.patch similarity index 100% rename from patches/server/0109-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0108-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0110-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 100% rename from patches/server/0110-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch diff --git a/patches/server/0111-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch similarity index 100% rename from patches/server/0111-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch diff --git a/patches/server/0112-Make-entity-breeding-times-configurable.patch b/patches/server/0111-Make-entity-breeding-times-configurable.patch similarity index 100% rename from patches/server/0112-Make-entity-breeding-times-configurable.patch rename to patches/server/0111-Make-entity-breeding-times-configurable.patch diff --git a/patches/server/0113-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0112-Apply-display-names-from-item-forms-of-entities-to-e.patch similarity index 100% rename from patches/server/0113-Apply-display-names-from-item-forms-of-entities-to-e.patch rename to patches/server/0112-Apply-display-names-from-item-forms-of-entities-to-e.patch diff --git a/patches/server/0114-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch b/patches/server/0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch similarity index 100% rename from patches/server/0114-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch rename to patches/server/0113-Set-name-visible-when-using-a-Name-Tag-on-an-Armor-S.patch diff --git a/patches/server/0115-Add-twisting-and-weeping-vines-growth-rates.patch b/patches/server/0114-Add-twisting-and-weeping-vines-growth-rates.patch similarity index 100% rename from patches/server/0115-Add-twisting-and-weeping-vines-growth-rates.patch rename to patches/server/0114-Add-twisting-and-weeping-vines-growth-rates.patch diff --git a/patches/server/0116-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch similarity index 100% rename from patches/server/0116-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch rename to patches/server/0115-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch diff --git a/patches/server/0117-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 100% rename from patches/server/0117-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0116-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch diff --git a/patches/server/0118-Add-configurable-snowball-damage.patch b/patches/server/0117-Add-configurable-snowball-damage.patch similarity index 100% rename from patches/server/0118-Add-configurable-snowball-damage.patch rename to patches/server/0117-Add-configurable-snowball-damage.patch diff --git a/patches/server/0119-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0118-Changeable-Mob-Left-Handed-Chance.patch similarity index 100% rename from patches/server/0119-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0118-Changeable-Mob-Left-Handed-Chance.patch diff --git a/patches/server/0120-Add-boat-fall-damage-config.patch b/patches/server/0119-Add-boat-fall-damage-config.patch similarity index 97% rename from patches/server/0120-Add-boat-fall-damage-config.patch rename to patches/server/0119-Add-boat-fall-damage-config.patch index 22689e230..591b39da3 100644 --- a/patches/server/0120-Add-boat-fall-damage-config.patch +++ b/patches/server/0119-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 299e628db2ddb0f36294c12dd5b55db6c519ac22..d3d7a668d78f52b56654fe89148ecdfd662c769e 100644 +index 80a57d726ee663aa37a3b93c883f835a2ebc765e..e07095a3ed1af5a8bb7715c264535ae952e264d9 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1018,7 +1018,16 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0121-Snow-Golem-rate-of-fire-config.patch b/patches/server/0120-Snow-Golem-rate-of-fire-config.patch similarity index 100% rename from patches/server/0121-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0120-Snow-Golem-rate-of-fire-config.patch diff --git a/patches/server/0122-EMC-Configurable-disable-give-dropping.patch b/patches/server/0121-EMC-Configurable-disable-give-dropping.patch similarity index 95% rename from patches/server/0122-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0121-EMC-Configurable-disable-give-dropping.patch index e6f6bd637..db8ea5f99 100644 --- a/patches/server/0122-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0121-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12 itemStack.setCount(1); ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index adcb7b6df1027fefc90f1affc9e6ab93b713e98e..defd23f85fb0e67511ee93f7f9c00cfceb71c484 100644 +index 2f367f1e7ed64264577403a2c309ec426fcb7bbf..192e272a33925b7a1f1937d2348f874857eb25ed 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -204,6 +204,11 @@ public class PurpurConfig { diff --git a/patches/server/0124-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 94% rename from patches/server/0124-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch index edaecd0b1..ee289c8e2 100644 --- a/patches/server/0124-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch +++ b/patches/server/0122-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch @@ -145,10 +145,10 @@ index b615dc2a2127f0874775d1707e96edfb4d95b987..72ae6b3282aac806ae11b87024ee940e brain.setMemory(MemoryModuleType.SECONDARY_JOB_SITE, list); } else { diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index eddaebb31f2c8372ea5bc38a77fda50a0e8844e2..41ee7ebbe9689ee9d8d66463bb53eaf79b76117f 100644 +index 145607300ed953e88b0f9fc1fc61bc34a6c92f84..5292f5f164f2c1bc1aa0ce920bee5afdcc0d2dde 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -232,7 +232,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -215,7 +215,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler brain.addActivity(Activity.PLAY, VillagerGoalPackages.getPlayPackage(0.5F)); } else { brain.setSchedule(Schedule.VILLAGER_DEFAULT); @@ -157,7 +157,7 @@ index eddaebb31f2c8372ea5bc38a77fda50a0e8844e2..41ee7ebbe9689ee9d8d66463bb53eaf7 } brain.addActivity(Activity.CORE, VillagerGoalPackages.getCorePackage(villagerprofession, 0.5F)); -@@ -988,6 +988,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -969,6 +969,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler } public boolean hasFarmSeeds() { @@ -183,22 +183,22 @@ 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 0a03bdd2e4937ec30f915662f6400132f962b71d..4afd18568552494f01f98ef85ce069537f6904dc 100644 +index f7d9795f163d44c95a2ff6c883c3b1f7f1a34bcf..459f48b3bf3667b6768a05496b9fb564ed1af09d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1643,6 +1643,8 @@ public class PurpurWorldConfig { +@@ -1641,6 +1641,8 @@ public class PurpurWorldConfig { + public int villagerSpawnIronGolemLimit = 0; + public boolean villagerCanBreed = true; public int villagerBreedingTicks = 6000; - public boolean villagerLobotomizeEnabled = false; - public int villagerLobotomizeCheck = 60; + public boolean villagerClericsFarmWarts = false; + public boolean villagerClericFarmersThrowWarts = true; private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1667,6 +1669,8 @@ public class PurpurWorldConfig { - } - villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled); - villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); +@@ -1658,6 +1660,8 @@ 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); + villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); + villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); } diff --git a/patches/server/0123-Lobotomize-stuck-villagers.patch b/patches/server/0123-Lobotomize-stuck-villagers.patch deleted file mode 100644 index 1a528afe7..000000000 --- a/patches/server/0123-Lobotomize-stuck-villagers.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Thu, 3 Dec 2020 17:56:18 -0600 -Subject: [PATCH] Lobotomize stuck villagers - - -diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 145607300ed953e88b0f9fc1fc61bc34a6c92f84..eddaebb31f2c8372ea5bc38a77fda50a0e8844e2 100644 ---- a/src/main/java/net/minecraft/world/entity/npc/Villager.java -+++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -138,6 +138,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler - return villageplacetype == PoiType.MEETING; - }); - private final int brainTickOffset; // Purpur -+ boolean lobotomized = false; // Purpur - - public Villager(EntityType entityType, Level world) { - this(entityType, world, VillagerType.PLAINS); -@@ -179,6 +180,22 @@ public class Villager extends AbstractVillager implements ReputationEventHandler - public boolean canBeLeashed(Player player) { - return level.purpurConfig.villagerCanBeLeashed && !this.isLeashed(); - } -+ -+ private boolean isLobotomized() { -+ if ((level.getGameTime() + brainTickOffset) % level.purpurConfig.villagerLobotomizeCheck == 0) { -+ this.lobotomized = !canTravelFrom(blockPosition().above()); -+ } -+ return this.lobotomized; -+ } -+ -+ private boolean canTravelFrom(BlockPos pos) { -+ return canTravelTo(pos.east()) || canTravelTo(pos.west()) || canTravelTo(pos.north()) || canTravelTo(pos.south()); -+ } -+ -+ private boolean canTravelTo(BlockPos pos) { -+ net.minecraft.world.level.pathfinder.Path to = navigation.createPath(pos, 0); -+ return to != null && to.nodes.size() > 0; -+ } - // Purpur end - - @Override -@@ -276,10 +293,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler - protected void mobTick(boolean inactive) { - this.level.getProfiler().push("villagerBrain"); - // Purpur start -+ if (level.purpurConfig.villagerLobotomizeEnabled) inactive = inactive || isLobotomized(); - boolean tick = (level.getGameTime() + brainTickOffset) % level.purpurConfig.villagerBrainTicks == 0; - if (((ServerLevel) level).getServer().lagging ? tick : level.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick) - // Purpur end - if (!inactive) this.getBrain().tick((ServerLevel) this.level, this); // Paper -+ else if (shouldRestock()) restock(); // Purpur - this.level.getProfiler().pop(); - 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 f7d9795f163d44c95a2ff6c883c3b1f7f1a34bcf..0a03bdd2e4937ec30f915662f6400132f962b71d 100644 ---- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1641,6 +1641,8 @@ public class PurpurWorldConfig { - public int villagerSpawnIronGolemLimit = 0; - public boolean villagerCanBreed = true; - public int villagerBreedingTicks = 6000; -+ public boolean villagerLobotomizeEnabled = false; -+ public int villagerLobotomizeCheck = 60; - private void villagerSettings() { - villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); - villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1658,6 +1660,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); -+ if (PurpurConfig.version < 9) { -+ boolean oldValue = getBoolean("mobs.villager.lobotomize-1x1", villagerLobotomizeEnabled); -+ set("mobs.villager.lobotomize.enabled", oldValue); -+ set("mobs.villager.lobotomize-1x1", null); -+ } -+ villagerLobotomizeEnabled = getBoolean("mobs.villager.lobotomize.enabled", villagerLobotomizeEnabled); -+ villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); - } - - public boolean vindicatorRidable = false; diff --git a/patches/server/0125-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 93% rename from patches/server/0125-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch index d1e6af895..4bb768d2d 100644 --- a/patches/server/0125-Toggle-for-Zombified-Piglin-death-always-counting-as.patch +++ b/patches/server/0123-Toggle-for-Zombified-Piglin-death-always-counting-as.patch @@ -35,10 +35,10 @@ index 76f1bbec2b8ebe037de65ee5ec718e17a6081c13..f8b742ee8e637edd8e8b05aff2fcc7a7 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4afd18568552494f01f98ef85ce069537f6904dc..7cac56c153030eda829d283762df3ddc9ed27f96 100644 +index 459f48b3bf3667b6768a05496b9fb564ed1af09d..18bb80875573b5bb35ab9ec448dcb3992407a56d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1869,6 +1869,7 @@ public class PurpurWorldConfig { +@@ -1860,6 +1860,7 @@ public class PurpurWorldConfig { public boolean zombifiedPiglinJockeyOnlyBaby = true; public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; @@ -46,7 +46,7 @@ index 4afd18568552494f01f98ef85ce069537f6904dc..7cac56c153030eda829d283762df3ddc private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1882,5 +1883,6 @@ public class PurpurWorldConfig { +@@ -1873,5 +1874,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/0126-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0124-Spread-out-and-optimise-player-list-ticksSpread-out-.patch similarity index 100% rename from patches/server/0126-Spread-out-and-optimise-player-list-ticksSpread-out-.patch rename to patches/server/0124-Spread-out-and-optimise-player-list-ticksSpread-out-.patch diff --git a/patches/server/0127-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 98% rename from patches/server/0127-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch index 092a0a92a..e0cb3244b 100644 --- a/patches/server/0127-Configurable-chance-for-wolves-to-spawn-rabid.patch +++ b/patches/server/0125-Configurable-chance-for-wolves-to-spawn-rabid.patch @@ -201,10 +201,10 @@ index 2e20a37663f48bd606157e22d466267699c8ed21..1c971eaf2fca2d1cdc89809f673e49de 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 7cac56c153030eda829d283762df3ddc9ed27f96..2104500979f4db121a9e0bcd2cb311a8196431a8 100644 +index 18bb80875573b5bb35ab9ec448dcb3992407a56d..da0849e6e38a2c54410bd158b16f8f3e79e60066 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1762,6 +1762,8 @@ public class PurpurWorldConfig { +@@ -1753,6 +1753,8 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -213,7 +213,7 @@ index 7cac56c153030eda829d283762df3ddc9ed27f96..2104500979f4db121a9e0bcd2cb311a8 public int wolfBreedingTicks = 6000; private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); -@@ -1772,6 +1774,8 @@ public class PurpurWorldConfig { +@@ -1763,6 +1765,8 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0128-Configurable-default-collar-color.patch b/patches/server/0126-Configurable-default-collar-color.patch similarity index 95% rename from patches/server/0128-Configurable-default-collar-color.patch rename to patches/server/0126-Configurable-default-collar-color.patch index 5e8c79482..2c290aebf 100644 --- a/patches/server/0128-Configurable-default-collar-color.patch +++ b/patches/server/0126-Configurable-default-collar-color.patch @@ -45,7 +45,7 @@ index 1c971eaf2fca2d1cdc89809f673e49de107a4a46..a669a00d68807ed451a1b0def7a92e17 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2104500979f4db121a9e0bcd2cb311a8196431a8..4c887deba8d3a7f5688a8f7cc2078ed4a844a72a 100644 +index da0849e6e38a2c54410bd158b16f8f3e79e60066..4e889a369b1bf75e6ed3f175997b4604eaeb4414 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -588,6 +588,7 @@ public class PurpurWorldConfig { @@ -68,7 +68,7 @@ index 2104500979f4db121a9e0bcd2cb311a8196431a8..4c887deba8d3a7f5688a8f7cc2078ed4 catMaxHealth = getDouble("mobs.cat.attributes.max_health", catMaxHealth); catSpawnDelay = getInt("mobs.cat.spawn-delay", catSpawnDelay); catSpawnSwampHutScanRange = getInt("mobs.cat.scan-range-for-other-cats.swamp-hut", catSpawnSwampHutScanRange); -@@ -1762,6 +1768,7 @@ public class PurpurWorldConfig { +@@ -1753,6 +1759,7 @@ public class PurpurWorldConfig { public boolean wolfRidable = false; public boolean wolfRidableInWater = false; public double wolfMaxHealth = 8.0D; @@ -76,7 +76,7 @@ index 2104500979f4db121a9e0bcd2cb311a8196431a8..4c887deba8d3a7f5688a8f7cc2078ed4 public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; -@@ -1774,6 +1781,11 @@ public class PurpurWorldConfig { +@@ -1765,6 +1772,11 @@ public class PurpurWorldConfig { set("mobs.wolf.attributes.max_health", oldValue); } wolfMaxHealth = getDouble("mobs.wolf.attributes.max_health", wolfMaxHealth); diff --git a/patches/server/0129-Phantom-flames-on-swoop.patch b/patches/server/0127-Phantom-flames-on-swoop.patch similarity index 95% rename from patches/server/0129-Phantom-flames-on-swoop.patch rename to patches/server/0127-Phantom-flames-on-swoop.patch index 9d673b15e..0477b3b9c 100644 --- a/patches/server/0129-Phantom-flames-on-swoop.patch +++ b/patches/server/0127-Phantom-flames-on-swoop.patch @@ -17,7 +17,7 @@ index edb28f9424af0d1973231729785b6ec67b599dbd..c3fde22e1cf98881da66e70870ced65f @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4c887deba8d3a7f5688a8f7cc2078ed4a844a72a..a4c3682075034f4d724da996d71dd029b79349c3 100644 +index 4e889a369b1bf75e6ed3f175997b4604eaeb4414..f9f393c36cc809c35845c4ab3732a22311d8f378 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1178,6 +1178,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0130-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 95% rename from patches/server/0130-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch index ee1b2a269..803a263e9 100644 --- a/patches/server/0130-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0128-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,7 +17,7 @@ index db726697b00afdee6078849fd224263483349912..c808664a67a9604e40ab388c6d0e6ac3 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 a4c3682075034f4d724da996d71dd029b79349c3..da157904b51cf74b56a50ffd9ff35906350315c8 100644 +index f9f393c36cc809c35845c4ab3732a22311d8f378..469d001170e2aa18475efaab25e1f48105b47218 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -418,6 +418,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0131-Implement-TPSBar.patch b/patches/server/0129-Implement-TPSBar.patch similarity index 99% rename from patches/server/0131-Implement-TPSBar.patch rename to patches/server/0129-Implement-TPSBar.patch index 28277ecd7..acd56de45 100644 --- a/patches/server/0131-Implement-TPSBar.patch +++ b/patches/server/0129-Implement-TPSBar.patch @@ -105,7 +105,7 @@ index 122b6f4fd8334483d32dbe353c273dbec14086aa..e4e7049e9e9739b5f5035319640eb046 entityplayer.awardStat(Stats.LEAVE_GAME); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index defd23f85fb0e67511ee93f7f9c00cfceb71c484..039c5e6d98228837f7818803641656d566e416f5 100644 +index 192e272a33925b7a1f1937d2348f874857eb25ed..294be16a809f4fe7f62de51648b25f26e2a5b82a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -209,6 +209,29 @@ public class PurpurConfig { diff --git a/patches/server/0132-Striders-give-saddle-back.patch b/patches/server/0130-Striders-give-saddle-back.patch similarity index 96% rename from patches/server/0132-Striders-give-saddle-back.patch rename to patches/server/0130-Striders-give-saddle-back.patch index af3960fe4..10a57d887 100644 --- a/patches/server/0132-Striders-give-saddle-back.patch +++ b/patches/server/0130-Striders-give-saddle-back.patch @@ -28,7 +28,7 @@ index 672801ab77a10917147f12b2117a3390885b39b0..b4f7d6f4b7e6f6d5fe9e472f1723430c } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index da157904b51cf74b56a50ffd9ff35906350315c8..155d8706446ded023124d537b542fd13c611c5a8 100644 +index 469d001170e2aa18475efaab25e1f48105b47218..14110f925bb60819a50fabad7705c26f87e77f19 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1553,6 +1553,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0133-PlayerBookTooLargeEvent.patch b/patches/server/0131-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/server/0133-PlayerBookTooLargeEvent.patch rename to patches/server/0131-PlayerBookTooLargeEvent.patch diff --git a/patches/server/0134-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch similarity index 97% rename from patches/server/0134-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch index a910021da..c7a009fe9 100644 --- a/patches/server/0134-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0132-Full-netherite-armor-grants-fire-resistance.patch @@ -26,7 +26,7 @@ index 42becbb21eee4e1b0a14e2fc3e226f0de26c96b1..0a8c8a24af17262be3e656042dc5c8bc protected ItemCooldowns createItemCooldowns() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 155d8706446ded023124d537b542fd13c611c5a8..8ac606ca005d4e1836e8428d7c44de609d535df4 100644 +index 14110f925bb60819a50fabad7705c26f87e77f19..d77e802ac6c62b1cda8d1f67b41dd3c6d67f8e2a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -267,6 +267,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0135-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0133-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0135-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0133-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0136-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 98% rename from patches/server/0136-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch index 2803a6d73..8c5739a0a 100644 --- a/patches/server/0136-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0134-Add-mobGriefing-bypass-to-everything-affected.patch @@ -144,7 +144,7 @@ index e29fe6939d59a58093ddfbdf9b274469c5e25756..6ba83c938456dc79c8cd948ae981c6f2 // flag1 = this.level.removeBlock(blockposition, false) || flag1; flag1 = true; diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java -index 10883671cb28e579445f17c7ed729a0edb987bac..c935177150c8270329dbf7cc43da31c603555c52 100644 +index 9ba855af05a80bef63be043f3672996af6bf411f..86cd0a6d42a232ad81e0593f3b5b23c97d20db39 100644 --- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java +++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java @@ -386,7 +386,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob @@ -393,7 +393,7 @@ index b942e7c85e6c8f9a7664d9e5bf93bcd79e0651f1..5b29f3fced5435e172dd69f6f4eb265e 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 8ac606ca005d4e1836e8428d7c44de609d535df4..578943ea50764470145c3ff81d3188440d365711 100644 +index d77e802ac6c62b1cda8d1f67b41dd3c6d67f8e2a..245f602c5511b11ef7572cbff7e31db5e76ea545 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -381,8 +381,11 @@ public class PurpurWorldConfig { @@ -646,23 +646,23 @@ index 8ac606ca005d4e1836e8428d7c44de609d535df4..578943ea50764470145c3ff81d318844 } public boolean squidRidable = false; -@@ -1673,6 +1715,7 @@ public class PurpurWorldConfig { - public int villagerLobotomizeCheck = 60; +@@ -1671,6 +1713,7 @@ public class PurpurWorldConfig { + public int villagerBreedingTicks = 6000; public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; + public boolean villagerBypassMobGriefing = false; private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1699,6 +1742,7 @@ public class PurpurWorldConfig { - villagerLobotomizeCheck = getInt("mobs.villager.lobotomize.check-interval", villagerLobotomizeCheck); +@@ -1690,6 +1733,7 @@ public class PurpurWorldConfig { + villagerBreedingTicks = getInt("mobs.villager.breeding-delay-ticks", villagerBreedingTicks); 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); } public boolean vindicatorRidable = false; -@@ -1755,6 +1799,7 @@ public class PurpurWorldConfig { +@@ -1746,6 +1790,7 @@ public class PurpurWorldConfig { public double witherMaxHealth = 300.0D; public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; @@ -670,7 +670,7 @@ index 8ac606ca005d4e1836e8428d7c44de609d535df4..578943ea50764470145c3ff81d318844 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1771,6 +1816,7 @@ public class PurpurWorldConfig { +@@ -1762,6 +1807,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); @@ -678,7 +678,7 @@ index 8ac606ca005d4e1836e8428d7c44de609d535df4..578943ea50764470145c3ff81d318844 } public boolean witherSkeletonRidable = false; -@@ -1835,6 +1881,7 @@ public class PurpurWorldConfig { +@@ -1826,6 +1872,7 @@ public class PurpurWorldConfig { public double zombieJockeyChance = 0.05D; public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; @@ -686,7 +686,7 @@ index 8ac606ca005d4e1836e8428d7c44de609d535df4..578943ea50764470145c3ff81d318844 private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1849,6 +1896,7 @@ public class PurpurWorldConfig { +@@ -1840,6 +1887,7 @@ 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/0137-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 97% rename from patches/server/0137-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch index 9149b97f4..68f5d5417 100644 --- a/patches/server/0137-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0135-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index 0512b3701a3bf33891ab6281355c07af6be5b9c1..d79cf8df4be544c4402a2419cd9238bd 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 578943ea50764470145c3ff81d3188440d365711..0ab690478d35782ddb64336252ec426730bd0a19 100644 +index 245f602c5511b11ef7572cbff7e31db5e76ea545..e2239c1a5ea8d8c91d0cd247fa0b4dbc255eeab5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -384,6 +384,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0138-Add-EntityTeleportHinderedEvent.patch b/patches/server/0136-Add-EntityTeleportHinderedEvent.patch similarity index 99% rename from patches/server/0138-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0136-Add-EntityTeleportHinderedEvent.patch index 6b85d1406..e817a3b71 100644 --- a/patches/server/0138-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0136-Add-EntityTeleportHinderedEvent.patch @@ -78,7 +78,7 @@ index 500a4013ce525c0474fe3991457d4c2a50ceb7ed..e0beee6bd772792fbd3bc6a856230311 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0ab690478d35782ddb64336252ec426730bd0a19..cf0dc057e1e8f4d7554c196b1fc4ab01ef84284d 100644 +index e2239c1a5ea8d8c91d0cd247fa0b4dbc255eeab5..1719201a0da3d0da8500a2e138bd0a6234502b9b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -383,6 +383,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0139-Farmland-trampling-changes.patch b/patches/server/0137-Farmland-trampling-changes.patch similarity index 97% rename from patches/server/0139-Farmland-trampling-changes.patch rename to patches/server/0137-Farmland-trampling-changes.patch index 9843eb297..84b22b3c7 100644 --- a/patches/server/0139-Farmland-trampling-changes.patch +++ b/patches/server/0137-Farmland-trampling-changes.patch @@ -37,7 +37,7 @@ index caf40e3df0896492be959f9e0bcfb1fad0bfa2ef..10f1e3d9c35ee80587865cf0035416ae 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 cf0dc057e1e8f4d7554c196b1fc4ab01ef84284d..53417e46d48b6d676b39b3ecd4cba5d5a680d998 100644 +index 1719201a0da3d0da8500a2e138bd0a6234502b9b..90d764834b2210dbc655a46a5f4512afe8dd7d70 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -456,10 +456,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Movement-options-for-armor-stands.patch b/patches/server/0138-Movement-options-for-armor-stands.patch similarity index 98% rename from patches/server/0140-Movement-options-for-armor-stands.patch rename to patches/server/0138-Movement-options-for-armor-stands.patch index fcb0ded3d..8c7d2967d 100644 --- a/patches/server/0140-Movement-options-for-armor-stands.patch +++ b/patches/server/0138-Movement-options-for-armor-stands.patch @@ -66,7 +66,7 @@ index 50370dc8697569a4e5cf8ec3714d227a59357d64..e9e24435057cff9c0af758ca2aa822c3 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 53417e46d48b6d676b39b3ecd4cba5d5a680d998..2e82a009fb0577b129b199841321fadc11c2fd0e 100644 +index 90d764834b2210dbc655a46a5f4512afe8dd7d70..4c65643e508d4c80a3e8f76d7f7fd1f128bd646f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -103,10 +103,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0141-Fix-stuck-in-portals.patch b/patches/server/0139-Fix-stuck-in-portals.patch similarity index 97% rename from patches/server/0141-Fix-stuck-in-portals.patch rename to patches/server/0139-Fix-stuck-in-portals.patch index 0b0e51eed..1caf7e679 100644 --- a/patches/server/0141-Fix-stuck-in-portals.patch +++ b/patches/server/0139-Fix-stuck-in-portals.patch @@ -37,7 +37,7 @@ index 1428e4f1aa8262ff33c789c419451ecef192116f..197326d2831f804620fbfe289a1617ec this.isInsidePortal = true; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2e82a009fb0577b129b199841321fadc11c2fd0e..a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb 100644 +index 4c65643e508d4c80a3e8f76d7f7fd1f128bd646f..2840cea2cb04cc011f7670fccd29cea8dc861d6d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -297,6 +297,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch similarity index 98% rename from patches/server/0142-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch index dd90326ae..e5adaef09 100644 --- a/patches/server/0142-Toggle-for-water-sensitive-mob-damage.patch +++ b/patches/server/0140-Toggle-for-water-sensitive-mob-damage.patch @@ -1142,12 +1142,12 @@ index f6734f2eb44af7b2389de5079831e0e4f8a1c742..d3a298734e4434d29b66e94fc6c299d3 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index 41ee7ebbe9689ee9d8d66463bb53eaf79b76117f..b14c2801021bc006bee94abdea83bab1d70791eb 100644 +index 5292f5f164f2c1bc1aa0ce920bee5afdcc0d2dde..91ecd7e9663b2375f2884a9b598dbae18b740838 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -196,6 +196,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler - net.minecraft.world.level.pathfinder.Path to = navigation.createPath(pos, 0); - return to != null && to.nodes.size() > 0; +@@ -179,6 +179,11 @@ public class Villager extends AbstractVillager implements ReputationEventHandler + public boolean canBeLeashed(Player player) { + return level.purpurConfig.villagerCanBeLeashed && !this.isLeashed(); } + + @Override @@ -1174,7 +1174,7 @@ index c5dbb1c8210b71f7d9d91089cb139f65605573a8..e5b78c9d6fb326771d65ea9afd9da38c @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f64d4239e 100644 +index 2840cea2cb04cc011f7670fccd29cea8dc861d6d..096e8d68982b982722681d8a543558614202ed06 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -574,6 +574,7 @@ public class PurpurWorldConfig { @@ -2096,7 +2096,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean villagerRidable = false; -@@ -1734,6 +1856,7 @@ public class PurpurWorldConfig { +@@ -1732,6 +1854,7 @@ public class PurpurWorldConfig { public boolean villagerClericsFarmWarts = false; public boolean villagerClericFarmersThrowWarts = true; public boolean villagerBypassMobGriefing = false; @@ -2104,7 +2104,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1761,12 +1884,14 @@ public class PurpurWorldConfig { +@@ -1752,12 +1875,14 @@ public class PurpurWorldConfig { villagerClericsFarmWarts = getBoolean("mobs.villager.clerics-farm-warts", villagerClericsFarmWarts); villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); @@ -2119,7 +2119,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void vindicatorSettings() { vindicatorRidable = getBoolean("mobs.vindicator.ridable", vindicatorRidable); vindicatorRidableInWater = getBoolean("mobs.vindicator.ridable-in-water", vindicatorRidableInWater); -@@ -1777,6 +1902,7 @@ public class PurpurWorldConfig { +@@ -1768,6 +1893,7 @@ public class PurpurWorldConfig { } vindicatorMaxHealth = getDouble("mobs.vindicator.attributes.max_health", vindicatorMaxHealth); vindicatorJohnnySpawnChance = getDouble("mobs.vindicator.johnny.spawn-chance", vindicatorJohnnySpawnChance); @@ -2127,7 +2127,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean wanderingTraderRidable = false; -@@ -1784,6 +1910,7 @@ public class PurpurWorldConfig { +@@ -1775,6 +1901,7 @@ public class PurpurWorldConfig { public double wanderingTraderMaxHealth = 20.0D; public boolean wanderingTraderFollowEmeraldBlock = false; public boolean wanderingTraderCanBeLeashed = false; @@ -2135,7 +2135,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -1795,11 +1922,13 @@ public class PurpurWorldConfig { +@@ -1786,11 +1913,13 @@ public class PurpurWorldConfig { wanderingTraderMaxHealth = getDouble("mobs.wandering_trader.attributes.max_health", wanderingTraderMaxHealth); wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); @@ -2149,7 +2149,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void witchSettings() { witchRidable = getBoolean("mobs.witch.ridable", witchRidable); witchRidableInWater = getBoolean("mobs.witch.ridable-in-water", witchRidableInWater); -@@ -1809,6 +1938,7 @@ public class PurpurWorldConfig { +@@ -1800,6 +1929,7 @@ public class PurpurWorldConfig { set("mobs.witch.attributes.max_health", oldValue); } witchMaxHealth = getDouble("mobs.witch.attributes.max_health", witchMaxHealth); @@ -2157,7 +2157,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean witherRidable = false; -@@ -1818,6 +1948,7 @@ public class PurpurWorldConfig { +@@ -1809,6 +1939,7 @@ public class PurpurWorldConfig { public float witherHealthRegenAmount = 1.0f; public int witherHealthRegenDelay = 20; public boolean witherBypassMobGriefing = false; @@ -2165,7 +2165,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1835,11 +1966,13 @@ public class PurpurWorldConfig { +@@ -1826,11 +1957,13 @@ public class PurpurWorldConfig { witherHealthRegenAmount = (float) getDouble("mobs.wither.health-regen-amount", witherHealthRegenAmount); witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); @@ -2179,7 +2179,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void witherSkeletonSettings() { witherSkeletonRidable = getBoolean("mobs.wither_skeleton.ridable", witherSkeletonRidable); witherSkeletonRidableInWater = getBoolean("mobs.wither_skeleton.ridable-in-water", witherSkeletonRidableInWater); -@@ -1849,6 +1982,7 @@ public class PurpurWorldConfig { +@@ -1840,6 +1973,7 @@ public class PurpurWorldConfig { set("mobs.wither_skeleton.attributes.max_health", oldValue); } witherSkeletonMaxHealth = getDouble("mobs.wither_skeleton.attributes.max_health", witherSkeletonMaxHealth); @@ -2187,7 +2187,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean wolfRidable = false; -@@ -1858,6 +1992,7 @@ public class PurpurWorldConfig { +@@ -1849,6 +1983,7 @@ public class PurpurWorldConfig { public boolean wolfMilkCuresRabies = true; public double wolfNaturalRabid = 0.0D; public int wolfBreedingTicks = 6000; @@ -2195,7 +2195,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void wolfSettings() { wolfRidable = getBoolean("mobs.wolf.ridable", wolfRidable); wolfRidableInWater = getBoolean("mobs.wolf.ridable-in-water", wolfRidableInWater); -@@ -1875,11 +2010,13 @@ public class PurpurWorldConfig { +@@ -1866,11 +2001,13 @@ public class PurpurWorldConfig { wolfMilkCuresRabies = getBoolean("mobs.wolf.milk-cures-rabid-wolves", wolfMilkCuresRabies); wolfNaturalRabid = getDouble("mobs.wolf.spawn-rabid-chance", wolfNaturalRabid); wolfBreedingTicks = getInt("mobs.wolf.breeding-delay-ticks", wolfBreedingTicks); @@ -2209,7 +2209,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void zoglinSettings() { zoglinRidable = getBoolean("mobs.zoglin.ridable", zoglinRidable); zoglinRidableInWater = getBoolean("mobs.zoglin.ridable-in-water", zoglinRidableInWater); -@@ -1889,6 +2026,7 @@ public class PurpurWorldConfig { +@@ -1880,6 +2017,7 @@ public class PurpurWorldConfig { set("mobs.zoglin.attributes.max_health", oldValue); } zoglinMaxHealth = getDouble("mobs.zoglin.attributes.max_health", zoglinMaxHealth); @@ -2217,7 +2217,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean zombieRidable = false; -@@ -1900,6 +2038,7 @@ public class PurpurWorldConfig { +@@ -1891,6 +2029,7 @@ public class PurpurWorldConfig { public boolean zombieJockeyTryExistingChickens = true; public boolean zombieAggressiveTowardsVillagerWhenLagging = true; public boolean zombieBypassMobGriefing = false; @@ -2225,7 +2225,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void zombieSettings() { zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable); zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater); -@@ -1915,6 +2054,7 @@ public class PurpurWorldConfig { +@@ -1906,6 +2045,7 @@ public class PurpurWorldConfig { zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens); zombieAggressiveTowardsVillagerWhenLagging = getBoolean("mobs.zombie.aggressive-towards-villager-when-lagging", zombieAggressiveTowardsVillagerWhenLagging); zombieBypassMobGriefing = getBoolean("mobs.zombie.bypass-mob-griefing", zombieBypassMobGriefing); @@ -2233,7 +2233,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean zombieHorseRidableInWater = false; -@@ -1926,6 +2066,7 @@ public class PurpurWorldConfig { +@@ -1917,6 +2057,7 @@ public class PurpurWorldConfig { public double zombieHorseMovementSpeedMin = 0.2D; public double zombieHorseMovementSpeedMax = 0.2D; public double zombieHorseSpawnChance = 0.0D; @@ -2241,7 +2241,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void zombieHorseSettings() { zombieHorseRidableInWater = getBoolean("mobs.zombie_horse.ridable-in-water", zombieHorseRidableInWater); zombieHorseCanSwim = getBoolean("mobs.zombie_horse.can-swim", zombieHorseCanSwim); -@@ -1942,6 +2083,7 @@ public class PurpurWorldConfig { +@@ -1933,6 +2074,7 @@ public class PurpurWorldConfig { zombieHorseMovementSpeedMin = getDouble("mobs.zombie_horse.attributes.movement_speed.min", zombieHorseMovementSpeedMin); zombieHorseMovementSpeedMax = getDouble("mobs.zombie_horse.attributes.movement_speed.max", zombieHorseMovementSpeedMax); zombieHorseSpawnChance = getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance); @@ -2249,7 +2249,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean zombieVillagerRidable = false; -@@ -1951,6 +2093,7 @@ public class PurpurWorldConfig { +@@ -1942,6 +2084,7 @@ public class PurpurWorldConfig { public boolean zombieVillagerJockeyOnlyBaby = true; public double zombieVillagerJockeyChance = 0.05D; public boolean zombieVillagerJockeyTryExistingChickens = true; @@ -2257,7 +2257,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -1964,6 +2107,7 @@ public class PurpurWorldConfig { +@@ -1955,6 +2098,7 @@ public class PurpurWorldConfig { zombieVillagerJockeyOnlyBaby = getBoolean("mobs.zombie_villager.jockey.only-babies", zombieVillagerJockeyOnlyBaby); zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance); zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); @@ -2265,7 +2265,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f } public boolean zombifiedPiglinRidable = false; -@@ -1974,6 +2118,7 @@ public class PurpurWorldConfig { +@@ -1965,6 +2109,7 @@ public class PurpurWorldConfig { public double zombifiedPiglinJockeyChance = 0.05D; public boolean zombifiedPiglinJockeyTryExistingChickens = true; public boolean zombifiedPiglinCountAsPlayerKillWhenAngry = true; @@ -2273,7 +2273,7 @@ index a9e41e7730ef60b09e89c10cd05dcf7a8c46dedb..2408d9d07c144540d571119dd2ebd90f private void zombifiedPiglinSettings() { zombifiedPiglinRidable = getBoolean("mobs.zombified_piglin.ridable", zombifiedPiglinRidable); zombifiedPiglinRidableInWater = getBoolean("mobs.zombified_piglin.ridable-in-water", zombifiedPiglinRidableInWater); -@@ -1988,5 +2133,6 @@ public class PurpurWorldConfig { +@@ -1979,5 +2124,6 @@ public class PurpurWorldConfig { zombifiedPiglinJockeyChance = getDouble("mobs.zombified_piglin.jockey.chance", zombifiedPiglinJockeyChance); zombifiedPiglinJockeyTryExistingChickens = getBoolean("mobs.zombified_piglin.jockey.try-existing-chickens", zombifiedPiglinJockeyTryExistingChickens); zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); diff --git a/patches/server/0143-Config-to-always-tame-in-Creative.patch b/patches/server/0141-Config-to-always-tame-in-Creative.patch similarity index 98% rename from patches/server/0143-Config-to-always-tame-in-Creative.patch rename to patches/server/0141-Config-to-always-tame-in-Creative.patch index 4de0fefd1..446621383 100644 --- a/patches/server/0143-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0141-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index b039cbbcc33a6b1925d1cf4339018219ceb6c2ad..57e8ef6f7c20d74fdc25d9ab2a9c35b1 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 2408d9d07c144540d571119dd2ebd90f64d4239e..54ad3aa8fa17bee0ce74bff2025a91b44ffb16d0 100644 +index 096e8d68982b982722681d8a543558614202ed06..59b9082ad765120b743605de9f8ccbb9cbcd588c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -385,6 +385,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0144-End-crystal-explosion-options.patch b/patches/server/0142-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0144-End-crystal-explosion-options.patch rename to patches/server/0142-End-crystal-explosion-options.patch index 682cb2a16..7d06ab47a 100644 --- a/patches/server/0144-End-crystal-explosion-options.patch +++ b/patches/server/0142-End-crystal-explosion-options.patch @@ -52,7 +52,7 @@ index f8863cabad1bd0c3c2c62b8e17612d9559237d68..06c6addfa2a8dab1ad52a3588e9aeba5 this.onDestroyedBy(source); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 54ad3aa8fa17bee0ce74bff2025a91b44ffb16d0..c24fb1255a01bcb8b25dd85c2a0b39135d1b3a85 100644 +index 59b9082ad765120b743605de9f8ccbb9cbcd588c..60d6c0e75ca4e74adc33b951111bae7f178cd0ac 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -463,6 +463,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 95% rename from patches/server/0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch index 596ed919a..89542d2e0 100644 --- a/patches/server/0145-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch +++ b/patches/server/0143-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch @@ -29,7 +29,7 @@ index 29351213075a26b5beefeeba012d05fc9c986696..b6f1ad54cdacafb0995a992ff3990a55 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c24fb1255a01bcb8b25dd85c2a0b39135d1b3a85..536902fff0256eed1a7db99857d07ac2358187d9 100644 +index 60d6c0e75ca4e74adc33b951111bae7f178cd0ac..b8dfe1a519a1777b3e0c5644dc82ef89edbb034b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -896,6 +896,7 @@ public class PurpurWorldConfig { @@ -48,7 +48,7 @@ index c24fb1255a01bcb8b25dd85c2a0b39135d1b3a85..536902fff0256eed1a7db99857d07ac2 } public boolean endermanRidable = false; -@@ -1980,6 +1982,7 @@ public class PurpurWorldConfig { +@@ -1971,6 +1973,7 @@ public class PurpurWorldConfig { public int witherHealthRegenDelay = 20; public boolean witherBypassMobGriefing = false; public boolean witherTakeDamageFromWater = false; @@ -56,7 +56,7 @@ index c24fb1255a01bcb8b25dd85c2a0b39135d1b3a85..536902fff0256eed1a7db99857d07ac2 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -1998,6 +2001,7 @@ public class PurpurWorldConfig { +@@ -1989,6 +1992,7 @@ public class PurpurWorldConfig { witherHealthRegenDelay = getInt("mobs.wither.health-regen-delay", witherHealthRegenDelay); witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater); diff --git a/patches/server/0146-Dont-run-with-scissors.patch b/patches/server/0144-Dont-run-with-scissors.patch similarity index 96% rename from patches/server/0146-Dont-run-with-scissors.patch rename to patches/server/0144-Dont-run-with-scissors.patch index 9cceb2674..e560fe12a 100644 --- a/patches/server/0146-Dont-run-with-scissors.patch +++ b/patches/server/0144-Dont-run-with-scissors.patch @@ -36,7 +36,7 @@ index cbd434897155095b3689d0adc274df7749a83192..a196c669891b09c42751004bd76d9c40 Iterable iterable = world.getCollisions(this.player, this.player.getBoundingBox().deflate(9.999999747378752E-6D)); VoxelShape voxelshape = Shapes.create(box.deflate(9.999999747378752E-6D)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 039c5e6d98228837f7818803641656d566e416f5..1e09dc436ce147d42035d48918b811eb7e898c12 100644 +index 294be16a809f4fe7f62de51648b25f26e2a5b82a..dcb9394208df25e1d6fcf9bafa31864b37b5db51 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -165,6 +165,7 @@ public class PurpurConfig { @@ -56,7 +56,7 @@ index 039c5e6d98228837f7818803641656d566e416f5..1e09dc436ce147d42035d48918b811eb public static String serverModName = "Purpur"; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 536902fff0256eed1a7db99857d07ac2358187d9..c9c4441e28bcdfb8cc6768cfd11eb28125160c77 100644 +index b8dfe1a519a1777b3e0c5644dc82ef89edbb034b..38fefd5ff631df27ee05b5f8776f1466d15022bd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -157,6 +157,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0147-One-Punch-Man.patch b/patches/server/0145-One-Punch-Man.patch similarity index 96% rename from patches/server/0147-One-Punch-Man.patch rename to patches/server/0145-One-Punch-Man.patch index 81cd5cd97..cfae174e0 100644 --- a/patches/server/0147-One-Punch-Man.patch +++ b/patches/server/0145-One-Punch-Man.patch @@ -30,7 +30,7 @@ index e0c5947610ab711024c0ef6346f2ca9a87701139..61c59634533fd3ebe79219ccc9d4e351 if (human) { // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c9c4441e28bcdfb8cc6768cfd11eb28125160c77..c7843c447cb6b84473c55a1fdfef50d3048d3999 100644 +index 38fefd5ff631df27ee05b5f8776f1466d15022bd..c816e073d6e3293e75fb3f18a03ea80782c3f15a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -302,6 +302,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0148-Add-config-for-snow-on-blue-ice.patch b/patches/server/0146-Add-config-for-snow-on-blue-ice.patch similarity index 96% rename from patches/server/0148-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0146-Add-config-for-snow-on-blue-ice.patch index 471d2bb6a..e5e1d7387 100644 --- a/patches/server/0148-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0146-Add-config-for-snow-on-blue-ice.patch @@ -29,7 +29,7 @@ index fbbb0155bd66f1daa160e03f866741d903e1869e..86f7b4117b8b9bd36e38962e3290f7b9 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c7843c447cb6b84473c55a1fdfef50d3048d3999..86ce8b92c061c95e9843dae162eb3cb5b985393f 100644 +index c816e073d6e3293e75fb3f18a03ea80782c3f15a..885f535396622aa2ceb1335ef84ad142e03549e3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -524,6 +524,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index f4ca2f195..63c5c30d4 100644 --- a/patches/server/0149-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0147-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch @@ -43,7 +43,7 @@ index 749ab72edc0d2e9c6f1161415ab8d59d3d6ca976..897c202c0905040072a06fdfa2032a7f // Paper end if (user instanceof net.minecraft.server.level.ServerPlayer) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 86ce8b92c061c95e9843dae162eb3cb5b985393f..ba93eb8f839ddfff7039bc631d03741634e0bd39 100644 +index 885f535396622aa2ceb1335ef84ad142e03549e3..7f779df11c73e366fb807d7aece7bba88e1cbcb4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -159,6 +159,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0150-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 96% rename from patches/server/0150-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch index f22741bf4..a4d88a837 100644 --- a/patches/server/0150-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0148-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -18,7 +18,7 @@ index 8b2280d29c41879b26c85d1b0c1ac52f8b7bfacd..0294e31bb7a4346fd9a3b45ef0bed558 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index ba93eb8f839ddfff7039bc631d03741634e0bd39..26b6a700a0bb1178c13f980ccb60b1b89f0ff8ff 100644 +index 7f779df11c73e366fb807d7aece7bba88e1cbcb4..ff2cdbdb785628e564de0fefaef68b408c5e3e8a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -311,6 +311,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0151-Add-back-player-spawned-endermite-API.patch b/patches/server/0149-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0151-Add-back-player-spawned-endermite-API.patch rename to patches/server/0149-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0152-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 97% rename from patches/server/0152-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch index 524257e72..cd2d14ad9 100644 --- a/patches/server/0152-Config-Enderman-aggressiveness-towards-Endermites.patch +++ b/patches/server/0150-Config-Enderman-aggressiveness-towards-Endermites.patch @@ -18,7 +18,7 @@ index a0b347f9daf5e8cf28ec3e308b639d5200c276dd..75d0998d7e6109592400c14c4aee063f } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 26b6a700a0bb1178c13f980ccb60b1b89f0ff8ff..5b32fbe78d50138a2b2d0e75139c1ae06f2e6aef 100644 +index ff2cdbdb785628e564de0fefaef68b408c5e3e8a..83534bbdad44c682cf5fdf8a94390f224c5906f1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -945,6 +945,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 96% rename from patches/server/0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch index a5e327060..7d815e86c 100644 --- a/patches/server/0153-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch +++ b/patches/server/0151-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch @@ -20,7 +20,7 @@ index 75d0998d7e6109592400c14c4aee063f7942961d..13cdfb0175152d2ba203c01f14f2f98d } 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 5b32fbe78d50138a2b2d0e75139c1ae06f2e6aef..f6a974a80865b5c73e4573782b3968772081c259 100644 +index 83534bbdad44c682cf5fdf8a94390f224c5906f1..6ab78da881142ee146499a6193cbfa36cc7fc10a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -947,6 +947,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0154-Tick-fluids-config.patch b/patches/server/0152-Tick-fluids-config.patch similarity index 97% rename from patches/server/0154-Tick-fluids-config.patch rename to patches/server/0152-Tick-fluids-config.patch index eec804f27..b40eb7196 100644 --- a/patches/server/0154-Tick-fluids-config.patch +++ b/patches/server/0152-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 11ebadaa2438281a54cffe025a49ee5046a71ba5..07c25a2518eb5ce0da6131ce5ceb10ac } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f6a974a80865b5c73e4573782b3968772081c259..9dc9c09a4eb3bca84d02c3e3c7297c7434a15fde 100644 +index 6ab78da881142ee146499a6193cbfa36cc7fc10a..241383f4edf4a1ec8d6b92400a6055527a49758c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -413,6 +413,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0155-Config-to-disable-Llama-caravans.patch b/patches/server/0153-Config-to-disable-Llama-caravans.patch similarity index 97% rename from patches/server/0155-Config-to-disable-Llama-caravans.patch rename to patches/server/0153-Config-to-disable-Llama-caravans.patch index a9d25006d..998a0fd11 100644 --- a/patches/server/0155-Config-to-disable-Llama-caravans.patch +++ b/patches/server/0153-Config-to-disable-Llama-caravans.patch @@ -32,7 +32,7 @@ index d0016761c124a4d593b18006efa18757ad385ab0..13fd55f198f36ed6b5d3b242e07535c5 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 9dc9c09a4eb3bca84d02c3e3c7297c7434a15fde..be2353190c4e536d8751db694cf4da3df32a9c33 100644 +index 241383f4edf4a1ec8d6b92400a6055527a49758c..e068b364782311c24790e23ecfd67e571d75d3a2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1240,6 +1240,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0156-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch similarity index 97% rename from patches/server/0156-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0154-Config-to-make-Creepers-explode-on-death.patch index ef021bf98..0a46a26d1 100644 --- a/patches/server/0156-Config-to-make-Creepers-explode-on-death.patch +++ b/patches/server/0154-Config-to-make-Creepers-explode-on-death.patch @@ -50,7 +50,7 @@ index f6a8d026c2380b9d7ec3121c7e144c6f19f5323c..73b0c8403eca3c26f76e59fc4b057b50 private void spawnLingeringCloud() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index be2353190c4e536d8751db694cf4da3df32a9c33..a25172553626c8e01769d12d8edd801231ac47de 100644 +index e068b364782311c24790e23ecfd67e571d75d3a2..a94219011d920e14355b48d1638a0b612d3cb11c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -809,6 +809,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0157-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch similarity index 98% rename from patches/server/0157-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0155-Configurable-ravager-griefable-blocks-list.patch index be624a7fe..0870863d3 100644 --- a/patches/server/0157-Configurable-ravager-griefable-blocks-list.patch +++ b/patches/server/0155-Configurable-ravager-griefable-blocks-list.patch @@ -31,7 +31,7 @@ index e9087a46e401bc99b73c2cf2731fdac3e68719f8..e054edf9e7c4eef231e155516433c6fa } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a25172553626c8e01769d12d8edd801231ac47de..8e08fc5288e4d6694a701f1cd968d83d5d4570ab 100644 +index a94219011d920e14355b48d1638a0b612d3cb11c..845123a88ded1ca19d28b6a22dbee4bd3b9dcbec 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1580,6 +1580,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-Sneak-to-bulk-process-composter.patch b/patches/server/0156-Sneak-to-bulk-process-composter.patch similarity index 98% rename from patches/server/0158-Sneak-to-bulk-process-composter.patch rename to patches/server/0156-Sneak-to-bulk-process-composter.patch index 0ef2dca9b..097e3abae 100644 --- a/patches/server/0158-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0156-Sneak-to-bulk-process-composter.patch @@ -75,7 +75,7 @@ index fb8b8a9733ac50096d8406487ab1ae167ef5f7b1..16598ca0fd953b6af98dfcdb6716e2e1 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 8e08fc5288e4d6694a701f1cd968d83d5d4570ab..5122b3fa2c0d90c234e9b6eddb6b61762c0a1811 100644 +index 845123a88ded1ca19d28b6a22dbee4bd3b9dcbec..dc036e95b92bf349484f006d22530e0b8516d01a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -474,6 +474,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Config-for-skipping-night.patch b/patches/server/0157-Config-for-skipping-night.patch similarity index 96% rename from patches/server/0159-Config-for-skipping-night.patch rename to patches/server/0157-Config-for-skipping-night.patch index 3b76b3396..1bf71aa2b 100644 --- a/patches/server/0159-Config-for-skipping-night.patch +++ b/patches/server/0157-Config-for-skipping-night.patch @@ -18,7 +18,7 @@ index da197e74b1a7b5831b98628198879dd7fdeff074..359ba71b137eac65a8ba6c1e5eda7041 j = this.levelData.getDayTime() + 24000L; TimeSkipEvent event = new TimeSkipEvent(this.getWorld(), TimeSkipEvent.SkipReason.NIGHT_SKIP, (j - j % 24000L) - this.getDayTime()); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5122b3fa2c0d90c234e9b6eddb6b61762c0a1811..1fc237d657ed93fdd919250494694cab60182c31 100644 +index dc036e95b92bf349484f006d22530e0b8516d01a..2c3114fba8dc6d52cc4f4eef9b350aa93ab266e1 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 { diff --git a/patches/server/0160-Add-config-for-villager-trading.patch b/patches/server/0158-Add-config-for-villager-trading.patch similarity index 89% rename from patches/server/0160-Add-config-for-villager-trading.patch rename to patches/server/0158-Add-config-for-villager-trading.patch index 02d8b8603..c0c50b8ee 100644 --- a/patches/server/0160-Add-config-for-villager-trading.patch +++ b/patches/server/0158-Add-config-for-villager-trading.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config for villager trading diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index b14c2801021bc006bee94abdea83bab1d70791eb..e926e9ab135c7d68d13e384f688b32610b2accdb 100644 +index 91ecd7e9663b2375f2884a9b598dbae18b740838..779e0e0ee72cd2835cda69b49b769c1882a55a66 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -376,7 +376,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -357,7 +357,7 @@ public class Villager extends AbstractVillager implements ReputationEventHandler return tryRide(player, hand); // Purpur } else { if (level.purpurConfig.villagerRidable && itemstack.isEmpty()) return tryRide(player, hand); // Purpur @@ -31,10 +31,10 @@ index e5b78c9d6fb326771d65ea9afd9da38c204922f0..1a8df13b06b1ac5e5a7d63033b4a5326 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 1fc237d657ed93fdd919250494694cab60182c31..9c81e023c80675450bde9598bba9636a2ffff63c 100644 +index 2c3114fba8dc6d52cc4f4eef9b350aa93ab266e1..276abd030cfdec1a41b81ddbc844b3736fe272af 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -1954,6 +1954,7 @@ public class PurpurWorldConfig { +@@ -1952,6 +1952,7 @@ public class PurpurWorldConfig { public boolean villagerClericFarmersThrowWarts = true; public boolean villagerBypassMobGriefing = false; public boolean villagerTakeDamageFromWater = false; @@ -42,7 +42,7 @@ index 1fc237d657ed93fdd919250494694cab60182c31..9c81e023c80675450bde9598bba9636a private void villagerSettings() { villagerRidable = getBoolean("mobs.villager.ridable", villagerRidable); villagerRidableInWater = getBoolean("mobs.villager.ridable-in-water", villagerRidableInWater); -@@ -1982,6 +1983,7 @@ public class PurpurWorldConfig { +@@ -1973,6 +1974,7 @@ public class PurpurWorldConfig { villagerClericFarmersThrowWarts = getBoolean("mobs.villager.cleric-wart-farmers-throw-warts-at-villagers", villagerClericFarmersThrowWarts); villagerBypassMobGriefing = getBoolean("mobs.villager.bypass-mob-griefing", villagerBypassMobGriefing); villagerTakeDamageFromWater = getBoolean("mobs.villager.takes-damage-from-water", villagerTakeDamageFromWater); @@ -50,7 +50,7 @@ index 1fc237d657ed93fdd919250494694cab60182c31..9c81e023c80675450bde9598bba9636a } public boolean vindicatorRidable = false; -@@ -2008,6 +2010,7 @@ public class PurpurWorldConfig { +@@ -1999,6 +2001,7 @@ public class PurpurWorldConfig { public boolean wanderingTraderFollowEmeraldBlock = false; public boolean wanderingTraderCanBeLeashed = false; public boolean wanderingTraderTakeDamageFromWater = false; @@ -58,7 +58,7 @@ index 1fc237d657ed93fdd919250494694cab60182c31..9c81e023c80675450bde9598bba9636a private void wanderingTraderSettings() { wanderingTraderRidable = getBoolean("mobs.wandering_trader.ridable", wanderingTraderRidable); wanderingTraderRidableInWater = getBoolean("mobs.wandering_trader.ridable-in-water", wanderingTraderRidableInWater); -@@ -2020,6 +2023,7 @@ public class PurpurWorldConfig { +@@ -2011,6 +2014,7 @@ public class PurpurWorldConfig { wanderingTraderFollowEmeraldBlock = getBoolean("mobs.wandering_trader.follow-emerald-blocks", wanderingTraderFollowEmeraldBlock); wanderingTraderCanBeLeashed = getBoolean("mobs.wandering_trader.can-be-leashed", wanderingTraderCanBeLeashed); wanderingTraderTakeDamageFromWater = getBoolean("mobs.wandering_trader.takes-damage-from-water", wanderingTraderTakeDamageFromWater); diff --git a/patches/server/0161-Allow-infinity-on-crossbows.patch b/patches/server/0159-Allow-infinity-on-crossbows.patch similarity index 98% rename from patches/server/0161-Allow-infinity-on-crossbows.patch rename to patches/server/0159-Allow-infinity-on-crossbows.patch index f4469d21d..f4da084ae 100644 --- a/patches/server/0161-Allow-infinity-on-crossbows.patch +++ b/patches/server/0159-Allow-infinity-on-crossbows.patch @@ -65,7 +65,7 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757 public abstract boolean canEnchant(Item item); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1e09dc436ce147d42035d48918b811eb7e898c12..8223f12a2457cd3dddff4f77e4fba1406e68889e 100644 +index dcb9394208df25e1d6fcf9bafa31864b37b5db51..5421be4de201bb09a66bf5e1c4ed537838a8f686 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -272,6 +272,7 @@ public class PurpurConfig { diff --git a/patches/server/0162-Drowning-Settings.patch b/patches/server/0160-Drowning-Settings.patch similarity index 97% rename from patches/server/0162-Drowning-Settings.patch rename to patches/server/0160-Drowning-Settings.patch index 7f10f7a6d..e8890145e 100644 --- a/patches/server/0162-Drowning-Settings.patch +++ b/patches/server/0160-Drowning-Settings.patch @@ -49,7 +49,7 @@ index 61c59634533fd3ebe79219ccc9d4e35137f1a2aa..4b88efb67d1d3522c4520e0aa4c8f45c } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9c81e023c80675450bde9598bba9636a2ffff63c..5917714132c541efe941a5b537f0dc079637d71e 100644 +index 276abd030cfdec1a41b81ddbc844b3736fe272af..75cfd4d62bff28829f490b89c5800d17dbfc42c7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -122,6 +122,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Break-individual-slabs-when-sneaking.patch b/patches/server/0161-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0163-Break-individual-slabs-when-sneaking.patch rename to patches/server/0161-Break-individual-slabs-when-sneaking.patch index 5ff4a3b11..dcf5fb092 100644 --- a/patches/server/0163-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0161-Break-individual-slabs-when-sneaking.patch @@ -47,7 +47,7 @@ index 54df5c2987822a727a31be2b3769d39fabb6159a..70b6a65a7d321fc71c98289f09f21cca + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5917714132c541efe941a5b537f0dc079637d71e..13ec3792e727d0da8cadd2c2fc039d737502ebc0 100644 +index 75cfd4d62bff28829f490b89c5800d17dbfc42c7..83d1ac76f93bbba8d07c19cfc0fe67d6861ac491 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -606,6 +606,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 95% rename from patches/server/0164-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch index 8ece0eba0..5d794fb1f 100644 --- a/patches/server/0164-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0162-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -22,7 +22,7 @@ index 457880c9e894a83d88505cf0b7235df919eea591..9c38fdb23853ebdca7b8d904760a3958 return false; } else if (world.getBrightness(LightLayer.BLOCK, pos) > 0) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 13ec3792e727d0da8cadd2c2fc039d737502ebc0..1b06f5ab1d09156798f0a38099751ad5a59d28e1 100644 +index 83d1ac76f93bbba8d07c19cfc0fe67d6861ac491..681ccd22efa6145ac571eef034aeb38dbfc274ee 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -553,8 +553,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0165-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 96% rename from patches/server/0165-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch index 76498695f..524804a8a 100644 --- a/patches/server/0165-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0163-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index e9e24435057cff9c0af758ca2aa822c3b1c3593d..8634431cabae82b71f409f02c84dda2d public ArmorStand(Level world, double x, double y, double z) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 1b06f5ab1d09156798f0a38099751ad5a59d28e1..6f9bcdf1dbf4f9883085413e8a8fe6e9883283ac 100644 +index 681ccd22efa6145ac571eef034aeb38dbfc274ee..87827692b0ea864b7d7d1c79761d2f3436f6d432 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -106,6 +106,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0166-Option-to-make-doors-require-redstone.patch b/patches/server/0164-Option-to-make-doors-require-redstone.patch similarity index 98% rename from patches/server/0166-Option-to-make-doors-require-redstone.patch rename to patches/server/0164-Option-to-make-doors-require-redstone.patch index b8ca156be..44a60673f 100644 --- a/patches/server/0166-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0164-Option-to-make-doors-require-redstone.patch @@ -67,7 +67,7 @@ index 1df52a9c86c01696a8bc9f84a2082387160b3eeb..a4b9c5da133e2e8ad45d447e3f184cb1 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6f9bcdf1dbf4f9883085413e8a8fe6e9883283ac..653796071a19898bc523f84faee9144700da9446 100644 +index 87827692b0ea864b7d7d1c79761d2f3436f6d432..9ae0773835689b308987a72424cb7422aea5b714 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -499,6 +499,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0167-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch similarity index 98% rename from patches/server/0167-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0165-Config-to-allow-for-unsafe-enchants.patch index 4823196bc..a66fdbb56 100644 --- a/patches/server/0167-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0165-Config-to-allow-for-unsafe-enchants.patch @@ -75,7 +75,7 @@ index 7ed8ae3a92d631dcfc155790dbc2fdd4a3e39d1c..03271cdffd99ab443904a5d1da05d79c this.getOrCreateTag().put(key, element); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 8223f12a2457cd3dddff4f77e4fba1406e68889e..6ba0d86496a73f90cfdab9fd6ff871cb6f286a8a 100644 +index 5421be4de201bb09a66bf5e1c4ed537838a8f686..966c699c377f722e4dfb5da3d19831f99563644c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -273,6 +273,7 @@ public class PurpurConfig { diff --git a/patches/server/0168-Configurable-sponge-absorption.patch b/patches/server/0166-Configurable-sponge-absorption.patch similarity index 97% rename from patches/server/0168-Configurable-sponge-absorption.patch rename to patches/server/0166-Configurable-sponge-absorption.patch index 935384175..a56532d2a 100644 --- a/patches/server/0168-Configurable-sponge-absorption.patch +++ b/patches/server/0166-Configurable-sponge-absorption.patch @@ -43,7 +43,7 @@ index 842997ea9f25a05d74a2e8300e44cc39a7e9cd96..97b4e3c0d2b1bbde77b135b8595c3bfa } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 653796071a19898bc523f84faee9144700da9446..33e485ddf6111f1d1e2e0d4f0c680475440f5c9a 100644 +index 9ae0773835689b308987a72424cb7422aea5b714..ee05d89dab1264b3d5d5334bd186c4b6e93fa2c2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -632,6 +632,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0169-Projectile-offset-config.patch b/patches/server/0167-Projectile-offset-config.patch similarity index 99% rename from patches/server/0169-Projectile-offset-config.patch rename to patches/server/0167-Projectile-offset-config.patch index 430c3cbbd..2d2e774a5 100644 --- a/patches/server/0169-Projectile-offset-config.patch +++ b/patches/server/0167-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 5beaafec0759543d3bddf99028c97d0d005be209..086f746cc632a90c67a6c30ea9197c5b entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 33e485ddf6111f1d1e2e0d4f0c680475440f5c9a..71df44447d017357578234b8940f1132084d3819 100644 +index ee05d89dab1264b3d5d5334bd186c4b6e93fa2c2..20d3893b494dc9be2c469df2731e3dd3f6721cb3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -381,6 +381,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Config-for-powered-rail-activation-distance.patch b/patches/server/0168-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0170-Config-for-powered-rail-activation-distance.patch rename to patches/server/0168-Config-for-powered-rail-activation-distance.patch index f548d4519..2e23e742f 100644 --- a/patches/server/0170-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0168-Config-for-powered-rail-activation-distance.patch @@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b } else { int j = pos.getX(); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 71df44447d017357578234b8940f1132084d3819..eccaba73bf3e0af30c984cd7b81ddb25a5a5ffd5 100644 +index 20d3893b494dc9be2c469df2731e3dd3f6721cb3..78b7cca9f505c218446413ee399fe674994fce29 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -644,6 +644,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0171-Piglin-portal-spawn-modifier.patch b/patches/server/0169-Piglin-portal-spawn-modifier.patch similarity index 96% rename from patches/server/0171-Piglin-portal-spawn-modifier.patch rename to patches/server/0169-Piglin-portal-spawn-modifier.patch index 601db6e2b..914bf4b48 100644 --- a/patches/server/0171-Piglin-portal-spawn-modifier.patch +++ b/patches/server/0169-Piglin-portal-spawn-modifier.patch @@ -31,7 +31,7 @@ index b99a9f76d6e400a053c57a96c9586fe09a4a5a26..41caccb63a6e6ce28cb6fc218dcb8fbd pos = pos.below(); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index eccaba73bf3e0af30c984cd7b81ddb25a5a5ffd5..23f9ecf11c695e50b913d65f492112aa9d9e564c 100644 +index 78b7cca9f505c218446413ee399fe674994fce29..acbdab94b72e711541b306424da5a594a284bfa8 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 { diff --git a/patches/server/0172-Config-to-change-max-number-of-bees.patch b/patches/server/0170-Config-to-change-max-number-of-bees.patch similarity index 96% rename from patches/server/0172-Config-to-change-max-number-of-bees.patch rename to patches/server/0170-Config-to-change-max-number-of-bees.patch index 3a98df7d5..4fed6c654 100644 --- a/patches/server/0172-Config-to-change-max-number-of-bees.patch +++ b/patches/server/0170-Config-to-change-max-number-of-bees.patch @@ -18,7 +18,7 @@ index 9fcd835d219aafbe113ebb1b796052e07bf2b046..87ee1d0d51fb54702ae5763c01dba863 public BeehiveBlockEntity(BlockPos pos, BlockState state) { super(BlockEntityType.BEEHIVE, pos, state); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6ba0d86496a73f90cfdab9fd6ff871cb6f286a8a..62e741b78c70fd755c0e083bb510d621d0f3802e 100644 +index 966c699c377f722e4dfb5da3d19831f99563644c..8d207a228855b2a6c0af2e54d815bf17b9217950 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -238,6 +238,7 @@ public class PurpurConfig { diff --git a/patches/server/0173-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch similarity index 97% rename from patches/server/0173-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch index 571ec228e..dd5d8fbbc 100644 --- a/patches/server/0173-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0171-Configurable-damage-settings-for-magma-blocks.patch @@ -31,7 +31,7 @@ index 96b4597101a7f3e98ce30bfc301e8ca1620d0fe4..d7845984b5077cdcd40d652c226d5d60 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 23f9ecf11c695e50b913d65f492112aa9d9e564c..88f7d424e3d3e306d17c7cdba62ae9e5a824385a 100644 +index acbdab94b72e711541b306424da5a594a284bfa8..e8712c180173262821f280ada807dcbaf0d219f3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -613,6 +613,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0174-Config-for-wither-explosion-radius.patch b/patches/server/0172-Config-for-wither-explosion-radius.patch similarity index 91% rename from patches/server/0174-Config-for-wither-explosion-radius.patch rename to patches/server/0172-Config-for-wither-explosion-radius.patch index 4c425476a..c0ce467f5 100644 --- a/patches/server/0174-Config-for-wither-explosion-radius.patch +++ b/patches/server/0172-Config-for-wither-explosion-radius.patch @@ -18,10 +18,10 @@ index a66e9826b8283366cec5adb54f79efee47d9df22..6cf8b12e94c17a8111eef5cc0157e4df if (!event.isCancelled()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 88f7d424e3d3e306d17c7cdba62ae9e5a824385a..7dc249a3aff1d5682f63d3226d7eec368852aaf3 100644 +index e8712c180173262821f280ada807dcbaf0d219f3..a838ed8f2801fd84f5b2ee2984294d5cb1b3dba0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2119,6 +2119,7 @@ public class PurpurWorldConfig { +@@ -2110,6 +2110,7 @@ public class PurpurWorldConfig { public boolean witherBypassMobGriefing = false; public boolean witherTakeDamageFromWater = false; public boolean witherCanRideVehicles = false; @@ -29,7 +29,7 @@ index 88f7d424e3d3e306d17c7cdba62ae9e5a824385a..7dc249a3aff1d5682f63d3226d7eec36 private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2138,6 +2139,7 @@ public class PurpurWorldConfig { +@@ -2129,6 +2130,7 @@ public class PurpurWorldConfig { witherBypassMobGriefing = getBoolean("mobs.wither.bypass-mob-griefing", witherBypassMobGriefing); witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater); witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles); diff --git a/patches/server/0175-Gamemode-extra-permissions.patch b/patches/server/0173-Gamemode-extra-permissions.patch similarity index 98% rename from patches/server/0175-Gamemode-extra-permissions.patch rename to patches/server/0173-Gamemode-extra-permissions.patch index e0005ae6c..4d8338307 100644 --- a/patches/server/0175-Gamemode-extra-permissions.patch +++ b/patches/server/0173-Gamemode-extra-permissions.patch @@ -54,7 +54,7 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002 for(ServerPlayer serverPlayer : targets) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 62e741b78c70fd755c0e083bb510d621d0f3802e..7c108355943d71531ec7a9a997b10dc6959de09b 100644 +index 8d207a228855b2a6c0af2e54d815bf17b9217950..3ad1bb745def01b18c14ce8c7d399cf20a8a1a08 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -221,6 +221,7 @@ public class PurpurConfig { diff --git a/patches/server/0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 96% rename from patches/server/0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index 3ed43e629..60405d3fd 100644 --- a/patches/server/0176-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0174-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch @@ -18,7 +18,7 @@ index e5562b407bba35ab93bf8bc3c22ac9d45e8353cb..c688bb73cd062f36524cfc231cb691f2 if (blockState2 != null && level.getBlockState(blockPos.above()).isAir()) { level.playSound(player, blockPos, SoundEvents.SHOVEL_FLATTEN, SoundSource.BLOCKS, 1.0F, 1.0F); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 7dc249a3aff1d5682f63d3226d7eec368852aaf3..de59e54f2cae97140923b74fc6dc4ec256497740 100644 +index a838ed8f2801fd84f5b2ee2984294d5cb1b3dba0..bb29f18d8b97ac93324534181e356c86a42d3278 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -398,6 +398,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0177-Configurable-piston-push-limit.patch b/patches/server/0175-Configurable-piston-push-limit.patch similarity index 96% rename from patches/server/0177-Configurable-piston-push-limit.patch rename to patches/server/0175-Configurable-piston-push-limit.patch index 4b33f1e9a..558e15ba7 100644 --- a/patches/server/0177-Configurable-piston-push-limit.patch +++ b/patches/server/0175-Configurable-piston-push-limit.patch @@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index de59e54f2cae97140923b74fc6dc4ec256497740..3d938c3a0e9317c698c79e9b0e1a21ca443a7bcf 100644 +index bb29f18d8b97ac93324534181e356c86a42d3278..591225731b03e8a7b43e25514d11db6f914af3e2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -635,6 +635,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0178-Configurable-broadcast-settings.patch b/patches/server/0176-Configurable-broadcast-settings.patch similarity index 97% rename from patches/server/0178-Configurable-broadcast-settings.patch rename to patches/server/0176-Configurable-broadcast-settings.patch index 41a98b78c..415a43959 100644 --- a/patches/server/0178-Configurable-broadcast-settings.patch +++ b/patches/server/0176-Configurable-broadcast-settings.patch @@ -29,7 +29,7 @@ index 0294e31bb7a4346fd9a3b45ef0bed5582b8abfcc..3ad8167804f38262e1e7ecd878fce765 if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) { this.server.getPlayerList().broadcastToTeam(this, ichatbasecomponent); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7c108355943d71531ec7a9a997b10dc6959de09b..4d09b8eb877954537abe5ba165a1e35194443341 100644 +index 3ad1bb745def01b18c14ce8c7d399cf20a8a1a08..f315a6db0c1d2000aa7a506134564b37ff6d2e06 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,6 +178,18 @@ public class PurpurConfig { diff --git a/patches/server/0179-Fix-SPIGOT-6278.patch b/patches/server/0177-Fix-SPIGOT-6278.patch similarity index 100% rename from patches/server/0179-Fix-SPIGOT-6278.patch rename to patches/server/0177-Fix-SPIGOT-6278.patch diff --git a/patches/server/0180-Configurable-mob-blindness.patch b/patches/server/0178-Configurable-mob-blindness.patch similarity index 96% rename from patches/server/0180-Configurable-mob-blindness.patch rename to patches/server/0178-Configurable-mob-blindness.patch index 953f8d54e..f16d5a557 100644 --- a/patches/server/0180-Configurable-mob-blindness.patch +++ b/patches/server/0178-Configurable-mob-blindness.patch @@ -28,7 +28,7 @@ index 4b88efb67d1d3522c4520e0aa4c8f45c95383222..42131cb0ed7346a6c9e466047a8f4a82 return d0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3d938c3a0e9317c698c79e9b0e1a21ca443a7bcf..0bf98389edc28efabc1720973fdc63144f32401a 100644 +index 591225731b03e8a7b43e25514d11db6f914af3e2..5ab2edfc3121a2171c760393f59b8f370fab8005 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -459,6 +459,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0181-Hide-hidden-players-from-entity-selector.patch b/patches/server/0179-Hide-hidden-players-from-entity-selector.patch similarity index 98% rename from patches/server/0181-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0179-Hide-hidden-players-from-entity-selector.patch index d40c883b3..69b4aaab4 100644 --- a/patches/server/0181-Hide-hidden-players-from-entity-selector.patch +++ b/patches/server/0179-Hide-hidden-players-from-entity-selector.patch @@ -59,7 +59,7 @@ index 35cc3bba20afd4a47160cc674415ba6a3a0ec0ec..39c8cb9494aa516a3d828010a8e3329d + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 4d09b8eb877954537abe5ba165a1e35194443341..d9a818087f56237e0f31cf801c421ccc8dd6147e 100644 +index f315a6db0c1d2000aa7a506134564b37ff6d2e06..64c85ed460687ccf455e7ac4332e38ec524bd53c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -234,6 +234,7 @@ public class PurpurConfig { diff --git a/patches/server/0182-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 96% rename from patches/server/0182-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch index 24e06c6a1..4dd2d92c1 100644 --- a/patches/server/0182-Config-for-health-to-impact-Creeper-explosion-radius.patch +++ b/patches/server/0180-Config-for-health-to-impact-Creeper-explosion-radius.patch @@ -21,7 +21,7 @@ index 73b0c8403eca3c26f76e59fc4b057b5029e3f014..b8fa29185266df4f432a010ba229d1a6 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 0bf98389edc28efabc1720973fdc63144f32401a..6046aad3c0fb8ca70ba5f5b1f2ddd7f620aef3b4 100644 +index 5ab2edfc3121a2171c760393f59b8f370fab8005..775831d7852bd688a613aa9c54988b51b36985e3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -905,6 +905,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0183-Iron-golem-poppy-calms-anger.patch b/patches/server/0181-Iron-golem-poppy-calms-anger.patch similarity index 98% rename from patches/server/0183-Iron-golem-poppy-calms-anger.patch rename to patches/server/0181-Iron-golem-poppy-calms-anger.patch index a5e22a5f4..43ce94306 100644 --- a/patches/server/0183-Iron-golem-poppy-calms-anger.patch +++ b/patches/server/0181-Iron-golem-poppy-calms-anger.patch @@ -17,7 +17,7 @@ index c96289cc4bf5731862849f491a2049a41c768eed..efe3839f893eefe241dac14b7796baa2 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 6046aad3c0fb8ca70ba5f5b1f2ddd7f620aef3b4..49f1dc0f6630197ae2c18e11e42d3e525856dc27 100644 +index 775831d7852bd688a613aa9c54988b51b36985e3..424fa41a8db31cc40dd17a21539587773d4fc542 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1316,6 +1316,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0184-Breedable-parrots.patch b/patches/server/0182-Breedable-parrots.patch similarity index 97% rename from patches/server/0184-Breedable-parrots.patch rename to patches/server/0182-Breedable-parrots.patch index 58800a225..958e56cb8 100644 --- a/patches/server/0184-Breedable-parrots.patch +++ b/patches/server/0182-Breedable-parrots.patch @@ -50,7 +50,7 @@ index 953db16af175e14e1a47487659a0346216d8cdbc..5c906b380ad3caceb29fdd5a221cf5ce @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 49f1dc0f6630197ae2c18e11e42d3e525856dc27..c40c1c117444a63c8d3142394b5fe3d56c578b98 100644 +index 424fa41a8db31cc40dd17a21539587773d4fc542..564a2009f21e7caf36130e29bab28a27fd012ebf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1466,6 +1466,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0185-Configurable-powered-rail-boost-modifier.patch b/patches/server/0183-Configurable-powered-rail-boost-modifier.patch similarity index 96% rename from patches/server/0185-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0183-Configurable-powered-rail-boost-modifier.patch index 8b71b5cf3..66a34e354 100644 --- a/patches/server/0185-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0183-Configurable-powered-rail-boost-modifier.patch @@ -18,7 +18,7 @@ index 6b58b32711b3aba9b7de9e7dee6d02073dad3b7f..0e6f2d1d48910c573ec2237002a02f33 Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c40c1c117444a63c8d3142394b5fe3d56c578b98..26751dbb5005551bbab2165a7023d6370cd9e13f 100644 +index 564a2009f21e7caf36130e29bab28a27fd012ebf..b8b9c307b23ed49e7d21798aa9125e7b64edf200 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -227,6 +227,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0186-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch similarity index 95% rename from patches/server/0186-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch index 05e978818..a02be608e 100644 --- a/patches/server/0186-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0184-Add-config-change-multiplier-critical-damage-value.patch @@ -18,7 +18,7 @@ index 0a8c8a24af17262be3e656042dc5c8bce9364e8a..c7fbd149cc3a12f438b1dfaffba56627 f += f1; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 26751dbb5005551bbab2165a7023d6370cd9e13f..4c407af833293bc1b9281c24325a994cc4110a18 100644 +index b8b9c307b23ed49e7d21798aa9125e7b64edf200..aac7e91c5d6e4d9dc2b1b131ac3cd4f4a07a493f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -326,6 +326,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0187-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch similarity index 95% rename from patches/server/0187-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch index 2a8a2cd98..bf11a1bf7 100644 --- a/patches/server/0187-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0185-Option-to-disable-dragon-egg-teleporting.patch @@ -19,7 +19,7 @@ index 7e1edcc7b9f170b7c649437c2f0dd78c0bab9be4..5f8ac1fdac2c334951261f2b9702f5e7 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 4c407af833293bc1b9281c24325a994cc4110a18..3eee86a996fac73b5fbab42621a909a3f95fcc33 100644 +index aac7e91c5d6e4d9dc2b1b131ac3cd4f4a07a493f..74309929b9bbac31be89d3ddf6774dcbec4f7ded 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -547,6 +547,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0188-Config-for-unverified-username-message.patch b/patches/server/0186-Config-for-unverified-username-message.patch similarity index 97% rename from patches/server/0188-Config-for-unverified-username-message.patch rename to patches/server/0186-Config-for-unverified-username-message.patch index ae6f6ca95..9c9b75ea8 100644 --- a/patches/server/0188-Config-for-unverified-username-message.patch +++ b/patches/server/0186-Config-for-unverified-username-message.patch @@ -18,7 +18,7 @@ index 33a29890435d6065a2cc4f8e8bf8209c01d5d114..09f2eb149e23b271bab879b84c7910d7 } } catch (AuthenticationUnavailableException authenticationunavailableexception) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d9a818087f56237e0f31cf801c421ccc8dd6147e..cfce295c9dda1a558b19f8fdf4969c24f0d9f643 100644 +index 64c85ed460687ccf455e7ac4332e38ec524bd53c..aed55fe54e153b3c8f5181e39e712a457a00c37b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { diff --git a/patches/server/0189-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch similarity index 95% rename from patches/server/0189-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0187-Make-anvil-cumulative-cost-configurable.patch index 3e9d64c67..878bcb3f6 100644 --- a/patches/server/0189-Make-anvil-cumulative-cost-configurable.patch +++ b/patches/server/0187-Make-anvil-cumulative-cost-configurable.patch @@ -18,7 +18,7 @@ index ae7ff760a84620562b2b6b0d1d0fd2f94a09024a..ca0ac66e79a8236fce84a448e6e24a1d public void setItemName(String newItemName) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index cfce295c9dda1a558b19f8fdf4969c24f0d9f643..197ceea9fa314ebe1d0af4eeeeb4926a79a08954 100644 +index aed55fe54e153b3c8f5181e39e712a457a00c37b..370c1ae524fab837ddcef2419064c5a042a0892a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -257,6 +257,7 @@ public class PurpurConfig { diff --git a/patches/server/0190-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch similarity index 97% rename from patches/server/0190-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0188-ShulkerBox-allow-oversized-stacks.patch index 1d8d07f26..f34ff1d31 100644 --- a/patches/server/0190-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0188-ShulkerBox-allow-oversized-stacks.patch @@ -35,7 +35,7 @@ index 7f1230d915c98b6f30b13a06c2788bc2f7b7e912..9439119a70a411b1a7d9cd6a0090e413 blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3eee86a996fac73b5fbab42621a909a3f95fcc33..33749149d250185382d5b543b78f6fb47138e527 100644 +index 74309929b9bbac31be89d3ddf6774dcbec4f7ded..53c1c12316dc0892b55fbbcce6933be3b378fd4a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -672,6 +672,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0191-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch similarity index 97% rename from patches/server/0191-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0189-Bee-can-work-when-raining-or-at-night.patch index 172a6f8f3..7cf371141 100644 --- a/patches/server/0191-Bee-can-work-when-raining-or-at-night.patch +++ b/patches/server/0189-Bee-can-work-when-raining-or-at-night.patch @@ -31,7 +31,7 @@ index 87ee1d0d51fb54702ae5763c01dba8632b2234e3..60dbc5c30e928cf00ed58e8fcbc45153 return false; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 33749149d250185382d5b543b78f6fb47138e527..c25baa810786bedd5623041a65d1783c56a28d65 100644 +index 53c1c12316dc0892b55fbbcce6933be3b378fd4a..48b74a3c27ee04bae72153d140f90afab029cf15 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -779,6 +779,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0192-API-for-any-mob-to-burn-daylight.patch b/patches/server/0190-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0192-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0190-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0193-Fix-advancement-triggers-on-entity-death.patch b/patches/server/0191-Fix-advancement-triggers-on-entity-death.patch similarity index 100% rename from patches/server/0193-Fix-advancement-triggers-on-entity-death.patch rename to patches/server/0191-Fix-advancement-triggers-on-entity-death.patch diff --git a/patches/server/0194-Config-MobEffect-by-world.patch b/patches/server/0192-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0194-Config-MobEffect-by-world.patch rename to patches/server/0192-Config-MobEffect-by-world.patch index c4a8b1d83..3b0bde905 100644 --- a/patches/server/0194-Config-MobEffect-by-world.patch +++ b/patches/server/0192-Config-MobEffect-by-world.patch @@ -40,7 +40,7 @@ index 8bbb9bdcf95989f1737714655f6f6a269d46d7f2..8d569eb2ec1b2bdbd415094ae04ae531 ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c25baa810786bedd5623041a65d1783c56a28d65..9a52f8bd0e4f828612693cceba9e00327410c33f 100644 +index 48b74a3c27ee04bae72153d140f90afab029cf15..8558521fd931b67e7d4d95dada696658c2b69c93 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -283,6 +283,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0195-Beacon-Activation-Range-Configurable.patch b/patches/server/0193-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0195-Beacon-Activation-Range-Configurable.patch rename to patches/server/0193-Beacon-Activation-Range-Configurable.patch index c437f5e75..4cfcbd725 100644 --- a/patches/server/0195-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0193-Beacon-Activation-Range-Configurable.patch @@ -26,7 +26,7 @@ index 423560afba1bc03c0bb2b7d5d028451f34e59ec5..080694a06c9fdf57317dd281c4ddbd6c } else { return effectRange; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 9a52f8bd0e4f828612693cceba9e00327410c33f..d036b6fdb6230f36f4cc1058e6c8e3c427b71fbe 100644 +index 8558521fd931b67e7d4d95dada696658c2b69c93..f572a6816203216ed102cb04bd88b3d708389f5c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -512,6 +512,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0196-Add-toggle-for-sand-duping-fix.patch b/patches/server/0194-Add-toggle-for-sand-duping-fix.patch similarity index 95% rename from patches/server/0196-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0194-Add-toggle-for-sand-duping-fix.patch index bbf687ad4..33e744e22 100644 --- a/patches/server/0196-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0194-Add-toggle-for-sand-duping-fix.patch @@ -27,7 +27,7 @@ index 0c94b4cb6ee0c3dffe0b67a2291d0160ae0ef96f..92a9869dbabcaa704a0da8bc86f75786 } // 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 d036b6fdb6230f36f4cc1058e6c8e3c427b71fbe..9d21797f8dfb248fbdd4e96abd1fd9fec4c1cece 100644 +index f572a6816203216ed102cb04bd88b3d708389f5c..981ffd0b8cb204dd64fbc70c6fe3b88e389354cc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -698,6 +698,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0197-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0197-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch index 8b30fa1b2..bfac41717 100644 --- a/patches/server/0197-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0195-Add-toggle-for-end-portal-safe-teleporting.patch @@ -45,7 +45,7 @@ index 46fdaf744080ac01498ca693068616659a79b9ea..ca33161a9a2516031c942282fe26f970 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 9d21797f8dfb248fbdd4e96abd1fd9fec4c1cece..5c105cd3ea40bb0bf885ef2ef011fdc2a36ae991 100644 +index 981ffd0b8cb204dd64fbc70c6fe3b88e389354cc..862eb9df819143317e949fcc902f0f1736c225d0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -633,6 +633,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0198-Flying-Fall-Damage-API.patch b/patches/server/0196-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/server/0198-Flying-Fall-Damage-API.patch rename to patches/server/0196-Flying-Fall-Damage-API.patch diff --git a/patches/server/0199-Make-lightning-rod-range-configurable.patch b/patches/server/0197-Make-lightning-rod-range-configurable.patch similarity index 96% rename from patches/server/0199-Make-lightning-rod-range-configurable.patch rename to patches/server/0197-Make-lightning-rod-range-configurable.patch index ff041e1b2..3364ddb0b 100644 --- a/patches/server/0199-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0197-Make-lightning-rod-range-configurable.patch @@ -18,7 +18,7 @@ index 359ba71b137eac65a8ba6c1e5eda70412eb3550f..a77f715b395c782095df711f22e47f9d return optional.map((blockposition1) -> { return blockposition1.above(1); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 197ceea9fa314ebe1d0af4eeeeb4926a79a08954..942c45e53e3458271bd2e8e2a86e5b31e2de90d3 100644 +index 370c1ae524fab837ddcef2419064c5a042a0892a..18b56ce771b5a32364adffed172a12f68790c475 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -258,6 +258,7 @@ public class PurpurConfig { diff --git a/patches/server/0200-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 97% rename from patches/server/0200-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch index 29f9f040c..83b714d88 100644 --- a/patches/server/0200-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0198-Burp-after-eating-food-fills-hunger-bar-completely.patch @@ -55,7 +55,7 @@ index 2934b6de1f1fb914a532ee20184df99d1acd8e65..65421cfff05c0493f5fef1bdff03172c public void eat(Item item, ItemStack stack) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5c105cd3ea40bb0bf885ef2ef011fdc2a36ae991..99729bfedc471fb7a4ecc643f8f3634976743ff7 100644 +index 862eb9df819143317e949fcc902f0f1736c225d0..2dc6b2f723f08d633898f9e982c9fb09a0c4c110 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -342,6 +342,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0201-Allow-player-join-full-server-by-permission.patch b/patches/server/0199-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0201-Allow-player-join-full-server-by-permission.patch rename to patches/server/0199-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0202-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0200-Add-permission-bypass-for-portal-waiting.patch similarity index 100% rename from patches/server/0202-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0200-Add-permission-bypass-for-portal-waiting.patch diff --git a/patches/server/0203-Shulker-spawn-from-bullet-options.patch b/patches/server/0201-Shulker-spawn-from-bullet-options.patch similarity index 98% rename from patches/server/0203-Shulker-spawn-from-bullet-options.patch rename to patches/server/0201-Shulker-spawn-from-bullet-options.patch index ce55037fe..28dd1fbe2 100644 --- a/patches/server/0203-Shulker-spawn-from-bullet-options.patch +++ b/patches/server/0201-Shulker-spawn-from-bullet-options.patch @@ -61,7 +61,7 @@ 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 99729bfedc471fb7a4ecc643f8f3634976743ff7..57a0ec23fd15b4a3ba48d8d294d6d95d96c193e1 100644 +index 2dc6b2f723f08d633898f9e982c9fb09a0c4c110..3312036449d0c28b5ee04abce13f8db2576cd017 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1808,6 +1808,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0204-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch similarity index 97% rename from patches/server/0204-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0202-Eating-glow-berries-adds-glow-effect.patch index 74f06d388..78892ba97 100644 --- a/patches/server/0204-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0202-Eating-glow-berries-adds-glow-effect.patch @@ -18,7 +18,7 @@ index 68321b5e425c0500a5691f80203176122cc1bff4..e42f48112725729a9f0c135d2879cfaa public static final Item SOUL_CAMPFIRE = registerBlock(Blocks.SOUL_CAMPFIRE, CreativeModeTab.TAB_DECORATIONS); public static final Item SHROOMLIGHT = registerBlock(Blocks.SHROOMLIGHT, CreativeModeTab.TAB_DECORATIONS); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 57a0ec23fd15b4a3ba48d8d294d6d95d96c193e1..237bd7b905edf96e81c8569cdd90bc36aff8895e 100644 +index 3312036449d0c28b5ee04abce13f8db2576cd017..fb13ffdb5d8bfb296fd10a5bc8e84bbbb309e4bb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -174,6 +174,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0205-Option-to-make-drowned-break-doors.patch b/patches/server/0203-Option-to-make-drowned-break-doors.patch similarity index 97% rename from patches/server/0205-Option-to-make-drowned-break-doors.patch rename to patches/server/0203-Option-to-make-drowned-break-doors.patch index aa67a556d..048e322f3 100644 --- a/patches/server/0205-Option-to-make-drowned-break-doors.patch +++ b/patches/server/0203-Option-to-make-drowned-break-doors.patch @@ -34,7 +34,7 @@ index bd209089f0730674f811d96bdbe7915d6a857729..ddc38e57ae551f4954c8da884648c5ae @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 237bd7b905edf96e81c8569cdd90bc36aff8895e..10dbb62f8b846229e6a03751dff43846f6e0d333 100644 +index fb13ffdb5d8bfb296fd10a5bc8e84bbbb309e4bb..92bc2ac4e9ac2a812d8523a1f35e5f865b5fb7c7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1039,6 +1039,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0206-Configurable-hunger-starvation-damage.patch b/patches/server/0204-Configurable-hunger-starvation-damage.patch similarity index 92% rename from patches/server/0206-Configurable-hunger-starvation-damage.patch rename to patches/server/0204-Configurable-hunger-starvation-damage.patch index d5e53a828..381c384f9 100644 --- a/patches/server/0206-Configurable-hunger-starvation-damage.patch +++ b/patches/server/0204-Configurable-hunger-starvation-damage.patch @@ -18,10 +18,10 @@ index 65421cfff05c0493f5fef1bdff03172c9e33f33e..63584faeec4e5013be7a377e3203ec16 this.tickTimer = 0; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 10dbb62f8b846229e6a03751dff43846f6e0d333..e42f9dda65ae6617955b837c15e75299e7a09797 100644 +index 92bc2ac4e9ac2a812d8523a1f35e5f865b5fb7c7..6da884ad810dc1badcf16850e96ce25d3da72e04 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2406,4 +2406,9 @@ public class PurpurWorldConfig { +@@ -2397,4 +2397,9 @@ public class PurpurWorldConfig { zombifiedPiglinCountAsPlayerKillWhenAngry = getBoolean("mobs.zombified_piglin.count-as-player-kill-when-angry", zombifiedPiglinCountAsPlayerKillWhenAngry); zombifiedPiglinTakeDamageFromWater = getBoolean("mobs.zombified_piglin.takes-damage-from-water", zombifiedPiglinTakeDamageFromWater); } diff --git a/patches/server/0207-Redirect-System.out-calls-to-plugin-loggers.patch b/patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch similarity index 100% rename from patches/server/0207-Redirect-System.out-calls-to-plugin-loggers.patch rename to patches/server/0205-Redirect-System.out-calls-to-plugin-loggers.patch diff --git a/patches/server/0208-Armor-click-equip-options.patch b/patches/server/0206-Armor-click-equip-options.patch similarity index 98% rename from patches/server/0208-Armor-click-equip-options.patch rename to patches/server/0206-Armor-click-equip-options.patch index fe2bd7b0d..73179a6d4 100644 --- a/patches/server/0208-Armor-click-equip-options.patch +++ b/patches/server/0206-Armor-click-equip-options.patch @@ -58,7 +58,7 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2 return InteractionResultHolder.fail(itemStack); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e42f9dda65ae6617955b837c15e75299e7a09797..3cb01e3e71f5bcb5bae1169e049712d0eef25b4a 100644 +index 6da884ad810dc1badcf16850e96ce25d3da72e04..4307430bc0074a9061a40415019341926fd685fa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -345,6 +345,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0209-Add-uptime-command.patch b/patches/server/0207-Add-uptime-command.patch similarity index 98% rename from patches/server/0209-Add-uptime-command.patch rename to patches/server/0207-Add-uptime-command.patch index d4ae6fdee..3c2e1eff0 100644 --- a/patches/server/0209-Add-uptime-command.patch +++ b/patches/server/0207-Add-uptime-command.patch @@ -29,7 +29,7 @@ index e35b469133dc8bdac02e97f8d0792690e568e31c..cfb6a133d8edda91d97eeba0ce911c58 public int autosavePeriod; public Commands vanillaCommandDispatcher; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 942c45e53e3458271bd2e8e2a86e5b31e2de90d3..fc6c0717aa13d4bdc28ba1fa2ae5e4a9be87aa18 100644 +index 18b56ce771b5a32364adffed172a12f68790c475..c419af801e31bec057b04131ca5634aad19b343e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -166,6 +166,7 @@ public class PurpurConfig { diff --git a/patches/server/0210-Structure-seed-options.patch b/patches/server/0208-Structure-seed-options.patch similarity index 97% rename from patches/server/0210-Structure-seed-options.patch rename to patches/server/0208-Structure-seed-options.patch index 1b1b29cae..564e72c99 100644 --- a/patches/server/0210-Structure-seed-options.patch +++ b/patches/server/0208-Structure-seed-options.patch @@ -33,7 +33,7 @@ index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76ef updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed)); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index fc6c0717aa13d4bdc28ba1fa2ae5e4a9be87aa18..a68f8efb7ad6de35d9703417cc6d65c7b99efa23 100644 +index c419af801e31bec057b04131ca5634aad19b343e..51283ec0bd1903c0eb3c04c7ed90785795c39311 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -194,6 +194,17 @@ public class PurpurConfig { diff --git a/patches/server/0211-Tool-actionable-options.patch b/patches/server/0209-Tool-actionable-options.patch similarity index 99% rename from patches/server/0211-Tool-actionable-options.patch rename to patches/server/0209-Tool-actionable-options.patch index 7f82e82bf..11bd92ae3 100644 --- a/patches/server/0211-Tool-actionable-options.patch +++ b/patches/server/0209-Tool-actionable-options.patch @@ -109,7 +109,7 @@ index a5c2d6f0c0850a99224a1a8d622fe6b341cee88b..d8777ab86465e25236e7abbafd7ff668 return InteractionResult.PASS; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 3cb01e3e71f5bcb5bae1169e049712d0eef25b4a..cf7312c57c2b4c4f32b18653d01c51a3adda685c 100644 +index 4307430bc0074a9061a40415019341926fd685fa..7c945107ada60079ddf9cb9d51390b5a11b21e98 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -472,6 +472,153 @@ public class PurpurWorldConfig { diff --git a/patches/server/0212-Store-placer-on-Block-when-placed.patch b/patches/server/0210-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0212-Store-placer-on-Block-when-placed.patch rename to patches/server/0210-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0213-Summoner-API.patch b/patches/server/0211-Summoner-API.patch similarity index 100% rename from patches/server/0213-Summoner-API.patch rename to patches/server/0211-Summoner-API.patch diff --git a/patches/server/0214-Customizable-sleeping-actionbar-messages.patch b/patches/server/0212-Customizable-sleeping-actionbar-messages.patch similarity index 97% rename from patches/server/0214-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0212-Customizable-sleeping-actionbar-messages.patch index 75a99e6f3..b9cfe7771 100644 --- a/patches/server/0214-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0212-Customizable-sleeping-actionbar-messages.patch @@ -40,7 +40,7 @@ index a77f715b395c782095df711f22e47f9d07f844af..dfbab7b451656db88e1a7d3a6bf40763 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index a68f8efb7ad6de35d9703417cc6d65c7b99efa23..151f3022a190a30da60b2ea60ee925ecca8a4b4a 100644 +index 51283ec0bd1903c0eb3c04c7ed90785795c39311..00f3e7b110f38572bb2121b6f2e14e2584f4f60c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -168,6 +168,8 @@ public class PurpurConfig { diff --git a/patches/server/0215-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 96% rename from patches/server/0215-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch index 53b126fc6..351828439 100644 --- a/patches/server/0215-option-to-disable-shulker-box-items-from-dropping-co.patch +++ b/patches/server/0213-option-to-disable-shulker-box-items-from-dropping-co.patch @@ -19,7 +19,7 @@ index 8175bb6331727440da2232998bdad068a1c47ae8..be47543240bd573cd2cc08f84b7eab1c CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index cf7312c57c2b4c4f32b18653d01c51a3adda685c..8ad177ee6aa178aacaa264fbf2863b8725280fee 100644 +index 7c945107ada60079ddf9cb9d51390b5a11b21e98..c867e1e9aff703f54cfa614c6ad4ac0eadfc9dc9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -175,6 +175,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0216-Silk-touchable-budding-amethyst.patch b/patches/server/0214-Silk-touchable-budding-amethyst.patch similarity index 95% rename from patches/server/0216-Silk-touchable-budding-amethyst.patch rename to patches/server/0214-Silk-touchable-budding-amethyst.patch index 5281989ba..c4f3e3057 100644 --- a/patches/server/0216-Silk-touchable-budding-amethyst.patch +++ b/patches/server/0214-Silk-touchable-budding-amethyst.patch @@ -24,7 +24,7 @@ index 02fc3ede12eadbf72e26e31b1c475c7f5b2ad73a..2288e727929ffb3a3bca138fb0289408 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8ad177ee6aa178aacaa264fbf2863b8725280fee..c9a588e78593db11cb33da5d57d40d590445af24 100644 +index c867e1e9aff703f54cfa614c6ad4ac0eadfc9dc9..21c80f579ba9826a330bc3a4ac0136862626d8ca 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -696,6 +696,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0217-Big-dripleaf-tilt-delay.patch b/patches/server/0215-Big-dripleaf-tilt-delay.patch similarity index 96% rename from patches/server/0217-Big-dripleaf-tilt-delay.patch rename to patches/server/0215-Big-dripleaf-tilt-delay.patch index c9774c438..6531d996f 100644 --- a/patches/server/0217-Big-dripleaf-tilt-delay.patch +++ b/patches/server/0215-Big-dripleaf-tilt-delay.patch @@ -24,7 +24,7 @@ index 3f434ac77611a81889b15c118a0fca57cc10a6bb..36d65d85d3cc030551fc0957c1ebbff6 if (i != -1) { world.scheduleTick(blockposition, (Block) this, i); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c9a588e78593db11cb33da5d57d40d590445af24..4de70b801eabc74963de8e4a99b8eb6cb81bd432 100644 +index 21c80f579ba9826a330bc3a4ac0136862626d8ca..df502d2a8c5bfacceec410441c193e77e2c97d8e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -696,6 +696,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0218-Player-ridable-in-water-option.patch b/patches/server/0216-Player-ridable-in-water-option.patch similarity index 96% rename from patches/server/0218-Player-ridable-in-water-option.patch rename to patches/server/0216-Player-ridable-in-water-option.patch index 95ba430b9..86a45d804 100644 --- a/patches/server/0218-Player-ridable-in-water-option.patch +++ b/patches/server/0216-Player-ridable-in-water-option.patch @@ -21,7 +21,7 @@ index f9247644e528415388911f22ac1833c678947d37..0aec0e4760f0ea0188a0b5c90a9c5526 if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) { if (this.getShoulderEntityLeft().isEmpty()) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 4de70b801eabc74963de8e4a99b8eb6cb81bd432..231f23e44a7f6fb03a1a56b51b5331998a3cbac0 100644 +index df502d2a8c5bfacceec410441c193e77e2c97d8e..b28c15180fff218381fbeccc505ed9f04d08e03f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -349,6 +349,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch similarity index 96% rename from patches/server/0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch rename to patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch index ae9782950..6f41d00e2 100644 --- a/patches/server/0219-Config-to-disable-Enderman-teleport-on-projectile-hi.patch +++ b/patches/server/0217-Config-to-disable-Enderman-teleport-on-projectile-hi.patch @@ -18,7 +18,7 @@ index 13cdfb0175152d2ba203c01f14f2f98d87f812b3..152a4c88fb714e40010b7eaedff03216 boolean flag; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 231f23e44a7f6fb03a1a56b51b5331998a3cbac0..818fdec71514ef6e9ab4bb95a45a2a04213ed10a 100644 +index b28c15180fff218381fbeccc505ed9f04d08e03f..5f0b1e2b014a1340583c5a1c9d0c8d932d31dcbf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1286,6 +1286,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0220-Add-compass-command.patch b/patches/server/0218-Add-compass-command.patch similarity index 98% rename from patches/server/0220-Add-compass-command.patch rename to patches/server/0218-Add-compass-command.patch index 73f557507..522f3b724 100644 --- a/patches/server/0220-Add-compass-command.patch +++ b/patches/server/0218-Add-compass-command.patch @@ -81,7 +81,7 @@ index 9d541c9e53f3f8db871f01f8d083e4cfc0de0de1..046bf9cbf02b002e89f7d39b616dd0f5 CompoundTag compoundTag = stack.getOrCreateTag(); if (compoundTag.contains("LodestoneTracked") && !compoundTag.getBoolean("LodestoneTracked")) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 151f3022a190a30da60b2ea60ee925ecca8a4b4a..82c7694de79094f4d944cdaba8d06572147dfd34 100644 +index 00f3e7b110f38572bb2121b6f2e14e2584f4f60c..ffc1c2bf3cc6a892a073acb7d873084e3aaa7067 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -252,6 +252,11 @@ public class PurpurConfig { @@ -111,7 +111,7 @@ index 151f3022a190a30da60b2ea60ee925ecca8a4b4a..82c7694de79094f4d944cdaba8d06572 hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector); uptimeFormat = getString("settings.command.uptime.format", uptimeFormat); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 818fdec71514ef6e9ab4bb95a45a2a04213ed10a..703ba5c14c6940b5263d4d7e2bcbc8a6c20f4930 100644 +index 5f0b1e2b014a1340583c5a1c9d0c8d932d31dcbf..37c96672f890b32892ba8eeac25baab714a3d095 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -176,6 +176,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0221-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch similarity index 96% rename from patches/server/0221-Config-to-prevent-horses-from-standing-with-riders.patch rename to patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch index 9063c540e..bf0529941 100644 --- a/patches/server/0221-Config-to-prevent-horses-from-standing-with-riders.patch +++ b/patches/server/0219-Config-to-prevent-horses-from-standing-with-riders.patch @@ -20,7 +20,7 @@ index 56694c9918ab2e8d0ff5cfda6d60360b0cd16674..c9daf65ce500e29ce8f73d1ec6379fc2 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 703ba5c14c6940b5263d4d7e2bcbc8a6c20f4930..5579c2397c766dd70bd7495c9f69fb8889b88885 100644 +index 37c96672f890b32892ba8eeac25baab714a3d095..1543d6e375246190777e85f1e097e93b187c3edc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1484,6 +1484,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0222-Toggle-for-kinetic-damage.patch b/patches/server/0220-Toggle-for-kinetic-damage.patch similarity index 96% rename from patches/server/0222-Toggle-for-kinetic-damage.patch rename to patches/server/0220-Toggle-for-kinetic-damage.patch index 549f6e062..ae8dd9de6 100644 --- a/patches/server/0222-Toggle-for-kinetic-damage.patch +++ b/patches/server/0220-Toggle-for-kinetic-damage.patch @@ -22,7 +22,7 @@ index 8f15148dc81c5370f19edb77b6412c3f97741a0a..0f395aa8e471f724617b391501cdd2f3 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 5579c2397c766dd70bd7495c9f69fb8889b88885..33ba7fd8ad1f161cd62a64b92b81b0da704e164e 100644 +index 1543d6e375246190777e85f1e097e93b187c3edc..f12c97db301e3f5e9fc32232657a99b67e37c53b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -138,12 +138,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0223-Add-Option-for-disable-observer-clocks.patch b/patches/server/0221-Add-Option-for-disable-observer-clocks.patch similarity index 95% rename from patches/server/0223-Add-Option-for-disable-observer-clocks.patch rename to patches/server/0221-Add-Option-for-disable-observer-clocks.patch index 6f25d3c4c..12f3a1d2f 100644 --- a/patches/server/0223-Add-Option-for-disable-observer-clocks.patch +++ b/patches/server/0221-Add-Option-for-disable-observer-clocks.patch @@ -18,7 +18,7 @@ index 4a34a08a1d46e4d3020644a51d9e30a36a18791a..be28b5aba28383058548cfb68f982664 } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 33ba7fd8ad1f161cd62a64b92b81b0da704e164e..a50ad57f231253c356fab8c6601484bf05a8ae4a 100644 +index f12c97db301e3f5e9fc32232657a99b67e37c53b..e75dea055def35968285ab258729c387d427771d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -321,6 +321,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0224-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch similarity index 92% rename from patches/server/0224-Customizeable-Zombie-Villager-curing-times.patch rename to patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch index 5dc058801..6576bac5f 100644 --- a/patches/server/0224-Customizeable-Zombie-Villager-curing-times.patch +++ b/patches/server/0222-Customizeable-Zombie-Villager-curing-times.patch @@ -18,10 +18,10 @@ index 96e5d1210e27b0bca7a354366e5c805709ae4fec..c6ba41c2b4cc96bc97ed2e2220c0f3fa this.gameEvent(GameEvent.MOB_INTERACT, this.eyeBlockPosition()); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a50ad57f231253c356fab8c6601484bf05a8ae4a..8161ae94098fde3092ff06f6cc7440f00b8be6e3 100644 +index e75dea055def35968285ab258729c387d427771d..9e9ab8f2a93bba600f5dede7502835e521d33c8c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2554,6 +2554,8 @@ public class PurpurWorldConfig { +@@ -2545,6 +2545,8 @@ public class PurpurWorldConfig { public double zombieVillagerJockeyChance = 0.05D; public boolean zombieVillagerJockeyTryExistingChickens = true; public boolean zombieVillagerTakeDamageFromWater = false; @@ -30,7 +30,7 @@ index a50ad57f231253c356fab8c6601484bf05a8ae4a..8161ae94098fde3092ff06f6cc7440f0 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -2568,6 +2570,8 @@ public class PurpurWorldConfig { +@@ -2559,6 +2561,8 @@ public class PurpurWorldConfig { zombieVillagerJockeyChance = getDouble("mobs.zombie_villager.jockey.chance", zombieVillagerJockeyChance); zombieVillagerJockeyTryExistingChickens = getBoolean("mobs.zombie_villager.jockey.try-existing-chickens", zombieVillagerJockeyTryExistingChickens); zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater); diff --git a/patches/server/0225-Option-for-sponges-to-work-on-lava.patch b/patches/server/0223-Option-for-sponges-to-work-on-lava.patch similarity index 95% rename from patches/server/0225-Option-for-sponges-to-work-on-lava.patch rename to patches/server/0223-Option-for-sponges-to-work-on-lava.patch index b33df20b4..c1b705f2c 100644 --- a/patches/server/0225-Option-for-sponges-to-work-on-lava.patch +++ b/patches/server/0223-Option-for-sponges-to-work-on-lava.patch @@ -18,7 +18,7 @@ index 97b4e3c0d2b1bbde77b135b8595c3bfa190a14cb..02b98cfe47d5d2f3c362a84c6b05e734 ++i; if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8161ae94098fde3092ff06f6cc7440f00b8be6e3..65e2b415c7c6801f815cd55b5c27dafaab97d410 100644 +index 9e9ab8f2a93bba600f5dede7502835e521d33c8c..f34480af918082f692038c051a713fda62d7faeb 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -924,9 +924,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0226-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch similarity index 92% rename from patches/server/0226-Toggle-for-Wither-s-spawn-sound.patch rename to patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch index 42d4ec4b1..58dff68c4 100644 --- a/patches/server/0226-Toggle-for-Wither-s-spawn-sound.patch +++ b/patches/server/0224-Toggle-for-Wither-s-spawn-sound.patch @@ -18,10 +18,10 @@ index 2943342e6dddc3b89411b7a6548d56b69a201d25..5ca3d7dfadb213530739863571fa6caf // this.world.globalLevelEvent(1023, new BlockPosition(this), 0); //int viewDistance = ((ServerLevel) this.level).getCraftServer().getViewDistance() * 16; // Paper - updated to use worlds actual view distance incase we have to uncomment this due to removal of player view distance API diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 65e2b415c7c6801f815cd55b5c27dafaab97d410..2ac4f9349cb4f8bcf91717b0b989612bd25704d7 100644 +index f34480af918082f692038c051a713fda62d7faeb..2b65e68b5b0fdbe73a5d9082a1d6b9e6093adbcf 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2409,6 +2409,7 @@ public class PurpurWorldConfig { +@@ -2400,6 +2400,7 @@ public class PurpurWorldConfig { public boolean witherTakeDamageFromWater = false; public boolean witherCanRideVehicles = false; public float witherExplosionRadius = 1.0F; @@ -29,7 +29,7 @@ index 65e2b415c7c6801f815cd55b5c27dafaab97d410..2ac4f9349cb4f8bcf91717b0b989612b private void witherSettings() { witherRidable = getBoolean("mobs.wither.ridable", witherRidable); witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater); -@@ -2429,6 +2430,7 @@ public class PurpurWorldConfig { +@@ -2420,6 +2421,7 @@ public class PurpurWorldConfig { witherTakeDamageFromWater = getBoolean("mobs.wither.takes-damage-from-water", witherTakeDamageFromWater); witherCanRideVehicles = getBoolean("mobs.wither.can-ride-vehicles", witherCanRideVehicles); witherExplosionRadius = (float) getDouble("mobs.wither.explosion-radius", witherExplosionRadius); diff --git a/patches/server/0227-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch similarity index 95% rename from patches/server/0227-Cactus-breaks-from-solid-neighbors-config.patch rename to patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch index b22dc37f3..07994f034 100644 --- a/patches/server/0227-Cactus-breaks-from-solid-neighbors-config.patch +++ b/patches/server/0225-Cactus-breaks-from-solid-neighbors-config.patch @@ -18,7 +18,7 @@ index fa36ad3bb63764778aa7201d90e331e64292c7b4..dfa06b3c7323aeb12b1e234ca27c924a return false; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 2ac4f9349cb4f8bcf91717b0b989612bd25704d7..36ea3dea77c2df423d64c99fe79af0c24de28dff 100644 +index 2b65e68b5b0fdbe73a5d9082a1d6b9e6093adbcf..2bef007da942d045fa6b2a424c5d0b780ecff2b7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -728,6 +728,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0228-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch similarity index 96% rename from patches/server/0228-Config-to-remove-curse-of-binding-with-weakness.patch rename to patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch index b2a95cc8a..62eb6fa6c 100644 --- a/patches/server/0228-Config-to-remove-curse-of-binding-with-weakness.patch +++ b/patches/server/0226-Config-to-remove-curse-of-binding-with-weakness.patch @@ -26,7 +26,7 @@ index 111da6398bb561e58571e47743088ce80416234d..0a2c776b9b1da7d0d4481dd527e0068b @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 36ea3dea77c2df423d64c99fe79af0c24de28dff..30b0abcc712a3471b07252dd90e862c9fcef7687 100644 +index 2bef007da942d045fa6b2a424c5d0b780ecff2b7..85ced4d3abf220dd625349356da2a075503ea037 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -359,6 +359,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0229-Conduit-behavior-configuration.patch b/patches/server/0227-Conduit-behavior-configuration.patch similarity index 96% rename from patches/server/0229-Conduit-behavior-configuration.patch rename to patches/server/0227-Conduit-behavior-configuration.patch index 9cc599786..04919721f 100644 --- a/patches/server/0229-Conduit-behavior-configuration.patch +++ b/patches/server/0227-Conduit-behavior-configuration.patch @@ -44,10 +44,10 @@ index 96b6e914441ee1faa059aa5ddcf77ffb74e76ae9..31af7d8111e73169d3e02aa52799a018 } CraftEventFactory.blockDamage = null; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 30b0abcc712a3471b07252dd90e862c9fcef7687..fcc388884285b7e56784671345d1977b12943ddf 100644 +index 85ced4d3abf220dd625349356da2a075503ea037..cb43d8724a3b0324668d415c47df57e93a82b6a5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2615,4 +2615,27 @@ public class PurpurWorldConfig { +@@ -2606,4 +2606,27 @@ public class PurpurWorldConfig { private void hungerSettings() { hungerStarvationDamage = (float) getDouble("hunger.starvation-damage", hungerStarvationDamage); } diff --git a/patches/server/0230-Cauldron-fill-chances.patch b/patches/server/0228-Cauldron-fill-chances.patch similarity index 92% rename from patches/server/0230-Cauldron-fill-chances.patch rename to patches/server/0228-Cauldron-fill-chances.patch index 49a5ceb0c..efeba7136 100644 --- a/patches/server/0230-Cauldron-fill-chances.patch +++ b/patches/server/0228-Cauldron-fill-chances.patch @@ -18,10 +18,10 @@ index dbae4f3b56d0290c6d28b9beaaa3b459754d43e3..676184c48c3abd8e2fb9a04ae3e165dc @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index fcc388884285b7e56784671345d1977b12943ddf..0f1b1c0a0bd948124c65f52bd257ef4a6daf1fbe 100644 +index cb43d8724a3b0324668d415c47df57e93a82b6a5..2ce74212c5c4f251fba659e8182c43346c98d375 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2638,4 +2638,11 @@ public class PurpurWorldConfig { +@@ -2629,4 +2629,11 @@ public class PurpurWorldConfig { }); conduitBlocks = conduitBlockList.toArray(Block[]::new); } diff --git a/patches/server/0231-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch similarity index 96% rename from patches/server/0231-Config-to-allow-mobs-to-pathfind-over-rails.patch rename to patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch index f454d4635..b02aad536 100644 --- a/patches/server/0231-Config-to-allow-mobs-to-pathfind-over-rails.patch +++ b/patches/server/0229-Config-to-allow-mobs-to-pathfind-over-rails.patch @@ -18,7 +18,7 @@ index ce891b7d8e5cbc956c28b8bb8c5c9976b7377039..8ecc9099515e38bfe38a5f9ca034cd81 if (node != null && (node.type == BlockPathTypes.OPEN || node.type == BlockPathTypes.WALKABLE) && this.mob.getBbWidth() < 1.0F) { double g = (double)(x - direction.getStepX()) + 0.5D; diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 0f1b1c0a0bd948124c65f52bd257ef4a6daf1fbe..e0d6a839e63ebf35676082e71ea96a73273c4f72 100644 +index 2ce74212c5c4f251fba659e8182c43346c98d375..0b3ba0c4135229f93473bcdfe837db338e01cb4f 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -654,6 +654,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0232-Add-force-and-prompt-parameters-to-resource-pack-api.patch b/patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch similarity index 100% rename from patches/server/0232-Add-force-and-prompt-parameters-to-resource-pack-api.patch rename to patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch diff --git a/patches/server/0233-Shulker-change-color-with-dye.patch b/patches/server/0231-Shulker-change-color-with-dye.patch similarity index 97% rename from patches/server/0233-Shulker-change-color-with-dye.patch rename to patches/server/0231-Shulker-change-color-with-dye.patch index 84d24755e..6aec3e237 100644 --- a/patches/server/0233-Shulker-change-color-with-dye.patch +++ b/patches/server/0231-Shulker-change-color-with-dye.patch @@ -47,7 +47,7 @@ index 73750ec94993fba1d4e7cf7927bb60166757805a..4739f1e29a748cf69d37e616e0678108 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e0d6a839e63ebf35676082e71ea96a73273c4f72..e42abd2cd2167c1ad342e88fd41e76d84a4aa466 100644 +index 0b3ba0c4135229f93473bcdfe837db338e01cb4f..18a41bb6d8828ae2b3245588b60bb15cd97d68d5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -2017,6 +2017,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0234-Extended-OfflinePlayer-API.patch b/patches/server/0232-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/server/0234-Extended-OfflinePlayer-API.patch rename to patches/server/0232-Extended-OfflinePlayer-API.patch diff --git a/patches/server/0235-Added-the-ability-to-add-combustible-items.patch b/patches/server/0233-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/server/0235-Added-the-ability-to-add-combustible-items.patch rename to patches/server/0233-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/server/0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 97% rename from patches/server/0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index eddab8d8f..c319bf5b3 100644 --- a/patches/server/0236-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0234-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -25,7 +25,7 @@ index dfbab7b451656db88e1a7d3a6bf407637da41ff9..1a25629380b29bd919dce1fde0f69fea // CraftBukkit start // If we stop due to everyone sleeping we should reset the weather duration to some other random value. diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index e42abd2cd2167c1ad342e88fd41e76d84a4aa466..224f492dae64d32c15cadcd102e1e9966a786ab4 100644 +index 18a41bb6d8828ae2b3245588b60bb15cd97d68d5..eb1e2e4327075df3bc680171ddd84ac6594f9db0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -655,6 +655,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 98% rename from patches/server/0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index 2c46e06bf..b5904a551 100644 --- a/patches/server/0237-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0235-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -45,7 +45,7 @@ index 71e494b949541284b0642dae4b20a6b3ec459828..625ad12e43cc651c986a3b45ce9a7c5b public static final Block MOSS_BLOCK = register("moss_block", new MossBlock(BlockBehaviour.Properties.of(Material.MOSS, MaterialColor.COLOR_GREEN).strength(0.1F).sound(SoundType.MOSS))); public static final Block BIG_DRIPLEAF = register("big_dripleaf", new BigDripleafBlock(BlockBehaviour.Properties.of(Material.PLANT).strength(0.1F).sound(SoundType.BIG_DRIPLEAF))); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 224f492dae64d32c15cadcd102e1e9966a786ab4..6d6b195ebaea705d5bcb450c831191f287e64b2b 100644 +index eb1e2e4327075df3bc680171ddd84ac6594f9db0..ca4bc68542c96b93f3aa410b21248af8e136d911 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -688,6 +688,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0238-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch similarity index 98% rename from patches/server/0238-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch index b76482863..c092e6737 100644 --- a/patches/server/0238-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0236-Shift-right-click-to-use-exp-for-mending.patch @@ -48,7 +48,7 @@ index a196c669891b09c42751004bd76d9c40ed6924ee..0a3bb5c385a3d7d4e938fe45c295faf0 cancelled = event.useItemInHand() == Event.Result.DENY; } else { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 6d6b195ebaea705d5bcb450c831191f287e64b2b..f9878a6b8e886254cad913eeae0bba45b9f416c8 100644 +index ca4bc68542c96b93f3aa410b21248af8e136d911..b3be28a08fb4296e43db47737bbd3379f1798599 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -360,6 +360,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0239-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 98% rename from patches/server/0239-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch index 68e5e9cad..0100629fe 100644 --- a/patches/server/0239-Dolphins-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0237-Dolphins-naturally-aggressive-to-players-chance.patch @@ -47,7 +47,7 @@ index 591573926eb1358ef82e9e5418be0f1d4ba663cb..68f5f5322521d844c26582606a8d1235 public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index f9878a6b8e886254cad913eeae0bba45b9f416c8..8d5d12bccc27e52e7237d723702943fc5fc08e19 100644 +index b3be28a08fb4296e43db47737bbd3379f1798599..9deee35a36e1a30a7e567e537ecf68dc918954e8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1200,6 +1200,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0240-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch similarity index 98% rename from patches/server/0240-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch index f2c5d17d5..14741e6d5 100644 --- a/patches/server/0240-Cows-naturally-aggressive-to-players-chance.patch +++ b/patches/server/0238-Cows-naturally-aggressive-to-players-chance.patch @@ -59,7 +59,7 @@ index fa3bbdd27de6382904588213022191a52d9758a0..9009e448c14dedb271abe671d88aff0d @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 8d5d12bccc27e52e7237d723702943fc5fc08e19..c6d9a1cbdf02978b4edc941528aa8750a1ffbeef 100644 +index 9deee35a36e1a30a7e567e537ecf68dc918954e8..41bc2abe5b50041c9ec180ee56c9318009655d88 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1153,7 +1153,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0241-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 90% rename from patches/server/0241-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch index 01956a14a..a23c30e0e 100644 --- a/patches/server/0241-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0239-Option-for-beds-to-explode-on-villager-sleep.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Option for beds to explode on villager sleep diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java -index e926e9ab135c7d68d13e384f688b32610b2accdb..174afdd3e902ea5b6dc307d1668b2de3f187d81b 100644 +index 779e0e0ee72cd2835cda69b49b769c1882a55a66..bd279875de63517ce276592835f3d37321f12116 100644 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java -@@ -1175,6 +1175,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler +@@ -1156,6 +1156,12 @@ public class Villager extends AbstractVillager implements ReputationEventHandler @Override public void startSleeping(BlockPos pos) { @@ -22,7 +22,7 @@ index e926e9ab135c7d68d13e384f688b32610b2accdb..174afdd3e902ea5b6dc307d1668b2de3 this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index c6d9a1cbdf02978b4edc941528aa8750a1ffbeef..a42ca33ad5cdaabfba014bb52aa85bd9002f3abd 100644 +index 41bc2abe5b50041c9ec180ee56c9318009655d88..d8cea2024ef8c9a5305d80b233f932449744a599 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -707,11 +707,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0242-Halloween-options-and-optimizations.patch b/patches/server/0240-Halloween-options-and-optimizations.patch similarity index 98% rename from patches/server/0242-Halloween-options-and-optimizations.patch rename to patches/server/0240-Halloween-options-and-optimizations.patch index 6952c3c28..a92e97c89 100644 --- a/patches/server/0242-Halloween-options-and-optimizations.patch +++ b/patches/server/0240-Halloween-options-and-optimizations.patch @@ -60,7 +60,7 @@ index 2bd8dc3f5c0b28fb4ea380b4b4a8672d5ede2a38..52eda2e110839c0845de6cd60445f9a0 this.armorDropChances[EquipmentSlot.HEAD.getIndex()] = 0.0F; } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index a42ca33ad5cdaabfba014bb52aa85bd9002f3abd..03aabc7d5eee53e78ff258ca798165778c1379a0 100644 +index d8cea2024ef8c9a5305d80b233f932449744a599..4aaf32fb25ea736d1c489bc14fa1479f00bb77e1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -1504,6 +1504,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0243-Config-for-Grindstones-ignoring-curses.patch b/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch similarity index 97% rename from patches/server/0243-Config-for-Grindstones-ignoring-curses.patch rename to patches/server/0241-Config-for-Grindstones-ignoring-curses.patch index 73420e554..2b4de19e9 100644 --- a/patches/server/0243-Config-for-Grindstones-ignoring-curses.patch +++ b/patches/server/0241-Config-for-Grindstones-ignoring-curses.patch @@ -36,7 +36,7 @@ index 0bdf874ddb951daf8d469575a44144504472d12d..b54e172fa18adeb563a3c9bda56e5579 EnchantmentHelper.setEnchantments(map, itemstack1); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 82c7694de79094f4d944cdaba8d06572147dfd34..1134bc154cb3d83b510e48bd78851a93cfecbbe3 100644 +index ffc1c2bf3cc6a892a073acb7d873084e3aaa7067..7a8f17af485dc35ba4095e0adcadc8c32b897a9d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -306,6 +306,7 @@ public class PurpurConfig { diff --git a/patches/server/0244-UPnP-Port-Forwarding.patch b/patches/server/0242-UPnP-Port-Forwarding.patch similarity index 96% rename from patches/server/0244-UPnP-Port-Forwarding.patch rename to patches/server/0242-UPnP-Port-Forwarding.patch index c75cbca1d..280564f7d 100644 --- a/patches/server/0244-UPnP-Port-Forwarding.patch +++ b/patches/server/0242-UPnP-Port-Forwarding.patch @@ -67,10 +67,10 @@ index c8e6c5bef67c16cf1bef42fe890bf984f0fbafa1..24ddef59225faf44773430231f5c7be1 // CraftBukkit start // this.setPlayerList(new DedicatedPlayerList(this, this.registryHolder, this.playerDataStorage)); // Spigot - moved up diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 1134bc154cb3d83b510e48bd78851a93cfecbbe3..7e36bcda5b8caee9fb604d26f7b9b22a7b1fea98 100644 +index 7a8f17af485dc35ba4095e0adcadc8c32b897a9d..f9d6d5d9ccd648694f5f225f1534202d6b4f0db3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -396,4 +396,9 @@ public class PurpurConfig { +@@ -391,4 +391,9 @@ public class PurpurConfig { private static void tpsCatchup() { tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup); } diff --git a/patches/server/0245-Campfire-option-for-lit-when-placed.patch b/patches/server/0243-Campfire-option-for-lit-when-placed.patch similarity index 96% rename from patches/server/0245-Campfire-option-for-lit-when-placed.patch rename to patches/server/0243-Campfire-option-for-lit-when-placed.patch index ace12a44f..9c87f4c07 100644 --- a/patches/server/0245-Campfire-option-for-lit-when-placed.patch +++ b/patches/server/0243-Campfire-option-for-lit-when-placed.patch @@ -18,7 +18,7 @@ index 0b60b545271e62df86a0eb3c1f0f315a014b24cd..44df9e5034887c756c00bdcfb3ea04d4 @Override diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 03aabc7d5eee53e78ff258ca798165778c1379a0..aa69690ed0d7e392dc53e8f3e6aa1b35294cdaa0 100644 +index 4aaf32fb25ea736d1c489bc14fa1479f00bb77e1..b2f3b50250dd6efada888416e5ea5a17cfd2d7f8 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -982,6 +982,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0246-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch similarity index 98% rename from patches/server/0246-options-to-extinguish-fire-blocks-with-snowballs.patch rename to patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch index e52b9d02b..696398fe0 100644 --- a/patches/server/0246-options-to-extinguish-fire-blocks-with-snowballs.patch +++ b/patches/server/0244-options-to-extinguish-fire-blocks-with-snowballs.patch @@ -46,7 +46,7 @@ index d5d84893c77b4e60a19032d765d76bfd24cbbb2b..ef265cec066ef3b84c2b3a4929af5183 protected void onHit(HitResult hitResult) { super.onHit(hitResult); diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index aa69690ed0d7e392dc53e8f3e6aa1b35294cdaa0..55815af39a06445d1ee730f817cbbace2f424cd2 100644 +index b2f3b50250dd6efada888416e5ea5a17cfd2d7f8..7bf38e7b8d95d7e6fb8b2fe32d630382c90cf121 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -179,6 +179,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0247-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch similarity index 92% rename from patches/server/0247-Add-option-to-disable-zombie-villagers-cure.patch rename to patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch index 2255be482..c5ae13a66 100644 --- a/patches/server/0247-Add-option-to-disable-zombie-villagers-cure.patch +++ b/patches/server/0245-Add-option-to-disable-zombie-villagers-cure.patch @@ -18,10 +18,10 @@ index c6ba41c2b4cc96bc97ed2e2220c0f3fa4f31dbe3..22a5d2f0de4bdd4432d1beff840f448a itemstack.shrink(1); } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 55815af39a06445d1ee730f817cbbace2f424cd2..4c37df85046aede9ca37c92384fb282767c82644 100644 +index 7bf38e7b8d95d7e6fb8b2fe32d630382c90cf121..c9eb43cbc0478c55cb2cab0d5473805c85ddcce7 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -@@ -2618,6 +2618,7 @@ public class PurpurWorldConfig { +@@ -2609,6 +2609,7 @@ public class PurpurWorldConfig { public boolean zombieVillagerTakeDamageFromWater = false; public int zombieVillagerCuringTimeMin = 3600; public int zombieVillagerCuringTimeMax = 6000; @@ -29,7 +29,7 @@ index 55815af39a06445d1ee730f817cbbace2f424cd2..4c37df85046aede9ca37c92384fb2827 private void zombieVillagerSettings() { zombieVillagerRidable = getBoolean("mobs.zombie_villager.ridable", zombieVillagerRidable); zombieVillagerRidableInWater = getBoolean("mobs.zombie_villager.ridable-in-water", zombieVillagerRidableInWater); -@@ -2634,6 +2635,7 @@ public class PurpurWorldConfig { +@@ -2625,6 +2626,7 @@ public class PurpurWorldConfig { zombieVillagerTakeDamageFromWater = getBoolean("mobs.zombie_villager.takes-damage-from-water", zombieVillagerTakeDamageFromWater); zombieVillagerCuringTimeMin = getInt("mobs.zombie_villager.curing_time.min", zombieVillagerCuringTimeMin); zombieVillagerCuringTimeMax = getInt("mobs.zombie_villager.curing_time.max", zombieVillagerCuringTimeMax);