From 417a025211d3a8adb92d095c3ca05f154a6ec7fc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 12 Jun 2022 22:59:12 -0500 Subject: [PATCH] Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e4f5e1c Bump netty Pufferfish Changes: pufferfish-gg/Pufferfish@a8543a4 #33 Fix anti-xray related crash bug pufferfish-gg/Pufferfish@aefcb1a Updated Upstream (Paper) --- gradle.properties | 2 +- ...patch => 0002-Fix-pufferfish-issues.patch} | 2 +- .../0001-Pufferfish-Server-Changes.patch | 25 ++++++----- .../server/0002-Fix-pufferfish-issues.patch | 45 +++++++++++++++++++ ...{0002-Rebrand.patch => 0003-Rebrand.patch} | 6 +-- ...s.patch => 0004-Purpur-config-files.patch} | 4 +- ...patch => 0005-Purpur-client-support.patch} | 0 ....patch => 0006-Fix-decompile-errors.patch} | 0 ...0007-Component-related-conveniences.patch} | 0 ...007-Ridables.patch => 0008-Ridables.patch} | 2 +- ...Configurable-entity-base-attributes.patch} | 0 ...s-stuff.patch => 0010-Timings-stuff.patch} | 0 ...0011-Barrels-and-enderchests-6-rows.patch} | 0 ...1-Llama-API.patch => 0012-Llama-API.patch} | 0 ...{0012-AFK-API.patch => 0013-AFK-API.patch} | 2 +- ...atch => 0014-Bring-back-server-name.patch} | 0 ...> 0015-Configurable-server-mod-name.patch} | 0 ... 0016-LivingEntity-safeFallDistance.patch} | 0 ...old.patch => 0017-Lagging-threshold.patch} | 0 ...18-PlayerSetSpawnerTypeWithEggEvent.patch} | 0 ...ch => 0019-EMC-MonsterEggSpawnEvent.patch} | 0 ...ch => 0020-Player-invulnerabilities.patch} | 2 +- ...0-Anvil-API.patch => 0021-Anvil-API.patch} | 0 ...2-Configurable-villager-brain-ticks.patch} | 0 ...0023-Alternative-Keepalive-Handling.patch} | 0 ...s.patch => 0024-Silk-touch-spawners.patch} | 2 +- ...72-Fix-Add-turtle-egg-block-options.patch} | 2 +- ...-vanilla-command-permission-handler.patch} | 0 ...settings-suppressing-pointless-logs.patch} | 0 ...> 0028-Disable-outdated-build-check.patch} | 0 ...gs.patch => 0029-Giants-AI-settings.patch} | 0 ...> 0030-Zombie-horse-naturally-spawn.patch} | 2 +- ...031-Charged-creeper-naturally-spawn.patch} | 0 ...it-naturally-spawn-toast-and-killer.patch} | 0 ...er-showing-in-ping-before-server-fu.patch} | 0 ...atch => 0034-Tulips-change-fox-type.patch} | 0 ...patch => 0035-Breedable-Polar-Bears.patch} | 0 ...atch => 0036-Chickens-can-retaliate.patch} | 0 ...ption-to-set-armorstand-step-height.patch} | 2 +- ....patch => 0038-Cat-spawning-options.patch} | 0 ...n-black-cats-spawning-in-swamp-huts.patch} | 0 ...ms.patch => 0040-Cows-eat-mushrooms.patch} | 0 ...ow-rotation-when-shearing-mooshroom.patch} | 0 ...patch => 0042-Pigs-give-saddle-back.patch} | 0 ...3-Snowman-drop-and-put-back-pumpkin.patch} | 0 ...4-Ender-dragon-always-drop-full-exp.patch} | 0 ... 0045-Signs-editable-on-right-click.patch} | 2 +- ...oisten-from-water-directly-under-it.patch} | 2 +- ...Minecart-settings-and-WASD-controls.patch} | 2 +- ...ble-loot-drops-on-death-by-cramming.patch} | 2 +- ...tion-to-toggle-milk-curing-bad-omen.patch} | 2 +- ...ould-check-if-entity-can-use-portal.patch} | 0 ...051-Fix-the-dead-lagging-the-server.patch} | 0 ...Skip-events-if-there-s-no-listeners.patch} | 0 ... 0053-Add-permission-for-F3-N-debug.patch} | 0 ...ch => 0054-Configurable-TPS-Catchup.patch} | 0 ...ow-loyalty-on-tridents-to-work-in-t.patch} | 2 +- ...erman-and-creeper-griefing-controls.patch} | 0 ...057-Villagers-follow-emerald-blocks.patch} | 0 ...ch => 0058-Allow-leashing-villagers.patch} | 0 ... => 0059-Implement-infinite-liquids.patch} | 2 +- ...0-Make-lava-flow-speed-configurable.patch} | 2 +- ...dd-player-death-exp-control-options.patch} | 2 +- ...rable-void-damage-height-and-damage.patch} | 2 +- ...=> 0063-Add-canSaveToDisk-to-Entity.patch} | 0 ...spenser-curse-of-binding-protection.patch} | 2 +- ...-for-boats-to-eject-players-on-land.patch} | 2 +- ...-mends-most-damages-equipment-first.patch} | 2 +- ...067-Add-5-second-tps-average-in-tps.patch} | 0 ...h => 0068-Implement-elytra-settings.patch} | 2 +- ...atch => 0069-Item-entity-immunities.patch} | 2 +- ...mand.patch => 0070-Add-ping-command.patch} | 0 ...mand.patch => 0071-Add-demo-command.patch} | 0 ...d.patch => 0072-Add-credits-command.patch} | 0 ...=> 0073-Configurable-jockey-options.patch} | 0 ...d-to-crystals-and-crystals-shoot-ph.patch} | 0 ...> 0075-Add-phantom-spawning-options.patch} | 0 ...076-Implement-bed-explosion-options.patch} | 2 +- ...nt-respawn-anchor-explosion-options.patch} | 2 +- ...Add-allow-water-in-end-world-option.patch} | 4 +- ... => 0079-Allow-color-codes-in-books.patch} | 0 ...espan.patch => 0080-Entity-lifespan.patch} | 2 +- ...eport-to-spawn-if-outside-world-bor.patch} | 2 +- ...ty.patch => 0082-Squid-EAR-immunity.patch} | 0 ...atch => 0083-Phantoms-burn-in-light.patch} | 0 ...0084-Configurable-villager-breeding.patch} | 0 ... 0085-Redstone-deactivates-spawners.patch} | 2 +- ...ch => 0086-Totems-work-in-inventory.patch} | 2 +- ...-Add-vindicator-johnny-spawn-chance.patch} | 0 ...on-to-disable-certain-block-updates.patch} | 0 ...0089-Dispensers-place-anvils-option.patch} | 2 +- ...rs.patch => 0090-Allow-anvil-colors.patch} | 2 +- ...-disable-dolphin-treasure-searching.patch} | 0 ...patch => 0092-Short-enderman-height.patch} | 0 ...top-squids-floating-on-top-of-water.patch} | 0 ...ng-obsidian-valid-for-portal-frames.patch} | 0 ...ities-can-use-portals-configuration.patch} | 2 +- ...096-LivingEntity-broadcastItemBreak.patch} | 0 ...tomizable-wither-health-and-healing.patch} | 0 ...gling-special-MobSpawners-per-world.patch} | 4 +- ...patch => 0099-Raid-cooldown-setting.patch} | 2 +- ...-config-options-per-projectile-type.patch} | 2 +- ...able-zombie-aggressiveness-towards-.patch} | 0 ...-to-recipe-s-ExactChoice-ingredient.patch} | 0 ...y.patch => 0103-Flying-squids-Oh-my.patch} | 0 ...patch => 0104-Infinity-bow-settings.patch} | 2 +- ...=> 0105-Configurable-daylight-cycle.patch} | 4 +- ...e-and-mending-enchantments-together.patch} | 0 ...7-Furnace-uses-lava-from-underneath.patch} | 2 +- ...ws-should-not-reset-despawn-counter.patch} | 0 ...e-add-farmland-mechanics-from-Alpha.patch} | 2 +- ...ustable-breeding-cooldown-to-config.patch} | 6 +-- ...-entity-breeding-times-configurable.patch} | 2 +- ...es-from-item-forms-of-entities-to-e.patch} | 2 +- ...when-using-a-Name-Tag-on-an-Armor-S.patch} | 2 +- ...lowing-Endermen-to-despawn-even-whi.patch} | 0 ...15-Add-configurable-snowball-damage.patch} | 2 +- ...6-Changeable-Mob-Left-Handed-Chance.patch} | 2 +- ...=> 0117-Add-boat-fall-damage-config.patch} | 2 +- ...0118-Snow-Golem-rate-of-fire-config.patch} | 0 ...-Configurable-disable-give-dropping.patch} | 0 ...illager-Clerics-to-farm-Nether-Wart.patch} | 0 ...ied-Piglin-death-always-counting-as.patch} | 0 ...timise-player-list-ticksSpread-out-.patch} | 0 ...le-chance-for-wolves-to-spawn-rabid.patch} | 0 ...4-Configurable-default-collar-color.patch} | 0 ...tch => 0125-Phantom-flames-on-swoop.patch} | 0 ...-to-open-even-with-a-solid-block-on.patch} | 2 +- ...SBar.patch => 0127-Implement-TPSBar.patch} | 0 ...h => 0128-Striders-give-saddle-back.patch} | 0 ...tch => 0129-PlayerBookTooLargeEvent.patch} | 0 ...herite-armor-grants-fire-resistance.patch} | 2 +- ...131-Fix-rotating-UP-DOWN-CW-and-CCW.patch} | 0 ...efing-bypass-to-everything-affected.patch} | 0 ...llow-Note-Block-sounds-when-blocked.patch} | 2 +- ...134-Add-EntityTeleportHinderedEvent.patch} | 2 +- ... => 0135-Farmland-trampling-changes.patch} | 2 +- ...6-Movement-options-for-armor-stands.patch} | 2 +- ....patch => 0137-Fix-stuck-in-portals.patch} | 2 +- ...ggle-for-water-sensitive-mob-damage.patch} | 0 ...9-Config-to-always-tame-in-Creative.patch} | 2 +- ... 0140-End-crystal-explosion-options.patch} | 2 +- ...ther-Ender-Dragon-can-ride-vehicles.patch} | 0 ...atch => 0142-Dont-run-with-scissors.patch} | 2 +- ...nch-Man.patch => 0143-One-Punch-Man.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} | 0 ...Dragon-Head-wearers-and-stare-aggro.patch} | 0 ...ig.patch => 0149-Tick-fluids-config.patch} | 2 +- ...50-Config-to-disable-Llama-caravans.patch} | 0 ...g-to-make-Creepers-explode-on-death.patch} | 0 ...rable-ravager-griefable-blocks-list.patch} | 0 ...153-Sneak-to-bulk-process-composter.patch} | 2 +- ...h => 0154-Config-for-skipping-night.patch} | 4 +- ...155-Add-config-for-villager-trading.patch} | 0 ...=> 0156-Allow-infinity-on-crossbows.patch} | 0 ...ngs.patch => 0157-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} | 0 ...0163-Configurable-sponge-absorption.patch} | 2 +- ...ch => 0164-Projectile-offset-config.patch} | 2 +- ...or-powered-rail-activation-distance.patch} | 2 +- ...> 0166-Piglin-portal-spawn-modifier.patch} | 0 ...Config-to-change-max-number-of-bees.patch} | 0 ...-Config-for-wither-explosion-radius.patch} | 0 ... => 0169-Gamemode-extra-permissions.patch} | 0 ...ng-the-blocks-that-turn-into-dirt-p.patch} | 2 +- ...0171-Configurable-piston-push-limit.patch} | 2 +- ...172-Configurable-broadcast-settings.patch} | 0 ... => 0173-Configurable-mob-blindness.patch} | 2 +- ...hidden-players-from-entity-selector.patch} | 0 ...-to-impact-Creeper-explosion-radius.patch} | 0 ... 0176-Iron-golem-calm-anger-options.patch} | 0 ...ots.patch => 0177-Breedable-parrots.patch} | 0 ...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} | 0 ...-anvil-cumulative-cost-configurable.patch} | 0 ...3-ShulkerBox-allow-oversized-stacks.patch} | 2 +- ...e-can-work-when-raining-or-at-night.patch} | 0 ...85-API-for-any-mob-to-burn-daylight.patch} | 0 ...h => 0186-Config-MobEffect-by-world.patch} | 2 +- ...eacon-Activation-Range-Configurable.patch} | 2 +- ...0188-Add-toggle-for-sand-duping-fix.patch} | 2 +- ...gle-for-end-portal-safe-teleporting.patch} | 2 +- ...atch => 0190-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 ...5-Shulker-spawn-from-bullet-options.patch} | 0 ...ating-glow-berries-adds-glow-effect.patch} | 2 +- ...-Option-to-make-drowned-break-doors.patch} | 0 ...nfigurable-hunger-starvation-damage.patch} | 0 ...patch => 0199-Enhance-SysoutCatcher.patch} | 0 ...h => 0200-Armor-click-equip-options.patch} | 2 +- ...nd.patch => 0201-Add-uptime-command.patch} | 0 ...atch => 0202-Structure-seed-options.patch} | 0 ...tch => 0203-Tool-actionable-options.patch} | 2 +- ...4-Store-placer-on-Block-when-placed.patch} | 0 ...oner-API.patch => 0205-Summoner-API.patch} | 0 ...mizable-sleeping-actionbar-messages.patch} | 2 +- ...-shulker-box-items-from-dropping-co.patch} | 2 +- ...208-Silk-touchable-budding-amethyst.patch} | 0 ...tch => 0209-Big-dripleaf-tilt-delay.patch} | 2 +- ...0210-Player-ridable-in-water-option.patch} | 2 +- ...-Enderman-teleport-on-projectile-hi.patch} | 0 ...d.patch => 0212-Add-compass-command.patch} | 2 +- ...nt-horses-from-standing-with-riders.patch} | 0 ...h => 0214-Toggle-for-kinetic-damage.patch} | 2 +- ...-Option-for-disable-observer-clocks.patch} | 2 +- ...zeable-Zombie-Villager-curing-times.patch} | 0 ...-Option-for-sponges-to-work-on-lava.patch} | 2 +- ...218-Toggle-for-Wither-s-spawn-sound.patch} | 0 ...-breaks-from-solid-neighbors-config.patch} | 2 +- ...move-curse-of-binding-with-weakness.patch} | 2 +- ...0221-Conduit-behavior-configuration.patch} | 0 ...patch => 0222-Cauldron-fill-chances.patch} | 0 ...o-allow-mobs-to-pathfind-over-rails.patch} | 2 +- ... 0224-Shulker-change-color-with-dye.patch} | 0 ... => 0225-Extended-OfflinePlayer-API.patch} | 0 ...he-ability-to-add-combustible-items.patch} | 0 ...in-and-thunder-should-stop-on-sleep.patch} | 4 +- ...-blocks-to-grow-into-trees-naturall.patch} | 2 +- ...-right-click-to-use-exp-for-mending.patch} | 2 +- ...urally-aggressive-to-players-chance.patch} | 0 ...urally-aggressive-to-players-chance.patch} | 0 ...r-beds-to-explode-on-villager-sleep.patch} | 2 +- ...Halloween-options-and-optimizations.patch} | 0 ...atch => 0234-Config-for-grindstones.patch} | 0 ....patch => 0235-UPnP-Port-Forwarding.patch} | 0 ...Campfire-option-for-lit-when-placed.patch} | 2 +- ...tinguish-fire-blocks-with-snowballs.patch} | 2 +- ...on-to-disable-zombie-villagers-cure.patch} | 0 ...nt-BlockEntity-Lore-and-DisplayName.patch} | 2 +- ...tch => 0240-Signs-allow-color-codes.patch} | 2 +- ...twisting-vines-configurable-max-gro.patch} | 2 +- ...=> 0242-Mobs-always-drop-experience.patch} | 0 ....patch => 0243-Potion-NamespacedKey.patch} | 0 ...ne-API.patch => 0244-Grindstone-API.patch} | 0 ...-spiders-from-climbing-world-border.patch} | 0 ...e-to-replant-crops-and-nether-warts.patch} | 2 +- ...ring-jeb-produces-random-color-wool.patch} | 0 ...urtle-eggs-random-tick-crack-chance.patch} | 2 +- ...=> 0249-Mob-head-visibility-percent.patch} | 0 ...able-valid-characters-for-usernames.patch} | 0 ...Shears-can-have-looting-enchantment.patch} | 0 ...Stop-bees-from-dying-after-stinging.patch} | 0 ...ounts-in-beehives-to-Purpur-clients.patch} | 0 ...onfigurable-farmland-trample-height.patch} | 2 +- ...onfigurable-player-pickup-exp-delay.patch} | 2 +- ...ng.patch => 0256-Allow-void-trading.patch} | 4 +- ...nt-eat-blocks-in-non-ticking-chunks.patch} | 0 ...h => 0258-Configurable-phantom-size.patch} | 0 ...> 0259-Configurable-food-attributes.patch} | 0 ....patch => 0260-Max-joins-per-second.patch} | 0 ...figurable-minimum-demand-for-trades.patch} | 0 ... => 0262-Lobotomize-stuck-villagers.patch} | 0 ...ion-for-villager-display-trade-item.patch} | 0 ...> 0264-Fill-command-max-area-option.patch} | 0 ...wner-not-spawning-water-animals-cor.patch} | 2 +- ...ig-for-mob-last-hurt-by-player-time.patch} | 2 +- ...=> 0267-Anvil-repair-damage-options.patch} | 2 +- ...> 0268-Fix-legacy-colors-in-console.patch} | 0 ...-turtle-egg-trampling-with-feather-.patch} | 2 +- ...d-toggle-for-enchant-level-clamping.patch} | 0 ...vent-horses-from-standing-when-hurt.patch} | 0 ...tch => 0272-Drop-incompatible-tests.patch} | 0 ...rable-search-radius-for-villagers-t.patch} | 0 ...ge.patch => 0274-Stonecutter-damage.patch} | 2 +- ...le-damage-settings-for-magma-blocks.patch} | 2 +- ...276-Add-config-for-snow-on-blue-ice.patch} | 2 +- ...ch => 0277-Fix-bold-text-in-console.patch} | 0 ...g-suppression-for-sent-expired-chat.patch} | 0 .../server/0278-Fix-RandomSource-NPE.patch | 19 -------- 281 files changed, 192 insertions(+), 163 deletions(-) rename patches/api/{0002-Add-pufferfish-added-classes-to-junit-exemptions.patch => 0002-Fix-pufferfish-issues.patch} (93%) create mode 100644 patches/server/0002-Fix-pufferfish-issues.patch rename patches/server/{0002-Rebrand.patch => 0003-Rebrand.patch} (99%) rename patches/server/{0003-Purpur-config-files.patch => 0004-Purpur-config-files.patch} (99%) rename patches/server/{0004-Purpur-client-support.patch => 0005-Purpur-client-support.patch} (100%) rename patches/server/{0005-Fix-decompile-errors.patch => 0006-Fix-decompile-errors.patch} (100%) rename patches/server/{0006-Component-related-conveniences.patch => 0007-Component-related-conveniences.patch} (100%) rename patches/server/{0007-Ridables.patch => 0008-Ridables.patch} (99%) rename patches/server/{0008-Configurable-entity-base-attributes.patch => 0009-Configurable-entity-base-attributes.patch} (100%) rename patches/server/{0009-Timings-stuff.patch => 0010-Timings-stuff.patch} (100%) rename patches/server/{0010-Barrels-and-enderchests-6-rows.patch => 0011-Barrels-and-enderchests-6-rows.patch} (100%) rename patches/server/{0011-Llama-API.patch => 0012-Llama-API.patch} (100%) rename patches/server/{0012-AFK-API.patch => 0013-AFK-API.patch} (99%) rename patches/server/{0013-Bring-back-server-name.patch => 0014-Bring-back-server-name.patch} (100%) rename patches/server/{0014-Configurable-server-mod-name.patch => 0015-Configurable-server-mod-name.patch} (100%) rename patches/server/{0015-LivingEntity-safeFallDistance.patch => 0016-LivingEntity-safeFallDistance.patch} (100%) rename patches/server/{0016-Lagging-threshold.patch => 0017-Lagging-threshold.patch} (100%) rename patches/server/{0017-PlayerSetSpawnerTypeWithEggEvent.patch => 0018-PlayerSetSpawnerTypeWithEggEvent.patch} (100%) rename patches/server/{0018-EMC-MonsterEggSpawnEvent.patch => 0019-EMC-MonsterEggSpawnEvent.patch} (100%) rename patches/server/{0019-Player-invulnerabilities.patch => 0020-Player-invulnerabilities.patch} (98%) rename patches/server/{0020-Anvil-API.patch => 0021-Anvil-API.patch} (100%) rename patches/server/{0021-Configurable-villager-brain-ticks.patch => 0022-Configurable-villager-brain-ticks.patch} (100%) rename patches/server/{0022-Alternative-Keepalive-Handling.patch => 0023-Alternative-Keepalive-Handling.patch} (100%) rename patches/server/{0023-Silk-touch-spawners.patch => 0024-Silk-touch-spawners.patch} (99%) rename patches/server/{0024-MC-168772-Fix-Add-turtle-egg-block-options.patch => 0025-MC-168772-Fix-Add-turtle-egg-block-options.patch} (97%) rename patches/server/{0025-Fix-vanilla-command-permission-handler.patch => 0026-Fix-vanilla-command-permission-handler.patch} (100%) rename patches/server/{0026-Logger-settings-suppressing-pointless-logs.patch => 0027-Logger-settings-suppressing-pointless-logs.patch} (100%) rename patches/server/{0027-Disable-outdated-build-check.patch => 0028-Disable-outdated-build-check.patch} (100%) rename patches/server/{0028-Giants-AI-settings.patch => 0029-Giants-AI-settings.patch} (100%) rename patches/server/{0029-Zombie-horse-naturally-spawn.patch => 0030-Zombie-horse-naturally-spawn.patch} (97%) rename patches/server/{0030-Charged-creeper-naturally-spawn.patch => 0031-Charged-creeper-naturally-spawn.patch} (100%) rename patches/server/{0031-Rabbit-naturally-spawn-toast-and-killer.patch => 0032-Rabbit-naturally-spawn-toast-and-killer.patch} (100%) rename patches/server/{0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch => 0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch} (100%) rename patches/server/{0033-Tulips-change-fox-type.patch => 0034-Tulips-change-fox-type.patch} (100%) rename patches/server/{0034-Breedable-Polar-Bears.patch => 0035-Breedable-Polar-Bears.patch} (100%) rename patches/server/{0035-Chickens-can-retaliate.patch => 0036-Chickens-can-retaliate.patch} (100%) rename patches/server/{0036-Add-option-to-set-armorstand-step-height.patch => 0037-Add-option-to-set-armorstand-step-height.patch} (94%) rename patches/server/{0037-Cat-spawning-options.patch => 0038-Cat-spawning-options.patch} (100%) rename patches/server/{0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch => 0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch} (100%) rename patches/server/{0039-Cows-eat-mushrooms.patch => 0040-Cows-eat-mushrooms.patch} (100%) rename patches/server/{0040-Fix-cow-rotation-when-shearing-mooshroom.patch => 0041-Fix-cow-rotation-when-shearing-mooshroom.patch} (100%) rename patches/server/{0041-Pigs-give-saddle-back.patch => 0042-Pigs-give-saddle-back.patch} (100%) rename patches/server/{0042-Snowman-drop-and-put-back-pumpkin.patch => 0043-Snowman-drop-and-put-back-pumpkin.patch} (100%) rename patches/server/{0043-Ender-dragon-always-drop-full-exp.patch => 0044-Ender-dragon-always-drop-full-exp.patch} (100%) rename patches/server/{0044-Signs-editable-on-right-click.patch => 0045-Signs-editable-on-right-click.patch} (96%) rename patches/server/{0045-Allow-soil-to-moisten-from-water-directly-under-it.patch => 0046-Allow-soil-to-moisten-from-water-directly-under-it.patch} (94%) rename patches/server/{0046-Minecart-settings-and-WASD-controls.patch => 0047-Minecart-settings-and-WASD-controls.patch} (99%) rename patches/server/{0047-Disable-loot-drops-on-death-by-cramming.patch => 0048-Disable-loot-drops-on-death-by-cramming.patch} (96%) rename patches/server/{0048-Option-to-toggle-milk-curing-bad-omen.patch => 0049-Option-to-toggle-milk-curing-bad-omen.patch} (95%) rename patches/server/{0049-End-gateway-should-check-if-entity-can-use-portal.patch => 0050-End-gateway-should-check-if-entity-can-use-portal.patch} (100%) rename patches/server/{0050-Fix-the-dead-lagging-the-server.patch => 0051-Fix-the-dead-lagging-the-server.patch} (100%) rename patches/server/{0051-Skip-events-if-there-s-no-listeners.patch => 0052-Skip-events-if-there-s-no-listeners.patch} (100%) rename patches/server/{0052-Add-permission-for-F3-N-debug.patch => 0053-Add-permission-for-F3-N-debug.patch} (100%) rename patches/server/{0053-Configurable-TPS-Catchup.patch => 0054-Configurable-TPS-Catchup.patch} (100%) rename patches/server/{0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch => 0055-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch} (96%) rename patches/server/{0055-Add-enderman-and-creeper-griefing-controls.patch => 0056-Add-enderman-and-creeper-griefing-controls.patch} (100%) rename patches/server/{0056-Villagers-follow-emerald-blocks.patch => 0057-Villagers-follow-emerald-blocks.patch} (100%) rename patches/server/{0057-Allow-leashing-villagers.patch => 0058-Allow-leashing-villagers.patch} (100%) rename patches/server/{0058-Implement-infinite-liquids.patch => 0059-Implement-infinite-liquids.patch} (98%) rename patches/server/{0059-Make-lava-flow-speed-configurable.patch => 0060-Make-lava-flow-speed-configurable.patch} (95%) rename patches/server/{0060-Add-player-death-exp-control-options.patch => 0061-Add-player-death-exp-control-options.patch} (97%) rename patches/server/{0061-Configurable-void-damage-height-and-damage.patch => 0062-Configurable-void-damage-height-and-damage.patch} (97%) rename patches/server/{0062-Add-canSaveToDisk-to-Entity.patch => 0063-Add-canSaveToDisk-to-Entity.patch} (100%) rename patches/server/{0063-Dispenser-curse-of-binding-protection.patch => 0064-Dispenser-curse-of-binding-protection.patch} (97%) rename patches/server/{0064-Add-option-for-boats-to-eject-players-on-land.patch => 0065-Add-option-for-boats-to-eject-players-on-land.patch} (95%) rename patches/server/{0065-Mending-mends-most-damages-equipment-first.patch => 0066-Mending-mends-most-damages-equipment-first.patch} (98%) rename patches/server/{0066-Add-5-second-tps-average-in-tps.patch => 0067-Add-5-second-tps-average-in-tps.patch} (100%) rename patches/server/{0067-Implement-elytra-settings.patch => 0068-Implement-elytra-settings.patch} (98%) rename patches/server/{0068-Item-entity-immunities.patch => 0069-Item-entity-immunities.patch} (98%) rename patches/server/{0069-Add-ping-command.patch => 0070-Add-ping-command.patch} (100%) rename patches/server/{0070-Add-demo-command.patch => 0071-Add-demo-command.patch} (100%) rename patches/server/{0071-Add-credits-command.patch => 0072-Add-credits-command.patch} (100%) rename patches/server/{0072-Configurable-jockey-options.patch => 0073-Configurable-jockey-options.patch} (100%) rename patches/server/{0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch => 0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch} (100%) rename patches/server/{0074-Add-phantom-spawning-options.patch => 0075-Add-phantom-spawning-options.patch} (100%) rename patches/server/{0075-Implement-bed-explosion-options.patch => 0076-Implement-bed-explosion-options.patch} (97%) rename patches/server/{0076-Implement-respawn-anchor-explosion-options.patch => 0077-Implement-respawn-anchor-explosion-options.patch} (97%) rename patches/server/{0077-Add-allow-water-in-end-world-option.patch => 0078-Add-allow-water-in-end-world-option.patch} (97%) rename patches/server/{0078-Allow-color-codes-in-books.patch => 0079-Allow-color-codes-in-books.patch} (100%) rename patches/server/{0079-Entity-lifespan.patch => 0080-Entity-lifespan.patch} (98%) rename patches/server/{0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (97%) rename patches/server/{0081-Squid-EAR-immunity.patch => 0082-Squid-EAR-immunity.patch} (100%) rename patches/server/{0082-Phantoms-burn-in-light.patch => 0083-Phantoms-burn-in-light.patch} (100%) rename patches/server/{0083-Configurable-villager-breeding.patch => 0084-Configurable-villager-breeding.patch} (100%) rename patches/server/{0084-Redstone-deactivates-spawners.patch => 0085-Redstone-deactivates-spawners.patch} (94%) rename patches/server/{0085-Totems-work-in-inventory.patch => 0086-Totems-work-in-inventory.patch} (96%) rename patches/server/{0086-Add-vindicator-johnny-spawn-chance.patch => 0087-Add-vindicator-johnny-spawn-chance.patch} (100%) rename patches/server/{0087-Add-option-to-disable-certain-block-updates.patch => 0088-Add-option-to-disable-certain-block-updates.patch} (100%) rename patches/server/{0088-Dispensers-place-anvils-option.patch => 0089-Dispensers-place-anvils-option.patch} (96%) rename patches/server/{0089-Allow-anvil-colors.patch => 0090-Allow-anvil-colors.patch} (96%) rename patches/server/{0090-Add-option-to-disable-dolphin-treasure-searching.patch => 0091-Add-option-to-disable-dolphin-treasure-searching.patch} (100%) rename patches/server/{0091-Short-enderman-height.patch => 0092-Short-enderman-height.patch} (100%) rename patches/server/{0092-Stop-squids-floating-on-top-of-water.patch => 0093-Stop-squids-floating-on-top-of-water.patch} (100%) rename patches/server/{0093-Crying-obsidian-valid-for-portal-frames.patch => 0094-Crying-obsidian-valid-for-portal-frames.patch} (100%) rename patches/server/{0094-Entities-can-use-portals-configuration.patch => 0095-Entities-can-use-portals-configuration.patch} (96%) rename patches/server/{0095-LivingEntity-broadcastItemBreak.patch => 0096-LivingEntity-broadcastItemBreak.patch} (100%) rename patches/server/{0096-Customizable-wither-health-and-healing.patch => 0097-Customizable-wither-health-and-healing.patch} (100%) rename patches/server/{0097-Allow-toggling-special-MobSpawners-per-world.patch => 0098-Allow-toggling-special-MobSpawners-per-world.patch} (96%) rename patches/server/{0098-Raid-cooldown-setting.patch => 0099-Raid-cooldown-setting.patch} (97%) rename patches/server/{0099-Despawn-rate-config-options-per-projectile-type.patch => 0100-Despawn-rate-config-options-per-projectile-type.patch} (99%) rename patches/server/{0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch => 0101-Add-option-to-disable-zombie-aggressiveness-towards-.patch} (100%) rename patches/server/{0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch => 0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch} (100%) rename patches/server/{0102-Flying-squids-Oh-my.patch => 0103-Flying-squids-Oh-my.patch} (100%) rename patches/server/{0103-Infinity-bow-settings.patch => 0104-Infinity-bow-settings.patch} (97%) rename patches/server/{0104-Configurable-daylight-cycle.patch => 0105-Configurable-daylight-cycle.patch} (96%) rename patches/server/{0105-Allow-infinite-and-mending-enchantments-together.patch => 0106-Allow-infinite-and-mending-enchantments-together.patch} (100%) rename patches/server/{0106-Furnace-uses-lava-from-underneath.patch => 0107-Furnace-uses-lava-from-underneath.patch} (97%) rename patches/server/{0107-Arrows-should-not-reset-despawn-counter.patch => 0108-Arrows-should-not-reset-despawn-counter.patch} (100%) rename patches/server/{0108-Ability-to-re-add-farmland-mechanics-from-Alpha.patch => 0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch} (95%) rename patches/server/{0109-Add-adjustable-breeding-cooldown-to-config.patch => 0110-Add-adjustable-breeding-cooldown-to-config.patch} (96%) rename patches/server/{0110-Make-entity-breeding-times-configurable.patch => 0111-Make-entity-breeding-times-configurable.patch} (99%) rename patches/server/{0111-Apply-display-names-from-item-forms-of-entities-to-e.patch => 0112-Apply-display-names-from-item-forms-of-entities-to-e.patch} (99%) rename patches/server/{0112-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} (95%) rename patches/server/{0113-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch => 0114-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch} (100%) rename patches/server/{0114-Add-configurable-snowball-damage.patch => 0115-Add-configurable-snowball-damage.patch} (95%) rename patches/server/{0115-Changeable-Mob-Left-Handed-Chance.patch => 0116-Changeable-Mob-Left-Handed-Chance.patch} (95%) rename patches/server/{0116-Add-boat-fall-damage-config.patch => 0117-Add-boat-fall-damage-config.patch} (97%) rename patches/server/{0117-Snow-Golem-rate-of-fire-config.patch => 0118-Snow-Golem-rate-of-fire-config.patch} (100%) rename patches/server/{0118-EMC-Configurable-disable-give-dropping.patch => 0119-EMC-Configurable-disable-give-dropping.patch} (100%) rename patches/server/{0119-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch => 0120-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch} (100%) rename patches/server/{0120-Toggle-for-Zombified-Piglin-death-always-counting-as.patch => 0121-Toggle-for-Zombified-Piglin-death-always-counting-as.patch} (100%) rename patches/server/{0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch => 0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch} (100%) rename patches/server/{0122-Configurable-chance-for-wolves-to-spawn-rabid.patch => 0123-Configurable-chance-for-wolves-to-spawn-rabid.patch} (100%) rename patches/server/{0123-Configurable-default-collar-color.patch => 0124-Configurable-default-collar-color.patch} (100%) rename patches/server/{0124-Phantom-flames-on-swoop.patch => 0125-Phantom-flames-on-swoop.patch} (100%) rename patches/server/{0125-Option-for-chests-to-open-even-with-a-solid-block-on.patch => 0126-Option-for-chests-to-open-even-with-a-solid-block-on.patch} (94%) rename patches/server/{0126-Implement-TPSBar.patch => 0127-Implement-TPSBar.patch} (100%) rename patches/server/{0127-Striders-give-saddle-back.patch => 0128-Striders-give-saddle-back.patch} (100%) rename patches/server/{0128-PlayerBookTooLargeEvent.patch => 0129-PlayerBookTooLargeEvent.patch} (100%) rename patches/server/{0129-Full-netherite-armor-grants-fire-resistance.patch => 0130-Full-netherite-armor-grants-fire-resistance.patch} (97%) rename patches/server/{0130-Fix-rotating-UP-DOWN-CW-and-CCW.patch => 0131-Fix-rotating-UP-DOWN-CW-and-CCW.patch} (100%) rename patches/server/{0131-Add-mobGriefing-bypass-to-everything-affected.patch => 0132-Add-mobGriefing-bypass-to-everything-affected.patch} (100%) rename patches/server/{0132-Config-to-allow-Note-Block-sounds-when-blocked.patch => 0133-Config-to-allow-Note-Block-sounds-when-blocked.patch} (97%) rename patches/server/{0133-Add-EntityTeleportHinderedEvent.patch => 0134-Add-EntityTeleportHinderedEvent.patch} (99%) rename patches/server/{0134-Farmland-trampling-changes.patch => 0135-Farmland-trampling-changes.patch} (97%) rename patches/server/{0135-Movement-options-for-armor-stands.patch => 0136-Movement-options-for-armor-stands.patch} (98%) rename patches/server/{0136-Fix-stuck-in-portals.patch => 0137-Fix-stuck-in-portals.patch} (97%) rename patches/server/{0137-Toggle-for-water-sensitive-mob-damage.patch => 0138-Toggle-for-water-sensitive-mob-damage.patch} (100%) rename patches/server/{0138-Config-to-always-tame-in-Creative.patch => 0139-Config-to-always-tame-in-Creative.patch} (98%) rename patches/server/{0139-End-crystal-explosion-options.patch => 0140-End-crystal-explosion-options.patch} (98%) rename patches/server/{0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch => 0141-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch} (100%) rename patches/server/{0141-Dont-run-with-scissors.patch => 0142-Dont-run-with-scissors.patch} (98%) rename patches/server/{0142-One-Punch-Man.patch => 0143-One-Punch-Man.patch} (96%) rename patches/server/{0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch => 0144-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch} (98%) rename patches/server/{0144-Config-to-ignore-nearby-mobs-when-sleeping.patch => 0145-Config-to-ignore-nearby-mobs-when-sleeping.patch} (96%) rename patches/server/{0145-Add-back-player-spawned-endermite-API.patch => 0146-Add-back-player-spawned-endermite-API.patch} (100%) rename patches/server/{0146-Config-Enderman-aggressiveness-towards-Endermites.patch => 0147-Config-Enderman-aggressiveness-towards-Endermites.patch} (100%) rename patches/server/{0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch => 0148-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch} (100%) rename patches/server/{0148-Tick-fluids-config.patch => 0149-Tick-fluids-config.patch} (97%) rename patches/server/{0149-Config-to-disable-Llama-caravans.patch => 0150-Config-to-disable-Llama-caravans.patch} (100%) rename patches/server/{0150-Config-to-make-Creepers-explode-on-death.patch => 0151-Config-to-make-Creepers-explode-on-death.patch} (100%) rename patches/server/{0151-Configurable-ravager-griefable-blocks-list.patch => 0152-Configurable-ravager-griefable-blocks-list.patch} (100%) rename patches/server/{0152-Sneak-to-bulk-process-composter.patch => 0153-Sneak-to-bulk-process-composter.patch} (98%) rename patches/server/{0153-Config-for-skipping-night.patch => 0154-Config-for-skipping-night.patch} (92%) rename patches/server/{0154-Add-config-for-villager-trading.patch => 0155-Add-config-for-villager-trading.patch} (100%) rename patches/server/{0155-Allow-infinity-on-crossbows.patch => 0156-Allow-infinity-on-crossbows.patch} (100%) rename patches/server/{0156-Drowning-Settings.patch => 0157-Drowning-Settings.patch} (97%) rename patches/server/{0157-Break-individual-slabs-when-sneaking.patch => 0158-Break-individual-slabs-when-sneaking.patch} (97%) rename patches/server/{0158-Config-to-disable-hostile-mob-spawn-on-ice.patch => 0159-Config-to-disable-hostile-mob-spawn-on-ice.patch} (96%) rename patches/server/{0159-Config-to-show-Armor-Stand-arms-on-spawn.patch => 0160-Config-to-show-Armor-Stand-arms-on-spawn.patch} (96%) rename patches/server/{0160-Option-to-make-doors-require-redstone.patch => 0161-Option-to-make-doors-require-redstone.patch} (98%) rename patches/server/{0161-Config-to-allow-for-unsafe-enchants.patch => 0162-Config-to-allow-for-unsafe-enchants.patch} (100%) rename patches/server/{0162-Configurable-sponge-absorption.patch => 0163-Configurable-sponge-absorption.patch} (97%) rename patches/server/{0163-Projectile-offset-config.patch => 0164-Projectile-offset-config.patch} (99%) rename patches/server/{0164-Config-for-powered-rail-activation-distance.patch => 0165-Config-for-powered-rail-activation-distance.patch} (94%) rename patches/server/{0165-Piglin-portal-spawn-modifier.patch => 0166-Piglin-portal-spawn-modifier.patch} (100%) rename patches/server/{0166-Config-to-change-max-number-of-bees.patch => 0167-Config-to-change-max-number-of-bees.patch} (100%) rename patches/server/{0167-Config-for-wither-explosion-radius.patch => 0168-Config-for-wither-explosion-radius.patch} (100%) rename patches/server/{0168-Gamemode-extra-permissions.patch => 0169-Gamemode-extra-permissions.patch} (100%) rename patches/server/{0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch => 0170-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch} (96%) rename patches/server/{0170-Configurable-piston-push-limit.patch => 0171-Configurable-piston-push-limit.patch} (96%) rename patches/server/{0171-Configurable-broadcast-settings.patch => 0172-Configurable-broadcast-settings.patch} (100%) rename patches/server/{0172-Configurable-mob-blindness.patch => 0173-Configurable-mob-blindness.patch} (96%) rename patches/server/{0173-Hide-hidden-players-from-entity-selector.patch => 0174-Hide-hidden-players-from-entity-selector.patch} (100%) rename patches/server/{0174-Config-for-health-to-impact-Creeper-explosion-radius.patch => 0175-Config-for-health-to-impact-Creeper-explosion-radius.patch} (100%) rename patches/server/{0175-Iron-golem-calm-anger-options.patch => 0176-Iron-golem-calm-anger-options.patch} (100%) rename patches/server/{0176-Breedable-parrots.patch => 0177-Breedable-parrots.patch} (100%) rename patches/server/{0177-Configurable-powered-rail-boost-modifier.patch => 0178-Configurable-powered-rail-boost-modifier.patch} (96%) rename patches/server/{0178-Add-config-change-multiplier-critical-damage-value.patch => 0179-Add-config-change-multiplier-critical-damage-value.patch} (96%) rename patches/server/{0179-Option-to-disable-dragon-egg-teleporting.patch => 0180-Option-to-disable-dragon-egg-teleporting.patch} (95%) rename patches/server/{0180-Config-for-unverified-username-message.patch => 0181-Config-for-unverified-username-message.patch} (100%) rename patches/server/{0181-Make-anvil-cumulative-cost-configurable.patch => 0182-Make-anvil-cumulative-cost-configurable.patch} (100%) rename patches/server/{0182-ShulkerBox-allow-oversized-stacks.patch => 0183-ShulkerBox-allow-oversized-stacks.patch} (97%) rename patches/server/{0183-Bee-can-work-when-raining-or-at-night.patch => 0184-Bee-can-work-when-raining-or-at-night.patch} (100%) rename patches/server/{0184-API-for-any-mob-to-burn-daylight.patch => 0185-API-for-any-mob-to-burn-daylight.patch} (100%) rename patches/server/{0185-Config-MobEffect-by-world.patch => 0186-Config-MobEffect-by-world.patch} (98%) rename patches/server/{0186-Beacon-Activation-Range-Configurable.patch => 0187-Beacon-Activation-Range-Configurable.patch} (96%) rename patches/server/{0187-Add-toggle-for-sand-duping-fix.patch => 0188-Add-toggle-for-sand-duping-fix.patch} (95%) rename patches/server/{0188-Add-toggle-for-end-portal-safe-teleporting.patch => 0189-Add-toggle-for-end-portal-safe-teleporting.patch} (97%) rename patches/server/{0189-Flying-Fall-Damage-API.patch => 0190-Flying-Fall-Damage-API.patch} (100%) rename patches/server/{0190-Make-lightning-rod-range-configurable.patch => 0191-Make-lightning-rod-range-configurable.patch} (96%) rename patches/server/{0191-Burp-after-eating-food-fills-hunger-bar-completely.patch => 0192-Burp-after-eating-food-fills-hunger-bar-completely.patch} (97%) rename patches/server/{0192-Allow-player-join-full-server-by-permission.patch => 0193-Allow-player-join-full-server-by-permission.patch} (100%) rename patches/server/{0193-Add-permission-bypass-for-portal-waiting.patch => 0194-Add-permission-bypass-for-portal-waiting.patch} (100%) rename patches/server/{0194-Shulker-spawn-from-bullet-options.patch => 0195-Shulker-spawn-from-bullet-options.patch} (100%) rename patches/server/{0195-Eating-glow-berries-adds-glow-effect.patch => 0196-Eating-glow-berries-adds-glow-effect.patch} (97%) rename patches/server/{0196-Option-to-make-drowned-break-doors.patch => 0197-Option-to-make-drowned-break-doors.patch} (100%) rename patches/server/{0197-Configurable-hunger-starvation-damage.patch => 0198-Configurable-hunger-starvation-damage.patch} (100%) rename patches/server/{0198-Enhance-SysoutCatcher.patch => 0199-Enhance-SysoutCatcher.patch} (100%) rename patches/server/{0199-Armor-click-equip-options.patch => 0200-Armor-click-equip-options.patch} (98%) rename patches/server/{0200-Add-uptime-command.patch => 0201-Add-uptime-command.patch} (100%) rename patches/server/{0201-Structure-seed-options.patch => 0202-Structure-seed-options.patch} (100%) rename patches/server/{0202-Tool-actionable-options.patch => 0203-Tool-actionable-options.patch} (99%) rename patches/server/{0203-Store-placer-on-Block-when-placed.patch => 0204-Store-placer-on-Block-when-placed.patch} (100%) rename patches/server/{0204-Summoner-API.patch => 0205-Summoner-API.patch} (100%) rename patches/server/{0205-Customizable-sleeping-actionbar-messages.patch => 0206-Customizable-sleeping-actionbar-messages.patch} (97%) rename patches/server/{0206-option-to-disable-shulker-box-items-from-dropping-co.patch => 0207-option-to-disable-shulker-box-items-from-dropping-co.patch} (96%) rename patches/server/{0207-Silk-touchable-budding-amethyst.patch => 0208-Silk-touchable-budding-amethyst.patch} (100%) rename patches/server/{0208-Big-dripleaf-tilt-delay.patch => 0209-Big-dripleaf-tilt-delay.patch} (96%) rename patches/server/{0209-Player-ridable-in-water-option.patch => 0210-Player-ridable-in-water-option.patch} (96%) rename patches/server/{0210-Config-to-disable-Enderman-teleport-on-projectile-hi.patch => 0211-Config-to-disable-Enderman-teleport-on-projectile-hi.patch} (100%) rename patches/server/{0211-Add-compass-command.patch => 0212-Add-compass-command.patch} (99%) rename patches/server/{0212-Config-to-prevent-horses-from-standing-with-riders.patch => 0213-Config-to-prevent-horses-from-standing-with-riders.patch} (100%) rename patches/server/{0213-Toggle-for-kinetic-damage.patch => 0214-Toggle-for-kinetic-damage.patch} (95%) rename patches/server/{0214-Add-Option-for-disable-observer-clocks.patch => 0215-Add-Option-for-disable-observer-clocks.patch} (95%) rename patches/server/{0215-Customizeable-Zombie-Villager-curing-times.patch => 0216-Customizeable-Zombie-Villager-curing-times.patch} (100%) rename patches/server/{0216-Option-for-sponges-to-work-on-lava.patch => 0217-Option-for-sponges-to-work-on-lava.patch} (95%) rename patches/server/{0217-Toggle-for-Wither-s-spawn-sound.patch => 0218-Toggle-for-Wither-s-spawn-sound.patch} (100%) rename patches/server/{0218-Cactus-breaks-from-solid-neighbors-config.patch => 0219-Cactus-breaks-from-solid-neighbors-config.patch} (95%) rename patches/server/{0219-Config-to-remove-curse-of-binding-with-weakness.patch => 0220-Config-to-remove-curse-of-binding-with-weakness.patch} (96%) rename patches/server/{0220-Conduit-behavior-configuration.patch => 0221-Conduit-behavior-configuration.patch} (100%) rename patches/server/{0221-Cauldron-fill-chances.patch => 0222-Cauldron-fill-chances.patch} (100%) rename patches/server/{0222-Config-to-allow-mobs-to-pathfind-over-rails.patch => 0223-Config-to-allow-mobs-to-pathfind-over-rails.patch} (96%) rename patches/server/{0223-Shulker-change-color-with-dye.patch => 0224-Shulker-change-color-with-dye.patch} (100%) rename patches/server/{0224-Extended-OfflinePlayer-API.patch => 0225-Extended-OfflinePlayer-API.patch} (100%) rename patches/server/{0225-Added-the-ability-to-add-combustible-items.patch => 0226-Added-the-ability-to-add-combustible-items.patch} (100%) rename patches/server/{0226-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch => 0227-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch} (94%) rename patches/server/{0227-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch => 0228-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch} (98%) rename patches/server/{0228-Shift-right-click-to-use-exp-for-mending.patch => 0229-Shift-right-click-to-use-exp-for-mending.patch} (98%) rename patches/server/{0229-Dolphins-naturally-aggressive-to-players-chance.patch => 0230-Dolphins-naturally-aggressive-to-players-chance.patch} (100%) rename patches/server/{0230-Cows-naturally-aggressive-to-players-chance.patch => 0231-Cows-naturally-aggressive-to-players-chance.patch} (100%) rename patches/server/{0231-Option-for-beds-to-explode-on-villager-sleep.patch => 0232-Option-for-beds-to-explode-on-villager-sleep.patch} (96%) rename patches/server/{0232-Halloween-options-and-optimizations.patch => 0233-Halloween-options-and-optimizations.patch} (100%) rename patches/server/{0233-Config-for-grindstones.patch => 0234-Config-for-grindstones.patch} (100%) rename patches/server/{0234-UPnP-Port-Forwarding.patch => 0235-UPnP-Port-Forwarding.patch} (100%) rename patches/server/{0235-Campfire-option-for-lit-when-placed.patch => 0236-Campfire-option-for-lit-when-placed.patch} (96%) rename patches/server/{0236-options-to-extinguish-fire-blocks-with-snowballs.patch => 0237-options-to-extinguish-fire-blocks-with-snowballs.patch} (98%) rename patches/server/{0237-Add-option-to-disable-zombie-villagers-cure.patch => 0238-Add-option-to-disable-zombie-villagers-cure.patch} (100%) rename patches/server/{0238-Persistent-BlockEntity-Lore-and-DisplayName.patch => 0239-Persistent-BlockEntity-Lore-and-DisplayName.patch} (99%) rename patches/server/{0239-Signs-allow-color-codes.patch => 0240-Signs-allow-color-codes.patch} (98%) rename patches/server/{0240-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch => 0241-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch} (99%) rename patches/server/{0241-Mobs-always-drop-experience.patch => 0242-Mobs-always-drop-experience.patch} (100%) rename patches/server/{0242-Potion-NamespacedKey.patch => 0243-Potion-NamespacedKey.patch} (100%) rename patches/server/{0243-Grindstone-API.patch => 0244-Grindstone-API.patch} (100%) rename patches/server/{0244-Option-to-prevent-spiders-from-climbing-world-border.patch => 0245-Option-to-prevent-spiders-from-climbing-world-border.patch} (100%) rename patches/server/{0245-Ability-for-hoe-to-replant-crops-and-nether-warts.patch => 0246-Ability-for-hoe-to-replant-crops-and-nether-warts.patch} (98%) rename patches/server/{0246-Shearing-jeb-produces-random-color-wool.patch => 0247-Shearing-jeb-produces-random-color-wool.patch} (100%) rename patches/server/{0247-Turtle-eggs-random-tick-crack-chance.patch => 0248-Turtle-eggs-random-tick-crack-chance.patch} (96%) rename patches/server/{0248-Mob-head-visibility-percent.patch => 0249-Mob-head-visibility-percent.patch} (100%) rename patches/server/{0249-Configurable-valid-characters-for-usernames.patch => 0250-Configurable-valid-characters-for-usernames.patch} (100%) rename patches/server/{0250-Shears-can-have-looting-enchantment.patch => 0251-Shears-can-have-looting-enchantment.patch} (100%) rename patches/server/{0251-Stop-bees-from-dying-after-stinging.patch => 0252-Stop-bees-from-dying-after-stinging.patch} (100%) rename patches/server/{0252-Give-bee-counts-in-beehives-to-Purpur-clients.patch => 0253-Give-bee-counts-in-beehives-to-Purpur-clients.patch} (100%) rename patches/server/{0253-Configurable-farmland-trample-height.patch => 0254-Configurable-farmland-trample-height.patch} (97%) rename patches/server/{0254-Configurable-player-pickup-exp-delay.patch => 0255-Configurable-player-pickup-exp-delay.patch} (97%) rename patches/server/{0255-Allow-void-trading.patch => 0256-Allow-void-trading.patch} (93%) rename patches/server/{0256-Dont-eat-blocks-in-non-ticking-chunks.patch => 0257-Dont-eat-blocks-in-non-ticking-chunks.patch} (100%) rename patches/server/{0257-Configurable-phantom-size.patch => 0258-Configurable-phantom-size.patch} (100%) rename patches/server/{0258-Configurable-food-attributes.patch => 0259-Configurable-food-attributes.patch} (100%) rename patches/server/{0259-Max-joins-per-second.patch => 0260-Max-joins-per-second.patch} (100%) rename patches/server/{0260-Configurable-minimum-demand-for-trades.patch => 0261-Configurable-minimum-demand-for-trades.patch} (100%) rename patches/server/{0261-Lobotomize-stuck-villagers.patch => 0262-Lobotomize-stuck-villagers.patch} (100%) rename patches/server/{0262-Option-for-villager-display-trade-item.patch => 0263-Option-for-villager-display-trade-item.patch} (100%) rename patches/server/{0263-Fill-command-max-area-option.patch => 0264-Fill-command-max-area-option.patch} (100%) rename patches/server/{0264-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch => 0265-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch} (95%) rename patches/server/{0265-Config-for-mob-last-hurt-by-player-time.patch => 0266-Config-for-mob-last-hurt-by-player-time.patch} (97%) rename patches/server/{0266-Anvil-repair-damage-options.patch => 0267-Anvil-repair-damage-options.patch} (98%) rename patches/server/{0267-Fix-legacy-colors-in-console.patch => 0268-Fix-legacy-colors-in-console.patch} (100%) rename patches/server/{0268-Option-to-disable-turtle-egg-trampling-with-feather-.patch => 0269-Option-to-disable-turtle-egg-trampling-with-feather-.patch} (96%) rename patches/server/{0269-Add-toggle-for-enchant-level-clamping.patch => 0270-Add-toggle-for-enchant-level-clamping.patch} (100%) rename patches/server/{0270-Config-to-prevent-horses-from-standing-when-hurt.patch => 0271-Config-to-prevent-horses-from-standing-when-hurt.patch} (100%) rename patches/server/{0271-Drop-incompatible-tests.patch => 0272-Drop-incompatible-tests.patch} (100%) rename patches/server/{0272-Implement-configurable-search-radius-for-villagers-t.patch => 0273-Implement-configurable-search-radius-for-villagers-t.patch} (100%) rename patches/server/{0273-Stonecutter-damage.patch => 0274-Stonecutter-damage.patch} (98%) rename patches/server/{0274-Configurable-damage-settings-for-magma-blocks.patch => 0275-Configurable-damage-settings-for-magma-blocks.patch} (96%) rename patches/server/{0275-Add-config-for-snow-on-blue-ice.patch => 0276-Add-config-for-snow-on-blue-ice.patch} (95%) rename patches/server/{0276-Fix-bold-text-in-console.patch => 0277-Fix-bold-text-in-console.patch} (100%) rename patches/server/{0277-Add-log-suppression-for-sent-expired-chat.patch => 0278-Add-log-suppression-for-sent-expired-chat.patch} (100%) delete mode 100644 patches/server/0278-Fix-RandomSource-NPE.patch diff --git a/gradle.properties b/gradle.properties index 90fd3939f..839e8b679 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = 90050ffd54647e2a9f166a90172c1c9fa90e52ff +paperCommit = e4f5e1c9ab867701eb4b3347280ad2dc099b7db0 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0002-Add-pufferfish-added-classes-to-junit-exemptions.patch b/patches/api/0002-Fix-pufferfish-issues.patch similarity index 93% rename from patches/api/0002-Add-pufferfish-added-classes-to-junit-exemptions.patch rename to patches/api/0002-Fix-pufferfish-issues.patch index 5b3f8e57d..b2f08398c 100644 --- a/patches/api/0002-Add-pufferfish-added-classes-to-junit-exemptions.patch +++ b/patches/api/0002-Fix-pufferfish-issues.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Jan 2022 23:05:41 -0600 -Subject: [PATCH] Add pufferfish added classes to junit exemptions +Subject: [PATCH] Fix pufferfish issues diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index b318e8e5b..79c364fb7 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/build.gradle.kts b/build.gradle.kts -index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e0551e929aa 100644 +index 68b8f275f9c9e77a949ca29749a05b469bcdb910..a4a146d9c3e07bdf941d81147ca31daf4689a687 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,8 +9,12 @@ plugins { @@ -38,7 +38,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e05 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -44,12 +48,28 @@ dependencies { +@@ -44,6 +48,14 @@ dependencies { runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") @@ -53,6 +53,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e05 testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") +@@ -52,6 +64,14 @@ dependencies { } val craftbukkitPackageVersion = "1_19_R1" // Paper @@ -67,7 +68,7 @@ index eefbd0a742b5875e0e9826b87c6bd4da66b2d7f7..4f01bbc22b2e94d5415c36c8cd828e05 tasks.jar { archiveClassifier.set("dev") -@@ -62,7 +82,7 @@ tasks.jar { +@@ -64,7 +84,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -2415,7 +2416,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..1eb912ad97f9663bf6bd336ad739f255 this.wasOnGround = this.entity.isOnGround(); this.teleportDelay = 0; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..b0cd9d5ec1a36af1710ebffb420e29a898e27bc8 100644 +index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..8043a1aa9d785c78e220ea54a6ffa7388f2d501e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -689,7 +689,20 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -2445,7 +2446,7 @@ index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..b0cd9d5ec1a36af1710ebffb420e29a8 // Paper start - optimise random block ticking private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos(); - private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); -+ private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - getter ++ // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super // Paper end + private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish @@ -3449,13 +3450,15 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951 final String id; private final GameRules.Category category; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee65365008693 100644 +index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -272,6 +272,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -272,6 +272,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public abstract ResourceKey getTypeKey(); ++ protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter ++ + // Pufferfish start - ensure these get inlined + private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection; + @Override public final int getMaxBuildHeight() { return this.maxBuildHeight; } @@ -3468,7 +3471,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653 protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper -@@ -294,6 +303,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -294,6 +305,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { }); final DimensionType dimensionmanager = (DimensionType) holder.value(); @@ -3482,7 +3485,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653 this.dimension = resourcekey; this.isClientSide = flag; if (dimensionmanager.coordinateScale() != 1.0D) { -@@ -410,6 +426,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -410,6 +428,91 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return null; } @@ -3574,7 +3577,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653 public boolean isInWorldBounds(BlockPos pos) { return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check } -@@ -897,13 +998,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -897,13 +1000,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable { try { tickConsumer.accept(entity); MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick @@ -3590,7 +3593,7 @@ index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..683ab88e76b53331e5d9fbcb0e1ee653 // Paper end } } -@@ -1389,6 +1490,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1389,6 +1492,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } public ProfilerFiller getProfiler() { diff --git a/patches/server/0002-Fix-pufferfish-issues.patch b/patches/server/0002-Fix-pufferfish-issues.patch new file mode 100644 index 000000000..31c0e75be --- /dev/null +++ b/patches/server/0002-Fix-pufferfish-issues.patch @@ -0,0 +1,45 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Sun, 12 Jun 2022 09:18:57 -0500 +Subject: [PATCH] Fix pufferfish issues + + +diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java +index 8043a1aa9d785c78e220ea54a6ffa7388f2d501e..f8a813817d630993670092f0681a5bd8965cbb19 100644 +--- a/src/main/java/net/minecraft/server/level/ServerLevel.java ++++ b/src/main/java/net/minecraft/server/level/ServerLevel.java +@@ -769,7 +769,7 @@ public class ServerLevel extends Level implements WorldGenLevel { + } + // Paper start - optimise random block ticking + private final BlockPos.MutableBlockPos chunkTickMutablePosition = new BlockPos.MutableBlockPos(); +- // private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super ++ private final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); // Pufferfish - moved to super // Purpur - dont break ABI + // Paper end + + private int currentIceAndSnowTick = 0; protected void resetIceAndSnowTick() { this.currentIceAndSnowTick = this.randomTickRandom.nextInt(16); } // Pufferfish +diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java +index e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9..ef13ff67ed29e277fe3bbfeb9c8f414bd305d119 100644 +--- a/src/main/java/net/minecraft/world/level/Level.java ++++ b/src/main/java/net/minecraft/world/level/Level.java +@@ -272,7 +272,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { + + public abstract ResourceKey getTypeKey(); + +- protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter ++ //protected final io.papermc.paper.util.math.ThreadUnsafeRandom randomTickRandom = new io.papermc.paper.util.math.ThreadUnsafeRandom(); public net.minecraft.util.RandomSource getThreadUnsafeRandom() { return this.randomTickRandom; } // Pufferfish - move thread unsafe random initialization // Pufferfish - getter // Purpur - dont break ABI + + // Pufferfish start - ensure these get inlined + private final int minBuildHeight, minSection, height, maxBuildHeight, maxSection; +diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +index ec23064d5a6d70508fad7cffc6126cfd6f7a62cb..b4e70dd36b426b9ca95e0a9953f1d7c89203db31 100644 +--- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java ++++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +@@ -136,7 +136,7 @@ public class LevelChunk extends ChunkAccess { + this.fluidTicks = fluidTickScheduler; + // CraftBukkit start + this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this); +- this.lightningTick = this.level.getThreadUnsafeRandom().nextInt(100000) << 1; // Pufferfish - initialize lightning tick ++ this.lightningTick = java.util.concurrent.ThreadLocalRandom.current().nextInt(100000) << 1; // Pufferfish - initialize lightning tick // Purpur - any random will do + } + + public org.bukkit.Chunk bukkitChunk; diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0003-Rebrand.patch similarity index 99% rename from patches/server/0002-Rebrand.patch rename to patches/server/0003-Rebrand.patch index b3cf7d6df..6a53937cc 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index 4f01bbc22b2e94d5415c36c8cd828e0551e929aa..347382587ca30b26ff26dd78622e9f2f20e64e6d 100644 +index a4a146d9c3e07bdf941d81147ca31daf4689a687..00d128eba3e778927bc33b71c1145051a0c142f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { @@ -27,7 +27,7 @@ index 4f01bbc22b2e94d5415c36c8cd828e0551e929aa..347382587ca30b26ff26dd78622e9f2f runtimeOnly("org.apache.maven:maven-resolver-provider:3.8.5") runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") -@@ -82,7 +85,7 @@ tasks.jar { +@@ -84,7 +87,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -36,7 +36,7 @@ index 4f01bbc22b2e94d5415c36c8cd828e0551e929aa..347382587ca30b26ff26dd78622e9f2f "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -170,7 +173,7 @@ fun TaskContainer.registerRunTask( +@@ -172,7 +175,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch similarity index 99% rename from patches/server/0003-Purpur-config-files.patch rename to patches/server/0004-Purpur-config-files.patch index 4cbdb4a46..c34d80f19 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -84,7 +84,7 @@ index 85daf1de8ca0d48b348d1195c4243368999efee0..23454b660c123f4309d1b6eaab8f626f io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider // Paper end diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 683ab88e76b53331e5d9fbcb0e1ee65365008693..32518aa959e3ea95376ac2c1904aa51fb7e52508 100644 +index ef13ff67ed29e277fe3bbfeb9c8f414bd305d119..7e9e1fd5eb9f44c80d180534cd1211e8754b3afd 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -175,6 +175,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -96,7 +96,7 @@ index 683ab88e76b53331e5d9fbcb0e1ee65365008693..32518aa959e3ea95376ac2c1904aa51f public final co.aikar.timings.WorldTimingsHandler timings; // Paper public static BlockPos lastPhysicsProblem; // Spigot private org.spigotmc.TickLimiter entityLimiter; -@@ -284,6 +286,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -286,6 +288,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { protected Level(WritableLevelData worlddatamutable, ResourceKey resourcekey, Holder holder, Supplier supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper diff --git a/patches/server/0004-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch similarity index 100% rename from patches/server/0004-Purpur-client-support.patch rename to patches/server/0005-Purpur-client-support.patch diff --git a/patches/server/0005-Fix-decompile-errors.patch b/patches/server/0006-Fix-decompile-errors.patch similarity index 100% rename from patches/server/0005-Fix-decompile-errors.patch rename to patches/server/0006-Fix-decompile-errors.patch diff --git a/patches/server/0006-Component-related-conveniences.patch b/patches/server/0007-Component-related-conveniences.patch similarity index 100% rename from patches/server/0006-Component-related-conveniences.patch rename to patches/server/0007-Component-related-conveniences.patch diff --git a/patches/server/0007-Ridables.patch b/patches/server/0008-Ridables.patch similarity index 99% rename from patches/server/0007-Ridables.patch rename to patches/server/0008-Ridables.patch index 24bac246e..5a9ec1749 100644 --- a/patches/server/0007-Ridables.patch +++ b/patches/server/0008-Ridables.patch @@ -34,7 +34,7 @@ index 783b81e5252a689683264a494a30fb668b43a986..d4b05231b6b631f382d7e5fe6c42eba3 this.profiler.push(() -> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b0cd9d5ec1a36af1710ebffb420e29a898e27bc8..cabd856dc050359bbeb1e138535e44bf2a294d5c 100644 +index f8a813817d630993670092f0681a5bd8965cbb19..dade21560eb26011f8d59d277ffdc0b65d6e6c80 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0008-Configurable-entity-base-attributes.patch b/patches/server/0009-Configurable-entity-base-attributes.patch similarity index 100% rename from patches/server/0008-Configurable-entity-base-attributes.patch rename to patches/server/0009-Configurable-entity-base-attributes.patch diff --git a/patches/server/0009-Timings-stuff.patch b/patches/server/0010-Timings-stuff.patch similarity index 100% rename from patches/server/0009-Timings-stuff.patch rename to patches/server/0010-Timings-stuff.patch diff --git a/patches/server/0010-Barrels-and-enderchests-6-rows.patch b/patches/server/0011-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from patches/server/0010-Barrels-and-enderchests-6-rows.patch rename to patches/server/0011-Barrels-and-enderchests-6-rows.patch diff --git a/patches/server/0011-Llama-API.patch b/patches/server/0012-Llama-API.patch similarity index 100% rename from patches/server/0011-Llama-API.patch rename to patches/server/0012-Llama-API.patch diff --git a/patches/server/0012-AFK-API.patch b/patches/server/0013-AFK-API.patch similarity index 99% rename from patches/server/0012-AFK-API.patch rename to patches/server/0013-AFK-API.patch index d2d099a54..8bef5d8c4 100644 --- a/patches/server/0012-AFK-API.patch +++ b/patches/server/0013-AFK-API.patch @@ -276,7 +276,7 @@ index 1717eb5f8fdaf8432113a297602f2eaa10559583..ef8f2dd75b04534c454205cadf2bb5b0 public static int barrelRows = 3; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c38d9583d8ce50670d78b60d92c90d1d5eb4bbfc..01a2d17790b3adbc63fe742b9e5c11dd2e0d2e68 100644 +index bf4c17c61dcc230286fe9ce4cb0855f0f710aad0..f4f1ebe68143270a940ac839c3b6df2775b3a0ca 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -89,6 +89,24 @@ public class PurpurWorldConfig { diff --git a/patches/server/0013-Bring-back-server-name.patch b/patches/server/0014-Bring-back-server-name.patch similarity index 100% rename from patches/server/0013-Bring-back-server-name.patch rename to patches/server/0014-Bring-back-server-name.patch diff --git a/patches/server/0014-Configurable-server-mod-name.patch b/patches/server/0015-Configurable-server-mod-name.patch similarity index 100% rename from patches/server/0014-Configurable-server-mod-name.patch rename to patches/server/0015-Configurable-server-mod-name.patch diff --git a/patches/server/0015-LivingEntity-safeFallDistance.patch b/patches/server/0016-LivingEntity-safeFallDistance.patch similarity index 100% rename from patches/server/0015-LivingEntity-safeFallDistance.patch rename to patches/server/0016-LivingEntity-safeFallDistance.patch diff --git a/patches/server/0016-Lagging-threshold.patch b/patches/server/0017-Lagging-threshold.patch similarity index 100% rename from patches/server/0016-Lagging-threshold.patch rename to patches/server/0017-Lagging-threshold.patch diff --git a/patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch b/patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch similarity index 100% rename from patches/server/0017-PlayerSetSpawnerTypeWithEggEvent.patch rename to patches/server/0018-PlayerSetSpawnerTypeWithEggEvent.patch diff --git a/patches/server/0018-EMC-MonsterEggSpawnEvent.patch b/patches/server/0019-EMC-MonsterEggSpawnEvent.patch similarity index 100% rename from patches/server/0018-EMC-MonsterEggSpawnEvent.patch rename to patches/server/0019-EMC-MonsterEggSpawnEvent.patch diff --git a/patches/server/0019-Player-invulnerabilities.patch b/patches/server/0020-Player-invulnerabilities.patch similarity index 98% rename from patches/server/0019-Player-invulnerabilities.patch rename to patches/server/0020-Player-invulnerabilities.patch index da0ebb771..98fed52ab 100644 --- a/patches/server/0019-Player-invulnerabilities.patch +++ b/patches/server/0020-Player-invulnerabilities.patch @@ -146,7 +146,7 @@ index 16aa402f7b9ff8c2f1748bc4c82005ccf093ceb4..5cd36fef58afdc60d58acde8809f6507 // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 01a2d17790b3adbc63fe742b9e5c11dd2e0d2e68..81524c4f676766c09125187876b46e0704294880 100644 +index f4f1ebe68143270a940ac839c3b6df2775b3a0ca..9dcdc3c57c774d260fb4849e7a90922101c0dd49 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,6 +94,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0020-Anvil-API.patch b/patches/server/0021-Anvil-API.patch similarity index 100% rename from patches/server/0020-Anvil-API.patch rename to patches/server/0021-Anvil-API.patch diff --git a/patches/server/0021-Configurable-villager-brain-ticks.patch b/patches/server/0022-Configurable-villager-brain-ticks.patch similarity index 100% rename from patches/server/0021-Configurable-villager-brain-ticks.patch rename to patches/server/0022-Configurable-villager-brain-ticks.patch diff --git a/patches/server/0022-Alternative-Keepalive-Handling.patch b/patches/server/0023-Alternative-Keepalive-Handling.patch similarity index 100% rename from patches/server/0022-Alternative-Keepalive-Handling.patch rename to patches/server/0023-Alternative-Keepalive-Handling.patch diff --git a/patches/server/0023-Silk-touch-spawners.patch b/patches/server/0024-Silk-touch-spawners.patch similarity index 99% rename from patches/server/0023-Silk-touch-spawners.patch rename to patches/server/0024-Silk-touch-spawners.patch index 9fe77be76..103499b02 100644 --- a/patches/server/0023-Silk-touch-spawners.patch +++ b/patches/server/0024-Silk-touch-spawners.patch @@ -127,7 +127,7 @@ index 39bc91423c830d69eff1996881373296f322f06a..e0d8bd28576f16822a584f3514dbcb8f int i = 15 + worldserver.random.nextInt(15) + worldserver.random.nextInt(15); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 93d89fb27044e5e97574122b0e7863694d245bf0..50b0cdb6c95fc076216b41018b2bd1a30a643efa 100644 +index 45f3d6daa4e3a90c55168da092595324af0a5a19..10b8183cf8af86676efd5486f09493eac59840d2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -111,6 +111,38 @@ public class PurpurWorldConfig { diff --git a/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch b/patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch similarity index 97% rename from patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch rename to patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch index f4eb7eec7..7797e513f 100644 --- a/patches/server/0024-MC-168772-Fix-Add-turtle-egg-block-options.patch +++ b/patches/server/0025-MC-168772-Fix-Add-turtle-egg-block-options.patch @@ -50,7 +50,7 @@ index 7d25fb0fc64a4f559fe206198fde900afa06f258..1a12fee99a8b69fc6c01e1e217575c7c } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 50b0cdb6c95fc076216b41018b2bd1a30a643efa..4d9f7a90928fd4a3dd514799df3661f4ceb2ca36 100644 +index 10b8183cf8af86676efd5486f09493eac59840d2..39991fb579e6b0df221f62d544f4d0ab79d2a769 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -143,6 +143,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0025-Fix-vanilla-command-permission-handler.patch b/patches/server/0026-Fix-vanilla-command-permission-handler.patch similarity index 100% rename from patches/server/0025-Fix-vanilla-command-permission-handler.patch rename to patches/server/0026-Fix-vanilla-command-permission-handler.patch diff --git a/patches/server/0026-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0027-Logger-settings-suppressing-pointless-logs.patch similarity index 100% rename from patches/server/0026-Logger-settings-suppressing-pointless-logs.patch rename to patches/server/0027-Logger-settings-suppressing-pointless-logs.patch diff --git a/patches/server/0027-Disable-outdated-build-check.patch b/patches/server/0028-Disable-outdated-build-check.patch similarity index 100% rename from patches/server/0027-Disable-outdated-build-check.patch rename to patches/server/0028-Disable-outdated-build-check.patch diff --git a/patches/server/0028-Giants-AI-settings.patch b/patches/server/0029-Giants-AI-settings.patch similarity index 100% rename from patches/server/0028-Giants-AI-settings.patch rename to patches/server/0029-Giants-AI-settings.patch diff --git a/patches/server/0029-Zombie-horse-naturally-spawn.patch b/patches/server/0030-Zombie-horse-naturally-spawn.patch similarity index 97% rename from patches/server/0029-Zombie-horse-naturally-spawn.patch rename to patches/server/0030-Zombie-horse-naturally-spawn.patch index b29e8bb99..937c167a7 100644 --- a/patches/server/0029-Zombie-horse-naturally-spawn.patch +++ b/patches/server/0030-Zombie-horse-naturally-spawn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Zombie horse naturally spawn diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index cabd856dc050359bbeb1e138535e44bf2a294d5c..5f07e8669336d4ce27aa5f7837faf83682a9dff3 100644 +index dade21560eb26011f8d59d277ffdc0b65d6e6c80..1140edb12dba385ff572b2cd2ab1a4b32eab2a1a 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -792,9 +792,15 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0030-Charged-creeper-naturally-spawn.patch b/patches/server/0031-Charged-creeper-naturally-spawn.patch similarity index 100% rename from patches/server/0030-Charged-creeper-naturally-spawn.patch rename to patches/server/0031-Charged-creeper-naturally-spawn.patch diff --git a/patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch b/patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch similarity index 100% rename from patches/server/0031-Rabbit-naturally-spawn-toast-and-killer.patch rename to patches/server/0032-Rabbit-naturally-spawn-toast-and-killer.patch diff --git a/patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch b/patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch similarity index 100% rename from patches/server/0032-Fix-outdated-server-showing-in-ping-before-server-fu.patch rename to patches/server/0033-Fix-outdated-server-showing-in-ping-before-server-fu.patch diff --git a/patches/server/0033-Tulips-change-fox-type.patch b/patches/server/0034-Tulips-change-fox-type.patch similarity index 100% rename from patches/server/0033-Tulips-change-fox-type.patch rename to patches/server/0034-Tulips-change-fox-type.patch diff --git a/patches/server/0034-Breedable-Polar-Bears.patch b/patches/server/0035-Breedable-Polar-Bears.patch similarity index 100% rename from patches/server/0034-Breedable-Polar-Bears.patch rename to patches/server/0035-Breedable-Polar-Bears.patch diff --git a/patches/server/0035-Chickens-can-retaliate.patch b/patches/server/0036-Chickens-can-retaliate.patch similarity index 100% rename from patches/server/0035-Chickens-can-retaliate.patch rename to patches/server/0036-Chickens-can-retaliate.patch diff --git a/patches/server/0036-Add-option-to-set-armorstand-step-height.patch b/patches/server/0037-Add-option-to-set-armorstand-step-height.patch similarity index 94% rename from patches/server/0036-Add-option-to-set-armorstand-step-height.patch rename to patches/server/0037-Add-option-to-set-armorstand-step-height.patch index ce46fabeb..cf6f43285 100644 --- a/patches/server/0036-Add-option-to-set-armorstand-step-height.patch +++ b/patches/server/0037-Add-option-to-set-armorstand-step-height.patch @@ -17,7 +17,7 @@ index 150afceb491cfd254c0f1b84800e6df14cf26676..ba9e851eebb25edf94efe8dfbd591e26 if (!this.canTick) { if (this.noTickPoseDirty) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 62bb7fafb686170f8ae6d2f7c7b10d04365e433c..7ab9864662b1a3de509e43b2177272078a7f3882 100644 +index 442e8dceeee7cd7e05bad5ce722b0dce121978ae..1c47c36d1fd31a270b28f1e92a6855a6a236ffa6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -89,6 +89,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0037-Cat-spawning-options.patch b/patches/server/0038-Cat-spawning-options.patch similarity index 100% rename from patches/server/0037-Cat-spawning-options.patch rename to patches/server/0038-Cat-spawning-options.patch diff --git a/patches/server/0038-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch b/patches/server/0039-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/0039-MC-147659-Fix-non-black-cats-spawning-in-swamp-huts.patch diff --git a/patches/server/0039-Cows-eat-mushrooms.patch b/patches/server/0040-Cows-eat-mushrooms.patch similarity index 100% rename from patches/server/0039-Cows-eat-mushrooms.patch rename to patches/server/0040-Cows-eat-mushrooms.patch diff --git a/patches/server/0040-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0041-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/0041-Fix-cow-rotation-when-shearing-mooshroom.patch diff --git a/patches/server/0041-Pigs-give-saddle-back.patch b/patches/server/0042-Pigs-give-saddle-back.patch similarity index 100% rename from patches/server/0041-Pigs-give-saddle-back.patch rename to patches/server/0042-Pigs-give-saddle-back.patch diff --git a/patches/server/0042-Snowman-drop-and-put-back-pumpkin.patch b/patches/server/0043-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/0043-Snowman-drop-and-put-back-pumpkin.patch diff --git a/patches/server/0043-Ender-dragon-always-drop-full-exp.patch b/patches/server/0044-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/0044-Ender-dragon-always-drop-full-exp.patch diff --git a/patches/server/0044-Signs-editable-on-right-click.patch b/patches/server/0045-Signs-editable-on-right-click.patch similarity index 96% rename from patches/server/0044-Signs-editable-on-right-click.patch rename to patches/server/0045-Signs-editable-on-right-click.patch index 7d9ad84e4..60df97e24 100644 --- a/patches/server/0044-Signs-editable-on-right-click.patch +++ b/patches/server/0045-Signs-editable-on-right-click.patch @@ -35,7 +35,7 @@ index ed3d78494735ceda14ad0ea23adeadc374f3b35e..a0d23b7e244e7df8a462b801dee18fd4 } else { return InteractionResult.PASS; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fa3ae133ed06e4b57a4bc3ea2a32b5f1aef2636b..79e618ce91686370d439a5f6ed6a7f46f579ae74 100644 +index 7b48454ddf2d838e8c1d418f8218fbf9b1578d38..0584304bceb4d4da8854265700f3528e91a99980 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -148,6 +148,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch similarity index 94% rename from patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch rename to patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch index d23ffa38e..f20a53fda 100644 --- a/patches/server/0045-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0046-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -18,7 +18,7 @@ index d089887030ac7c7a79abca97134ba9291e244059..4208833252a5b5c74d294dc3435869d7 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 79e618ce91686370d439a5f6ed6a7f46f579ae74..620a68fbef5d3bc8894ee83d9c52ec8ba58e98d3 100644 +index 0584304bceb4d4da8854265700f3528e91a99980..c21f24c3ecbde5dfd7a81f221e6e6ce157295660 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -148,6 +148,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0046-Minecart-settings-and-WASD-controls.patch b/patches/server/0047-Minecart-settings-and-WASD-controls.patch similarity index 99% rename from patches/server/0046-Minecart-settings-and-WASD-controls.patch rename to patches/server/0047-Minecart-settings-and-WASD-controls.patch index 7a892aae7..47f64a1d8 100644 --- a/patches/server/0046-Minecart-settings-and-WASD-controls.patch +++ b/patches/server/0047-Minecart-settings-and-WASD-controls.patch @@ -148,7 +148,7 @@ index 939aca929038b90738c9b78c2fc3611088b18e72..2fe9daf2a1a4a007c983115503915981 protected final float explosionResistance; protected final boolean isRandomlyTicking; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 620a68fbef5d3bc8894ee83d9c52ec8ba58e98d3..e42af09797a6e0ad976c4f734f1ad714bc377383 100644 +index c21f24c3ecbde5dfd7a81f221e6e6ce157295660..2611af43afada9bd46bed7cd342e818afeb95c1c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,6 +94,68 @@ public class PurpurWorldConfig { diff --git a/patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch similarity index 96% rename from patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch rename to patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch index f9454ef9a..046f60f46 100644 --- a/patches/server/0047-Disable-loot-drops-on-death-by-cramming.patch +++ b/patches/server/0048-Disable-loot-drops-on-death-by-cramming.patch @@ -25,7 +25,7 @@ index 6c769141376f6995d6572d5e3cf3a999ff954e82..ccc034d345d4c7ea1b8317023e2e410d // CraftBukkit start - Call death event // Paper start - call advancement triggers with correct entity equipment org.bukkit.event.entity.EntityDeathEvent deathEvent = CraftEventFactory.callEntityDeathEvent(this, this.drops, () -> { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e42af09797a6e0ad976c4f734f1ad714bc377383..eb86bc06b2e7c6c7655d6111de96837ad921cbbb 100644 +index 2611af43afada9bd46bed7cd342e818afeb95c1c..85fdd1712640b4b3f87810294f49f1565e6fd750 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,6 +94,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch b/patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch similarity index 95% rename from patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch rename to patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch index afee8f946..1f19dd29e 100644 --- a/patches/server/0048-Option-to-toggle-milk-curing-bad-omen.patch +++ b/patches/server/0049-Option-to-toggle-milk-curing-bad-omen.patch @@ -28,7 +28,7 @@ index f33977d95b6db473be4f95075ba99caf90ad0220..56dc04d8875971ee9a5d077a695509af return stack.isEmpty() ? new ItemStack(Items.BUCKET) : stack; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index eb86bc06b2e7c6c7655d6111de96837ad921cbbb..379d9c40fc04efc21a9a0f05f06e05959fca1630 100644 +index 85fdd1712640b4b3f87810294f49f1565e6fd750..f6292685e1a198d6e8ec4a1c77343a8d76565078 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -95,8 +95,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0049-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0050-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/0050-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/0051-Fix-the-dead-lagging-the-server.patch similarity index 100% rename from patches/server/0050-Fix-the-dead-lagging-the-server.patch rename to patches/server/0051-Fix-the-dead-lagging-the-server.patch diff --git a/patches/server/0051-Skip-events-if-there-s-no-listeners.patch b/patches/server/0052-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/0052-Skip-events-if-there-s-no-listeners.patch diff --git a/patches/server/0052-Add-permission-for-F3-N-debug.patch b/patches/server/0053-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/0053-Add-permission-for-F3-N-debug.patch diff --git a/patches/server/0053-Configurable-TPS-Catchup.patch b/patches/server/0054-Configurable-TPS-Catchup.patch similarity index 100% rename from patches/server/0053-Configurable-TPS-Catchup.patch rename to patches/server/0054-Configurable-TPS-Catchup.patch diff --git a/patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0055-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch similarity index 96% rename from patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch rename to patches/server/0055-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch index 73d550409..2d42fd6e5 100644 --- a/patches/server/0054-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch +++ b/patches/server/0055-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch @@ -18,7 +18,7 @@ index 1b31b32d42eeb54680b902cd7e82d10ba7daa5d0..5be708a76642d4133757c5d181b3c541 if (!this.level.isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) { this.spawnAtLocation(this.getPickupItem(), 0.1F); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 379d9c40fc04efc21a9a0f05f06e05959fca1630..725d29b3e79e45d95635b73c9ea783ff2a04ad39 100644 +index f6292685e1a198d6e8ec4a1c77343a8d76565078..ca4c6ed817cb2b4b53ea48ecc962564d3576d7d9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -96,9 +96,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0055-Add-enderman-and-creeper-griefing-controls.patch b/patches/server/0056-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/0056-Add-enderman-and-creeper-griefing-controls.patch diff --git a/patches/server/0056-Villagers-follow-emerald-blocks.patch b/patches/server/0057-Villagers-follow-emerald-blocks.patch similarity index 100% rename from patches/server/0056-Villagers-follow-emerald-blocks.patch rename to patches/server/0057-Villagers-follow-emerald-blocks.patch diff --git a/patches/server/0057-Allow-leashing-villagers.patch b/patches/server/0058-Allow-leashing-villagers.patch similarity index 100% rename from patches/server/0057-Allow-leashing-villagers.patch rename to patches/server/0058-Allow-leashing-villagers.patch diff --git a/patches/server/0058-Implement-infinite-liquids.patch b/patches/server/0059-Implement-infinite-liquids.patch similarity index 98% rename from patches/server/0058-Implement-infinite-liquids.patch rename to patches/server/0059-Implement-infinite-liquids.patch index 6c7e0e71c..ffb1ce278 100644 --- a/patches/server/0058-Implement-infinite-liquids.patch +++ b/patches/server/0059-Implement-infinite-liquids.patch @@ -81,7 +81,7 @@ index ac33ba631f4b0ae0e08bff5748440ef5b76c2117..29068ca2df90ab0351b91cd0aa3e224c @Override protected void beforeDestroyingBlock(LevelAccessor world, BlockPos pos, BlockState state, BlockPos source) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9cab405a67c76e920754d0ba10978cf5476f1b82..111b93dd9f3eecb5b88d3d0382670dd864cca03e 100644 +index a361faa6723067fb0f9bac1fc9036d92cb0cd9ef..91c4776aab25fc42ff41a215015493f782e4d78c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -224,6 +224,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0059-Make-lava-flow-speed-configurable.patch b/patches/server/0060-Make-lava-flow-speed-configurable.patch similarity index 95% rename from patches/server/0059-Make-lava-flow-speed-configurable.patch rename to patches/server/0060-Make-lava-flow-speed-configurable.patch index 753db88f3..484e0bb05 100644 --- a/patches/server/0059-Make-lava-flow-speed-configurable.patch +++ b/patches/server/0060-Make-lava-flow-speed-configurable.patch @@ -18,7 +18,7 @@ index d96c52a55cad5f6127b17e1307fe341e8bdd1335..87643b76ea46ddfe0281e8a97a5b0996 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 111b93dd9f3eecb5b88d3d0382670dd864cca03e..8dadd94bf8950f58d4f810d13377a44c7114ccb3 100644 +index 91c4776aab25fc42ff41a215015493f782e4d78c..25e377ce3d916d931143bc54585d12c39e31f581 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -226,9 +226,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0060-Add-player-death-exp-control-options.patch b/patches/server/0061-Add-player-death-exp-control-options.patch similarity index 97% rename from patches/server/0060-Add-player-death-exp-control-options.patch rename to patches/server/0061-Add-player-death-exp-control-options.patch index 7b7f238a2..3a564df04 100644 --- a/patches/server/0060-Add-player-death-exp-control-options.patch +++ b/patches/server/0061-Add-player-death-exp-control-options.patch @@ -31,7 +31,7 @@ index 74f14215280005a4d6fb35a77e2f1c4858250f2f..e0ea8b1b3ccde9616a721d677a8217b2 return 0; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8dadd94bf8950f58d4f810d13377a44c7114ccb3..b6a436b665134776c8f3f12acf082d07972d21d3 100644 +index 25e377ce3d916d931143bc54585d12c39e31f581..12ac9c973d39713b62106be8040a09b094ba38f4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -172,6 +172,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0061-Configurable-void-damage-height-and-damage.patch b/patches/server/0062-Configurable-void-damage-height-and-damage.patch similarity index 97% rename from patches/server/0061-Configurable-void-damage-height-and-damage.patch rename to patches/server/0062-Configurable-void-damage-height-and-damage.patch index 2cf2339a0..fdf5644ff 100644 --- a/patches/server/0061-Configurable-void-damage-height-and-damage.patch +++ b/patches/server/0062-Configurable-void-damage-height-and-damage.patch @@ -31,7 +31,7 @@ index bc19439abb1cbf548b1eda2a6527d9e825ea34ab..40c716bd22d54f7f669d570d1bebcb18 protected void updateSwingTime() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b6a436b665134776c8f3f12acf082d07972d21d3..6bd149c740ead63036c3cb80e6c74c1c2e0b9420 100644 +index 12ac9c973d39713b62106be8040a09b094ba38f4..7944d3ed8c17ee80ea9913188fb45feda274e036 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,10 +97,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0062-Add-canSaveToDisk-to-Entity.patch b/patches/server/0063-Add-canSaveToDisk-to-Entity.patch similarity index 100% rename from patches/server/0062-Add-canSaveToDisk-to-Entity.patch rename to patches/server/0063-Add-canSaveToDisk-to-Entity.patch diff --git a/patches/server/0063-Dispenser-curse-of-binding-protection.patch b/patches/server/0064-Dispenser-curse-of-binding-protection.patch similarity index 97% rename from patches/server/0063-Dispenser-curse-of-binding-protection.patch rename to patches/server/0064-Dispenser-curse-of-binding-protection.patch index a075f9105..892212aa2 100644 --- a/patches/server/0063-Dispenser-curse-of-binding-protection.patch +++ b/patches/server/0064-Dispenser-curse-of-binding-protection.patch @@ -43,7 +43,7 @@ index baa7e055d8ee4a153842128b07984b9f6deac6ca..014dd3aa8a7313d978d4781a1b7c6f53 // CraftBukkit start Level world = pointer.getLevel(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 6bd149c740ead63036c3cb80e6c74c1c2e0b9420..57231e4550121f836fd85f86ecb6fd1be7bdd457 100644 +index 7944d3ed8c17ee80ea9913188fb45feda274e036..3481c204c118d3990b158e9dbd1313e37e701184 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -227,6 +227,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch b/patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch similarity index 95% rename from patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch rename to patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch index aaee17c0d..3305a825c 100644 --- a/patches/server/0064-Add-option-for-boats-to-eject-players-on-land.patch +++ b/patches/server/0065-Add-option-for-boats-to-eject-players-on-land.patch @@ -17,7 +17,7 @@ index eb753323f67badb1bed28405c07b03078e322b44..c9ce0f1f798ee73e985798e7e7271aa5 } else { return Boat.Status.IN_AIR; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 57231e4550121f836fd85f86ecb6fd1be7bdd457..ed4bc851879b1a9af3450213b94fe8c26af95174 100644 +index 3481c204c118d3990b158e9dbd1313e37e701184..dacd070f4b0925a4c8649f5e8caafd01d00cba8f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,12 +94,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0065-Mending-mends-most-damages-equipment-first.patch b/patches/server/0066-Mending-mends-most-damages-equipment-first.patch similarity index 98% rename from patches/server/0065-Mending-mends-most-damages-equipment-first.patch rename to patches/server/0066-Mending-mends-most-damages-equipment-first.patch index 96f3ed64f..aeb9d0e09 100644 --- a/patches/server/0065-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0066-Mending-mends-most-damages-equipment-first.patch @@ -73,7 +73,7 @@ index 22925b2f44fc510832ef07290d3109f0394f7d30..4afa30753a90d9bbd3c71b21cb4a8dea public static Map.Entry getRandomItemWith(Enchantment enchantment, LivingEntity entity) { return getRandomItemWith(enchantment, entity, (stack) -> { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ed4bc851879b1a9af3450213b94fe8c26af95174..b1c3c835c3bbba5b8cdbafbe3221e4427015ffec 100644 +index dacd070f4b0925a4c8649f5e8caafd01d00cba8f..0edb6ec9678f0fc8a1236622490ff67dfb93dd55 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -94,6 +94,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0066-Add-5-second-tps-average-in-tps.patch b/patches/server/0067-Add-5-second-tps-average-in-tps.patch similarity index 100% rename from patches/server/0066-Add-5-second-tps-average-in-tps.patch rename to patches/server/0067-Add-5-second-tps-average-in-tps.patch diff --git a/patches/server/0067-Implement-elytra-settings.patch b/patches/server/0068-Implement-elytra-settings.patch similarity index 98% rename from patches/server/0067-Implement-elytra-settings.patch rename to patches/server/0068-Implement-elytra-settings.patch index 0885223b0..91fb8023b 100644 --- a/patches/server/0067-Implement-elytra-settings.patch +++ b/patches/server/0068-Implement-elytra-settings.patch @@ -99,7 +99,7 @@ index 998758be827efbcb7693ed36ab1dffc0ef0369bf..5beaafec0759543d3bddf99028c97d0d entityhuman.startAutoSpinAttack(20); if (entityhuman.isOnGround()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b1c3c835c3bbba5b8cdbafbe3221e4427015ffec..f243cee2b81e27d2ff7fdc7356bf71d2e369ad2a 100644 +index 0edb6ec9678f0fc8a1236622490ff67dfb93dd55..3a15647c0ddc5a234f1cea5778e336caea3f3f24 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -111,6 +111,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0068-Item-entity-immunities.patch b/patches/server/0069-Item-entity-immunities.patch similarity index 98% rename from patches/server/0068-Item-entity-immunities.patch rename to patches/server/0069-Item-entity-immunities.patch index f26b9313a..22dc4fbc9 100644 --- a/patches/server/0068-Item-entity-immunities.patch +++ b/patches/server/0069-Item-entity-immunities.patch @@ -128,7 +128,7 @@ index fea44ba6a6584b4a510af6a58cab07eecec6b68b..f3bf5199bc7ddf8a3d0dc67a184e7690 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f243cee2b81e27d2ff7fdc7356bf71d2e369ad2a..ca30699fde62277e6794d4ba0b829287cfc7c651 100644 +index 3a15647c0ddc5a234f1cea5778e336caea3f3f24..fb1d389cdfa47726718552fd92cf0035858792df 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -124,6 +124,49 @@ public class PurpurWorldConfig { diff --git a/patches/server/0069-Add-ping-command.patch b/patches/server/0070-Add-ping-command.patch similarity index 100% rename from patches/server/0069-Add-ping-command.patch rename to patches/server/0070-Add-ping-command.patch diff --git a/patches/server/0070-Add-demo-command.patch b/patches/server/0071-Add-demo-command.patch similarity index 100% rename from patches/server/0070-Add-demo-command.patch rename to patches/server/0071-Add-demo-command.patch diff --git a/patches/server/0071-Add-credits-command.patch b/patches/server/0072-Add-credits-command.patch similarity index 100% rename from patches/server/0071-Add-credits-command.patch rename to patches/server/0072-Add-credits-command.patch diff --git a/patches/server/0072-Configurable-jockey-options.patch b/patches/server/0073-Configurable-jockey-options.patch similarity index 100% rename from patches/server/0072-Configurable-jockey-options.patch rename to patches/server/0073-Configurable-jockey-options.patch diff --git a/patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch similarity index 100% rename from patches/server/0073-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch rename to patches/server/0074-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch diff --git a/patches/server/0074-Add-phantom-spawning-options.patch b/patches/server/0075-Add-phantom-spawning-options.patch similarity index 100% rename from patches/server/0074-Add-phantom-spawning-options.patch rename to patches/server/0075-Add-phantom-spawning-options.patch diff --git a/patches/server/0075-Implement-bed-explosion-options.patch b/patches/server/0076-Implement-bed-explosion-options.patch similarity index 97% rename from patches/server/0075-Implement-bed-explosion-options.patch rename to patches/server/0076-Implement-bed-explosion-options.patch index a6b816535..42f21b5e7 100644 --- a/patches/server/0075-Implement-bed-explosion-options.patch +++ b/patches/server/0076-Implement-bed-explosion-options.patch @@ -27,7 +27,7 @@ index 654a859a37bf991c7a7fa8a44a3d20f8feb223db..e1d274a9be856f6fa5be00958c35b7d7 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 485e7cfd0c0da45129c0b1a0cd95c5d14d0e0a06..9f4a29c8ea537a4cc733b3658a169f8f5a5334d3 100644 +index 9903ab606d08d51643dfbf45e48a2296f312e0de..5b393a3cad84a7618bf481be9480b095a561f155 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -287,6 +287,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch b/patches/server/0077-Implement-respawn-anchor-explosion-options.patch similarity index 97% rename from patches/server/0076-Implement-respawn-anchor-explosion-options.patch rename to patches/server/0077-Implement-respawn-anchor-explosion-options.patch index 1b31de45d..ec3ae59bc 100644 --- a/patches/server/0076-Implement-respawn-anchor-explosion-options.patch +++ b/patches/server/0077-Implement-respawn-anchor-explosion-options.patch @@ -18,7 +18,7 @@ index c2f3d3a09327e7cb7d3167609eb3ce68eadf6443..12b25aec1167620ed7048c0c8631b0b5 public static boolean canSetSpawn(Level world) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9f4a29c8ea537a4cc733b3658a169f8f5a5334d3..91cc596ef1f5b5ce16c16125520038e2d6a69eaa 100644 +index 5b393a3cad84a7618bf481be9480b095a561f155..8cef70934821898e8445edc247adf718e224ec3c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -324,6 +324,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0077-Add-allow-water-in-end-world-option.patch b/patches/server/0078-Add-allow-water-in-end-world-option.patch similarity index 97% rename from patches/server/0077-Add-allow-water-in-end-world-option.patch rename to patches/server/0078-Add-allow-water-in-end-world-option.patch index 4f53a4e55..3b379c07a 100644 --- a/patches/server/0077-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0078-Add-allow-water-in-end-world-option.patch @@ -27,10 +27,10 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5 return true; diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 32518aa959e3ea95376ac2c1904aa51fb7e52508..39454ba18ef3ec312b367a397c0e555f0d5f5ae6 100644 +index 7e9e1fd5eb9f44c80d180534cd1211e8754b3afd..072c72385c2ec279d03daed003a992b381178fbb 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -1569,4 +1569,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -1571,4 +1571,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return null; } // Paper end diff --git a/patches/server/0078-Allow-color-codes-in-books.patch b/patches/server/0079-Allow-color-codes-in-books.patch similarity index 100% rename from patches/server/0078-Allow-color-codes-in-books.patch rename to patches/server/0079-Allow-color-codes-in-books.patch diff --git a/patches/server/0079-Entity-lifespan.patch b/patches/server/0080-Entity-lifespan.patch similarity index 98% rename from patches/server/0079-Entity-lifespan.patch rename to patches/server/0080-Entity-lifespan.patch index c6df1739b..6fe18c808 100644 --- a/patches/server/0079-Entity-lifespan.patch +++ b/patches/server/0080-Entity-lifespan.patch @@ -95,7 +95,7 @@ index 1e4629de69b762f89efe54a93f28292d3657bccb..fe97b5b327af1189b166243c42be9989 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 91cc596ef1f5b5ce16c16125520038e2d6a69eaa..a589ef8be5335bcb5fe8322e21ec407957d0ce63 100644 +index 8cef70934821898e8445edc247adf718e224ec3c..16639d1ec58413298c7e12d64838d21f8d5fdedd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -124,6 +124,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 97% rename from patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 6849504ee..e6a23541f 100644 --- a/patches/server/0080-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0081-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -56,7 +56,7 @@ index dc6177e8d5c6f6615ccbfa55a2e0a8c891fc6b52..d75a3d62eeb151c2451b20feb7fd088c } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a589ef8be5335bcb5fe8322e21ec407957d0ce63..a28d11edcf87f3e01477e8d7aa70b8a822b76fa6 100644 +index 16639d1ec58413298c7e12d64838d21f8d5fdedd..e44b6b03e90a52f5b3e411fb78a3050287a23431 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -243,6 +243,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0081-Squid-EAR-immunity.patch b/patches/server/0082-Squid-EAR-immunity.patch similarity index 100% rename from patches/server/0081-Squid-EAR-immunity.patch rename to patches/server/0082-Squid-EAR-immunity.patch diff --git a/patches/server/0082-Phantoms-burn-in-light.patch b/patches/server/0083-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0082-Phantoms-burn-in-light.patch rename to patches/server/0083-Phantoms-burn-in-light.patch diff --git a/patches/server/0083-Configurable-villager-breeding.patch b/patches/server/0084-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0083-Configurable-villager-breeding.patch rename to patches/server/0084-Configurable-villager-breeding.patch diff --git a/patches/server/0084-Redstone-deactivates-spawners.patch b/patches/server/0085-Redstone-deactivates-spawners.patch similarity index 94% rename from patches/server/0084-Redstone-deactivates-spawners.patch rename to patches/server/0085-Redstone-deactivates-spawners.patch index 5cebaf0d4..c732e4479 100644 --- a/patches/server/0084-Redstone-deactivates-spawners.patch +++ b/patches/server/0085-Redstone-deactivates-spawners.patch @@ -17,7 +17,7 @@ index ee619590aa49323059947fbaee9e88d61df99789..deffa277272c34adb39d7c3e69e91502 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9b5a45643f288cab8725d1d9050b9d97ea9f97ae..c568340555c9c0c45432dea6dbc29adac98c3d92 100644 +index d224e0586472779ee0205a939e2f0173fa0aed8d..6da346a866493631914f16ae2a4f60632fd1b897 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -352,6 +352,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0085-Totems-work-in-inventory.patch b/patches/server/0086-Totems-work-in-inventory.patch similarity index 96% rename from patches/server/0085-Totems-work-in-inventory.patch rename to patches/server/0086-Totems-work-in-inventory.patch index be9227b60..81a262b43 100644 --- a/patches/server/0085-Totems-work-in-inventory.patch +++ b/patches/server/0086-Totems-work-in-inventory.patch @@ -29,7 +29,7 @@ index d75a3d62eeb151c2451b20feb7fd088c513a2571..2b7d14e3de4520188c1701ac00044a64 event.setCancelled(itemstack == null); this.level.getCraftServer().getPluginManager().callEvent(event); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c568340555c9c0c45432dea6dbc29adac98c3d92..bce43c499ef75131ae637ae8d089517f34602357 100644 +index 6da346a866493631914f16ae2a4f60632fd1b897..529193b0b6b0e2883688c3b1e3ca4bbe315267f8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -244,6 +244,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0086-Add-vindicator-johnny-spawn-chance.patch b/patches/server/0087-Add-vindicator-johnny-spawn-chance.patch similarity index 100% rename from patches/server/0086-Add-vindicator-johnny-spawn-chance.patch rename to patches/server/0087-Add-vindicator-johnny-spawn-chance.patch diff --git a/patches/server/0087-Add-option-to-disable-certain-block-updates.patch b/patches/server/0088-Add-option-to-disable-certain-block-updates.patch similarity index 100% rename from patches/server/0087-Add-option-to-disable-certain-block-updates.patch rename to patches/server/0088-Add-option-to-disable-certain-block-updates.patch diff --git a/patches/server/0088-Dispensers-place-anvils-option.patch b/patches/server/0089-Dispensers-place-anvils-option.patch similarity index 96% rename from patches/server/0088-Dispensers-place-anvils-option.patch rename to patches/server/0089-Dispensers-place-anvils-option.patch index aff8e25c0..28dbc353b 100644 --- a/patches/server/0088-Dispensers-place-anvils-option.patch +++ b/patches/server/0089-Dispensers-place-anvils-option.patch @@ -41,7 +41,7 @@ index 3d2b5f040715a0e4fac0e6786bd11a4d715330ce..9aef3cfd930594c1a2c92a02a18133d0 static void setEntityPokingOutOfBlock(BlockSource pointer, Entity entity, Direction direction) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 59597a70f60ccad348dfe56985358cbae8c558e7..85b4f00796521d007a1b741c5dcc47a6e359d71a 100644 +index 5761da1c9f712c93b40bb9c67910fb6736150b10..b44d77391406d9046c13d9aa4330b5649708ec70 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -313,8 +313,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0089-Allow-anvil-colors.patch b/patches/server/0090-Allow-anvil-colors.patch similarity index 96% rename from patches/server/0089-Allow-anvil-colors.patch rename to patches/server/0090-Allow-anvil-colors.patch index c71e28f71..c8f7e5477 100644 --- a/patches/server/0089-Allow-anvil-colors.patch +++ b/patches/server/0090-Allow-anvil-colors.patch @@ -27,7 +27,7 @@ index c1ed57bae737fca803c2dd8666207dbffc6758c3..10cd589e427f847936f29e33edee3923 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 85b4f00796521d007a1b741c5dcc47a6e359d71a..4d474c2d2f6c1a7a28daba2d9886cf6e5e12b343 100644 +index b44d77391406d9046c13d9aa4330b5649708ec70..fdad39e4a639c46e3ce15bbf77a854f532a4d655 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -296,6 +296,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch b/patches/server/0091-Add-option-to-disable-dolphin-treasure-searching.patch similarity index 100% rename from patches/server/0090-Add-option-to-disable-dolphin-treasure-searching.patch rename to patches/server/0091-Add-option-to-disable-dolphin-treasure-searching.patch diff --git a/patches/server/0091-Short-enderman-height.patch b/patches/server/0092-Short-enderman-height.patch similarity index 100% rename from patches/server/0091-Short-enderman-height.patch rename to patches/server/0092-Short-enderman-height.patch diff --git a/patches/server/0092-Stop-squids-floating-on-top-of-water.patch b/patches/server/0093-Stop-squids-floating-on-top-of-water.patch similarity index 100% rename from patches/server/0092-Stop-squids-floating-on-top-of-water.patch rename to patches/server/0093-Stop-squids-floating-on-top-of-water.patch diff --git a/patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0094-Crying-obsidian-valid-for-portal-frames.patch similarity index 100% rename from patches/server/0093-Crying-obsidian-valid-for-portal-frames.patch rename to patches/server/0094-Crying-obsidian-valid-for-portal-frames.patch diff --git a/patches/server/0094-Entities-can-use-portals-configuration.patch b/patches/server/0095-Entities-can-use-portals-configuration.patch similarity index 96% rename from patches/server/0094-Entities-can-use-portals-configuration.patch rename to patches/server/0095-Entities-can-use-portals-configuration.patch index 74a11e048..3cb02c54d 100644 --- a/patches/server/0094-Entities-can-use-portals-configuration.patch +++ b/patches/server/0095-Entities-can-use-portals-configuration.patch @@ -27,7 +27,7 @@ index d0e0811601684199206f4c6e23e077a2c987e86b..8873e947665a877255d92548f7e894f6 public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 68451f2c85e723dcb4835b4c0aeaffaf2f79bc3a..c3546d8e36fecfd5d6c6c767de30fc6634a72416 100644 +index 8f15e760ab50bc8add8de89a4922e99613dfb076..a4a590c456b5e3554605f3428f93d3a8e1bd5ba9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,6 +97,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0095-LivingEntity-broadcastItemBreak.patch b/patches/server/0096-LivingEntity-broadcastItemBreak.patch similarity index 100% rename from patches/server/0095-LivingEntity-broadcastItemBreak.patch rename to patches/server/0096-LivingEntity-broadcastItemBreak.patch diff --git a/patches/server/0096-Customizable-wither-health-and-healing.patch b/patches/server/0097-Customizable-wither-health-and-healing.patch similarity index 100% rename from patches/server/0096-Customizable-wither-health-and-healing.patch rename to patches/server/0097-Customizable-wither-health-and-healing.patch diff --git a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch similarity index 96% rename from patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch rename to patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch index fc4ed3971..9d5c2ef75 100644 --- a/patches/server/0097-Allow-toggling-special-MobSpawners-per-world.patch +++ b/patches/server/0098-Allow-toggling-special-MobSpawners-per-world.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Allow toggling special MobSpawners per world In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this. diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 5f07e8669336d4ce27aa5f7837faf83682a9dff3..476047528dc9dbb7983f47e960f4d3e2fa1044ee 100644 +index 1140edb12dba385ff572b2cd2ab1a4b32eab2a1a..ea71f71918c19d03f584939d17901d2ffff7ad0e 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -505,7 +505,24 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -67,7 +67,7 @@ index daa7c4bd8a3f6c28f02b7117b061f0def29e3743..d4699d7eefafffd2d4e0a03d62d5094f if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, world, blockposition2, EntityType.WANDERING_TRADER)) { blockposition1 = blockposition2; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7a7bd0fbac184b10dfd2d4a1b210c7c40efc4437..9805b0f7821049c124159cc9fd26cec2bfdae7d2 100644 +index 88b49ee7171c0ad7be83eeac2aba2573e9707e4f..35529a02afe42607ebcd6ab532324561429ab14a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -68,6 +68,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0098-Raid-cooldown-setting.patch b/patches/server/0099-Raid-cooldown-setting.patch similarity index 97% rename from patches/server/0098-Raid-cooldown-setting.patch rename to patches/server/0099-Raid-cooldown-setting.patch index 711b2fa9d..f590ca6fe 100644 --- a/patches/server/0098-Raid-cooldown-setting.patch +++ b/patches/server/0099-Raid-cooldown-setting.patch @@ -52,7 +52,7 @@ index fa8fcdfea51a35e4a482d3d7b18159099da62706..38459f822e21601a167edab871b07a85 if (!this.raidMap.containsKey(raid.getId())) { this.raidMap.put(raid.getId(), raid); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9805b0f7821049c124159cc9fd26cec2bfdae7d2..886702d54c60921bc7f90ca848d4eeff07825b2e 100644 +index 35529a02afe42607ebcd6ab532324561429ab14a..7a222701ef7fcf2e89376774537833e1ea53f526 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -108,6 +108,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch b/patches/server/0100-Despawn-rate-config-options-per-projectile-type.patch similarity index 99% rename from patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch rename to patches/server/0100-Despawn-rate-config-options-per-projectile-type.patch index 48dc1f4eb..847174d64 100644 --- a/patches/server/0099-Despawn-rate-config-options-per-projectile-type.patch +++ b/patches/server/0100-Despawn-rate-config-options-per-projectile-type.patch @@ -307,7 +307,7 @@ index 2867e841e73a3edfdeb83af9d96e0d0cd4116a68..8613008090a9d7cf5cd7c2a598f2c725 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 886702d54c60921bc7f90ca848d4eeff07825b2e..932b43c50fce502237e14852d45e58741393c7ee 100644 +index 7a222701ef7fcf2e89376774537833e1ea53f526..e3f3ccafb76d73908b400afd0dda809f1d592168 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -289,6 +289,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch b/patches/server/0101-Add-option-to-disable-zombie-aggressiveness-towards-.patch similarity index 100% rename from patches/server/0100-Add-option-to-disable-zombie-aggressiveness-towards-.patch rename to patches/server/0101-Add-option-to-disable-zombie-aggressiveness-towards-.patch diff --git a/patches/server/0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch b/patches/server/0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch similarity index 100% rename from patches/server/0101-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch rename to patches/server/0102-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch diff --git a/patches/server/0102-Flying-squids-Oh-my.patch b/patches/server/0103-Flying-squids-Oh-my.patch similarity index 100% rename from patches/server/0102-Flying-squids-Oh-my.patch rename to patches/server/0103-Flying-squids-Oh-my.patch diff --git a/patches/server/0103-Infinity-bow-settings.patch b/patches/server/0104-Infinity-bow-settings.patch similarity index 97% rename from patches/server/0103-Infinity-bow-settings.patch rename to patches/server/0104-Infinity-bow-settings.patch index a66b2cfbe..631a6abfb 100644 --- a/patches/server/0103-Infinity-bow-settings.patch +++ b/patches/server/0104-Infinity-bow-settings.patch @@ -27,7 +27,7 @@ index 08d597db1a5345a343777a01427655e6bf2c926b..33df0ca406dc8321b76b393f317bbd1c } else { user.startUsingItem(hand); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 93d95018b67a31270c2d8b14d156c3c3c2fe9801..fca524c9ca25a08d5230fb62f658588a0149c7dd 100644 +index 7f0ef2dfe8e326c53dd32b976c2a978d3f2ace07..d2b73baf72ab84bb13471da549be8ab9d38e4074 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -139,6 +139,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0104-Configurable-daylight-cycle.patch b/patches/server/0105-Configurable-daylight-cycle.patch similarity index 96% rename from patches/server/0104-Configurable-daylight-cycle.patch rename to patches/server/0105-Configurable-daylight-cycle.patch index 9aca37fa4..a32c68bbc 100644 --- a/patches/server/0104-Configurable-daylight-cycle.patch +++ b/patches/server/0105-Configurable-daylight-cycle.patch @@ -31,7 +31,7 @@ index 11d5b4d1e0400e9e2baacbf9690ce1ababe85139..ce90ecb258c954146fbe7a9f393cbe29 } ServerPlayer entityplayer = (ServerPlayer) entityhuman; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 476047528dc9dbb7983f47e960f4d3e2fa1044ee..ce01371b78b995c46d4143c2d177b448720760af 100644 +index ea71f71918c19d03f584939d17901d2ffff7ad0e..156bac4f1c6d4577a424e773cb175a2f737b99cf 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -210,6 +210,8 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -88,7 +88,7 @@ index 476047528dc9dbb7983f47e960f4d3e2fa1044ee..ce01371b78b995c46d4143c2d177b448 public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) { Iterator iterator = this.customSpawners.iterator(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fca524c9ca25a08d5230fb62f658588a0149c7dd..074864c2181340d2744cbbb9d4066e37f36870c5 100644 +index d2b73baf72ab84bb13471da549be8ab9d38e4074..568f2ed666dcd7571bad045e67bfe22f2bb90c9b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -121,6 +121,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0105-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch similarity index 100% rename from patches/server/0105-Allow-infinite-and-mending-enchantments-together.patch rename to patches/server/0106-Allow-infinite-and-mending-enchantments-together.patch diff --git a/patches/server/0106-Furnace-uses-lava-from-underneath.patch b/patches/server/0107-Furnace-uses-lava-from-underneath.patch similarity index 97% rename from patches/server/0106-Furnace-uses-lava-from-underneath.patch rename to patches/server/0107-Furnace-uses-lava-from-underneath.patch index 05067514e..287323255 100644 --- a/patches/server/0106-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0107-Furnace-uses-lava-from-underneath.patch @@ -47,7 +47,7 @@ index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..c617a8aacbbefb37d53d0e005e822469 private static boolean canBurn(@Nullable Recipe recipe, NonNullList slots, int count) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 074864c2181340d2744cbbb9d4066e37f36870c5..2f93fec6b2e5f9a924b5e49abd7275e76c354e44 100644 +index 568f2ed666dcd7571bad045e67bfe22f2bb90c9b..633dc2149bc691b20238f5a7e54d3e9a45f474ce 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -401,6 +401,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0107-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/0107-Arrows-should-not-reset-despawn-counter.patch rename to patches/server/0108-Arrows-should-not-reset-despawn-counter.patch diff --git a/patches/server/0108-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch similarity index 95% rename from patches/server/0108-Ability-to-re-add-farmland-mechanics-from-Alpha.patch rename to patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index b3c883058..65001eb08 100644 --- a/patches/server/0108-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0109-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -24,7 +24,7 @@ index 4208833252a5b5c74d294dc3435869d71d774e37..a3ff99c461dd862733816d9d1204cf8b return; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2f93fec6b2e5f9a924b5e49abd7275e76c354e44..164f9271aab50d23a3bf03877fb5285da3c3a069 100644 +index 633dc2149bc691b20238f5a7e54d3e9a45f474ce..cde4ae628a62fc3303191a845ab93e4d8224d4c4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -397,8 +397,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0109-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch similarity index 96% rename from patches/server/0109-Add-adjustable-breeding-cooldown-to-config.patch rename to patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch index 8997b30dd..c654267a0 100644 --- a/patches/server/0109-Add-adjustable-breeding-cooldown-to-config.patch +++ b/patches/server/0110-Add-adjustable-breeding-cooldown-to-config.patch @@ -33,7 +33,7 @@ index 6216513805add7c8f52e1ed6c77e2d26786b3ab5..34e82b97c5b294f0a6423581220403a1 entityageable.setBaby(true); entityageable.moveTo(this.getX(), this.getY(), this.getZ(), 0.0F, 0.0F); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 39454ba18ef3ec312b367a397c0e555f0d5f5ae6..a2c0a980b09cb15c28ff417ba8e1b02838951ac5 100644 +index 072c72385c2ec279d03daed003a992b381178fbb..924b66511f81ee7b448dadf81b78a0e50e91f5d0 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -194,6 +194,49 @@ public abstract class Level implements LevelAccessor, AutoCloseable { @@ -86,7 +86,7 @@ index 39454ba18ef3ec312b367a397c0e555f0d5f5ae6..a2c0a980b09cb15c28ff417ba8e1b028 public CraftWorld getWorld() { return this.world; } -@@ -287,6 +330,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -289,6 +332,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper this.purpurConfig = new org.purpurmc.purpur.PurpurWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), env); // Purpur @@ -95,7 +95,7 @@ index 39454ba18ef3ec312b367a397c0e555f0d5f5ae6..a2c0a980b09cb15c28ff417ba8e1b028 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 164f9271aab50d23a3bf03877fb5285da3c3a069..7c203f8b0120d07263c0a96422a69173daebd89e 100644 +index cde4ae628a62fc3303191a845ab93e4d8224d4c4..5236d3bc8acb317d819f59cd5873c6e0d14f091f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -109,6 +109,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0110-Make-entity-breeding-times-configurable.patch b/patches/server/0111-Make-entity-breeding-times-configurable.patch similarity index 99% rename from patches/server/0110-Make-entity-breeding-times-configurable.patch rename to patches/server/0111-Make-entity-breeding-times-configurable.patch index a508e7dfc..acdd27c1d 100644 --- a/patches/server/0110-Make-entity-breeding-times-configurable.patch +++ b/patches/server/0111-Make-entity-breeding-times-configurable.patch @@ -316,7 +316,7 @@ index a80a7d460051a39fe805ae669b4586fb42e46943..6d444248b9e283e31d5777d450a52643 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java -index 156ab5e6a8e75e55f0f3fbc84c21e397cd1dc589..5c2e345cfc7076f6d4e62da85e81855bc1467a1f 100644 +index c88222d120c71649b2e43a20f119590106734596..0a559e061b332508cba2d97c55d9f309c118f473 100644 --- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java @@ -140,6 +140,10 @@ public class Frog extends Animal { diff --git a/patches/server/0111-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 99% rename from patches/server/0111-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 index 4a8e41950..4895b0959 100644 --- a/patches/server/0111-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 @@ -142,7 +142,7 @@ index 4c5671cd4c26c23e61b2196577c554f504a03c55..678e0cb7e5b704ce01eda96b2d74694d if (((HangingEntity) object).survives()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f2015098f6470a7f8ab37174138b84dc288c9ad8..2f76cb4f1755393fa3c5fab3b5094f38f23e6ce5 100644 +index 4a2c5afda4f59542412b0ef54bfa4cda87a4d776..f6e3c210779406ec179495cfb97b59df57384d36 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -96,8 +96,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0112-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 95% rename from patches/server/0112-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 index 8c2145350..8c60a5f1c 100644 --- a/patches/server/0112-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 @@ -17,7 +17,7 @@ index 623f78c078fb3aa2665d7e8a37672438227bce6b..500c69e555c7247e20ef8cc59d834155 ((Mob) newEntityLiving).setPersistenceRequired(); // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2f76cb4f1755393fa3c5fab3b5094f38f23e6ce5..99578dba4d30263024eedef3084e46bb7c08c465 100644 +index f6e3c210779406ec179495cfb97b59df57384d36..3d140a8a2e3b3ea968f2f2862f981dc463ac8f7b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -97,9 +97,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0113-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch b/patches/server/0114-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch similarity index 100% rename from patches/server/0113-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch rename to patches/server/0114-Add-config-for-allowing-Endermen-to-despawn-even-whi.patch diff --git a/patches/server/0114-Add-configurable-snowball-damage.patch b/patches/server/0115-Add-configurable-snowball-damage.patch similarity index 95% rename from patches/server/0114-Add-configurable-snowball-damage.patch rename to patches/server/0115-Add-configurable-snowball-damage.patch index d5b744d29..70cd466c6 100644 --- a/patches/server/0114-Add-configurable-snowball-damage.patch +++ b/patches/server/0115-Add-configurable-snowball-damage.patch @@ -18,7 +18,7 @@ index ed2f039c4042861bcfa2e41d8281eefd37daa9fa..d5d84893c77b4e60a19032d765d76bfd } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 119da5f019b83d6c725003bba08842363b6d4115..7ccfccaaa3a4105751cdccdefa0784e7657bb503 100644 +index e6f8050ab3701c549970f1811449c0a8e9e27bd2..0c8671fabefe5c2cecf62d4f84fd15233329fd5f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -315,6 +315,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0115-Changeable-Mob-Left-Handed-Chance.patch b/patches/server/0116-Changeable-Mob-Left-Handed-Chance.patch similarity index 95% rename from patches/server/0115-Changeable-Mob-Left-Handed-Chance.patch rename to patches/server/0116-Changeable-Mob-Left-Handed-Chance.patch index 4180cf445..827ab0612 100644 --- a/patches/server/0115-Changeable-Mob-Left-Handed-Chance.patch +++ b/patches/server/0116-Changeable-Mob-Left-Handed-Chance.patch @@ -18,7 +18,7 @@ index fe97b5b327af1189b166243c42be99892226cd9e..5a907375d1497229d3b566b30c34248e } else { this.setLeftHanded(false); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7ccfccaaa3a4105751cdccdefa0784e7657bb503..b5b9217aeffb10219f06e196e91060ea24326b47 100644 +index 0c8671fabefe5c2cecf62d4f84fd15233329fd5f..f9a428b2d21093c95467b7d02f22e1923c6fcf50 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -150,8 +150,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0116-Add-boat-fall-damage-config.patch b/patches/server/0117-Add-boat-fall-damage-config.patch similarity index 97% rename from patches/server/0116-Add-boat-fall-damage-config.patch rename to patches/server/0117-Add-boat-fall-damage-config.patch index 452192157..cb4ee89d5 100644 --- a/patches/server/0116-Add-boat-fall-damage-config.patch +++ b/patches/server/0117-Add-boat-fall-damage-config.patch @@ -27,7 +27,7 @@ index 8e5aa1666ca929780670ce513d969973a513e21e..fe2d7acece87d5b825f3f3668c11c0ef if (!flag && isSpawnInvulnerable() && source != DamageSource.OUT_OF_WORLD) { // Purpur diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b5b9217aeffb10219f06e196e91060ea24326b47..60fed3d898388e88088284af1b0d45ca606b2a99 100644 +index f9a428b2d21093c95467b7d02f22e1923c6fcf50..38ecc62dab7c34831b09ec489f909678d56807ac 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -106,6 +106,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0117-Snow-Golem-rate-of-fire-config.patch b/patches/server/0118-Snow-Golem-rate-of-fire-config.patch similarity index 100% rename from patches/server/0117-Snow-Golem-rate-of-fire-config.patch rename to patches/server/0118-Snow-Golem-rate-of-fire-config.patch diff --git a/patches/server/0118-EMC-Configurable-disable-give-dropping.patch b/patches/server/0119-EMC-Configurable-disable-give-dropping.patch similarity index 100% rename from patches/server/0118-EMC-Configurable-disable-give-dropping.patch rename to patches/server/0119-EMC-Configurable-disable-give-dropping.patch diff --git a/patches/server/0119-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch b/patches/server/0120-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch similarity index 100% rename from patches/server/0119-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch rename to patches/server/0120-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch diff --git a/patches/server/0120-Toggle-for-Zombified-Piglin-death-always-counting-as.patch b/patches/server/0121-Toggle-for-Zombified-Piglin-death-always-counting-as.patch similarity index 100% rename from patches/server/0120-Toggle-for-Zombified-Piglin-death-always-counting-as.patch rename to patches/server/0121-Toggle-for-Zombified-Piglin-death-always-counting-as.patch diff --git a/patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch b/patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch similarity index 100% rename from patches/server/0121-Spread-out-and-optimise-player-list-ticksSpread-out-.patch rename to patches/server/0122-Spread-out-and-optimise-player-list-ticksSpread-out-.patch diff --git a/patches/server/0122-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch similarity index 100% rename from patches/server/0122-Configurable-chance-for-wolves-to-spawn-rabid.patch rename to patches/server/0123-Configurable-chance-for-wolves-to-spawn-rabid.patch diff --git a/patches/server/0123-Configurable-default-collar-color.patch b/patches/server/0124-Configurable-default-collar-color.patch similarity index 100% rename from patches/server/0123-Configurable-default-collar-color.patch rename to patches/server/0124-Configurable-default-collar-color.patch diff --git a/patches/server/0124-Phantom-flames-on-swoop.patch b/patches/server/0125-Phantom-flames-on-swoop.patch similarity index 100% rename from patches/server/0124-Phantom-flames-on-swoop.patch rename to patches/server/0125-Phantom-flames-on-swoop.patch diff --git a/patches/server/0125-Option-for-chests-to-open-even-with-a-solid-block-on.patch b/patches/server/0126-Option-for-chests-to-open-even-with-a-solid-block-on.patch similarity index 94% rename from patches/server/0125-Option-for-chests-to-open-even-with-a-solid-block-on.patch rename to patches/server/0126-Option-for-chests-to-open-even-with-a-solid-block-on.patch index c9cff5f4a..7eada6ad0 100644 --- a/patches/server/0125-Option-for-chests-to-open-even-with-a-solid-block-on.patch +++ b/patches/server/0126-Option-for-chests-to-open-even-with-a-solid-block-on.patch @@ -17,7 +17,7 @@ index c6b57d45383441aa35510e759ce3cb82bc98f305..330ff3bc5fd8625e37b79e1204eddbe8 return world.getBlockState(blockposition1).isRedstoneConductor(world, blockposition1); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0abe70545304887722ec20c5ad20169273381560..f5832c2a308d8acbac525b6ff9c1aea6b816e96e 100644 +index 2c8e2faeab641f1019f31339707c62e82c5e9276..98875193e44706b180663151a2e3864bd5272ff4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -406,6 +406,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0126-Implement-TPSBar.patch b/patches/server/0127-Implement-TPSBar.patch similarity index 100% rename from patches/server/0126-Implement-TPSBar.patch rename to patches/server/0127-Implement-TPSBar.patch diff --git a/patches/server/0127-Striders-give-saddle-back.patch b/patches/server/0128-Striders-give-saddle-back.patch similarity index 100% rename from patches/server/0127-Striders-give-saddle-back.patch rename to patches/server/0128-Striders-give-saddle-back.patch diff --git a/patches/server/0128-PlayerBookTooLargeEvent.patch b/patches/server/0129-PlayerBookTooLargeEvent.patch similarity index 100% rename from patches/server/0128-PlayerBookTooLargeEvent.patch rename to patches/server/0129-PlayerBookTooLargeEvent.patch diff --git a/patches/server/0129-Full-netherite-armor-grants-fire-resistance.patch b/patches/server/0130-Full-netherite-armor-grants-fire-resistance.patch similarity index 97% rename from patches/server/0129-Full-netherite-armor-grants-fire-resistance.patch rename to patches/server/0130-Full-netherite-armor-grants-fire-resistance.patch index ba76e44d8..3865d7a24 100644 --- a/patches/server/0129-Full-netherite-armor-grants-fire-resistance.patch +++ b/patches/server/0130-Full-netherite-armor-grants-fire-resistance.patch @@ -26,7 +26,7 @@ index e0ea8b1b3ccde9616a721d677a8217b25aadfefe..b416c8606ef53aa49458bb6f36689068 protected ItemCooldowns createItemCooldowns() { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 96b237ae22669e46eff2402906500cf869d93c7e..0b35b906360d964dbff288217340becddb14678c 100644 +index aeacb1b81bcce83188008d3e531e72f739d1e928..881e9c611f7f5fc56af316cbf1ff73b680b6e4ce 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -289,6 +289,19 @@ public class PurpurWorldConfig { diff --git a/patches/server/0130-Fix-rotating-UP-DOWN-CW-and-CCW.patch b/patches/server/0131-Fix-rotating-UP-DOWN-CW-and-CCW.patch similarity index 100% rename from patches/server/0130-Fix-rotating-UP-DOWN-CW-and-CCW.patch rename to patches/server/0131-Fix-rotating-UP-DOWN-CW-and-CCW.patch diff --git a/patches/server/0131-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch similarity index 100% rename from patches/server/0131-Add-mobGriefing-bypass-to-everything-affected.patch rename to patches/server/0132-Add-mobGriefing-bypass-to-everything-affected.patch diff --git a/patches/server/0132-Config-to-allow-Note-Block-sounds-when-blocked.patch b/patches/server/0133-Config-to-allow-Note-Block-sounds-when-blocked.patch similarity index 97% rename from patches/server/0132-Config-to-allow-Note-Block-sounds-when-blocked.patch rename to patches/server/0133-Config-to-allow-Note-Block-sounds-when-blocked.patch index 1d5350619..21f01aebf 100644 --- a/patches/server/0132-Config-to-allow-Note-Block-sounds-when-blocked.patch +++ b/patches/server/0133-Config-to-allow-Note-Block-sounds-when-blocked.patch @@ -22,7 +22,7 @@ index 58e8905a4b98e2e1ee372b99bdc3de9815063ac9..443bf39734ba2b0a7cdf0362d415ff17 // org.bukkit.event.block.NotePlayEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callNotePlayEvent(world, blockposition, data.getValue(NoteBlock.INSTRUMENT), data.getValue(NoteBlock.NOTE)); // Paper - move event into block event handler // if (event.isCancelled()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a2c8bb6c6dfda88ddaf4e445106a0d4b52ba2858..ce4e136ee8f1a196ceb4462a3c783622158a2fcd 100644 +index 8b97adcc2461641d89d3340084d15d0bf235ae28..f16a377ebf9134083827862cf0455719a0b9d859 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -112,6 +112,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0133-Add-EntityTeleportHinderedEvent.patch b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch similarity index 99% rename from patches/server/0133-Add-EntityTeleportHinderedEvent.patch rename to patches/server/0134-Add-EntityTeleportHinderedEvent.patch index c8b4f04b2..d262dd94d 100644 --- a/patches/server/0133-Add-EntityTeleportHinderedEvent.patch +++ b/patches/server/0134-Add-EntityTeleportHinderedEvent.patch @@ -108,7 +108,7 @@ index 6e061bf2951f0bd86364da3129f365799edda24c..3cc4f0020829ac935c325d5df7a16aab } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ce4e136ee8f1a196ceb4462a3c783622158a2fcd..f1d92ae817a505b80c638e4f34134742346bb7e5 100644 +index f16a377ebf9134083827862cf0455719a0b9d859..863194a8f34f999965bb0e71de79bc5e50ca1671 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -111,6 +111,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0134-Farmland-trampling-changes.patch b/patches/server/0135-Farmland-trampling-changes.patch similarity index 97% rename from patches/server/0134-Farmland-trampling-changes.patch rename to patches/server/0135-Farmland-trampling-changes.patch index 004a7918b..a6cf5e15d 100644 --- a/patches/server/0134-Farmland-trampling-changes.patch +++ b/patches/server/0135-Farmland-trampling-changes.patch @@ -37,7 +37,7 @@ index d92ea9f29b9d919871662977d3e3eb41ddf2eb35..e5a3e3a4367dfb924624a913b816b3fd if (CraftEventFactory.callEntityChangeBlockEvent(entity, pos, Blocks.DIRT.defaultBlockState()).isCancelled()) { return; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f1d92ae817a505b80c638e4f34134742346bb7e5..3f81ed1f0e5744d15f2abe49d9421e2990415b5a 100644 +index 863194a8f34f999965bb0e71de79bc5e50ca1671..7f8aa662059ebb28825380f37df45408a5d626bc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -444,10 +444,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0135-Movement-options-for-armor-stands.patch b/patches/server/0136-Movement-options-for-armor-stands.patch similarity index 98% rename from patches/server/0135-Movement-options-for-armor-stands.patch rename to patches/server/0136-Movement-options-for-armor-stands.patch index 2a0bc4085..b34a7bf1f 100644 --- a/patches/server/0135-Movement-options-for-armor-stands.patch +++ b/patches/server/0136-Movement-options-for-armor-stands.patch @@ -66,7 +66,7 @@ index 9dcb46959c723723a369cde50427cbee0349f5a1..6bd31ed84049bc36a060b5e01b0599bf + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3f81ed1f0e5744d15f2abe49d9421e2990415b5a..729ba27c732d297ff7f1138426506998ae544726 100644 +index 7f8aa662059ebb28825380f37df45408a5d626bc..22e2a2f1cbd06efcf964e7f844427b1e7cae57e1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -98,10 +98,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0136-Fix-stuck-in-portals.patch b/patches/server/0137-Fix-stuck-in-portals.patch similarity index 97% rename from patches/server/0136-Fix-stuck-in-portals.patch rename to patches/server/0137-Fix-stuck-in-portals.patch index 15074d550..d14d2f3ec 100644 --- a/patches/server/0136-Fix-stuck-in-portals.patch +++ b/patches/server/0137-Fix-stuck-in-portals.patch @@ -37,7 +37,7 @@ index e2e8128fc7a88ddf5599e6cb5dc84d5858c062e7..42822c44dbe18f1cffb269b35eb554ef this.isInsidePortal = true; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 729ba27c732d297ff7f1138426506998ae544726..8ab2d2925ba46f4750070d14e2affc4223a73362 100644 +index 22e2a2f1cbd06efcf964e7f844427b1e7cae57e1..3fb8b19465851ba32c89282f80256c0c63312550 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -329,6 +329,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch b/patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch similarity index 100% rename from patches/server/0137-Toggle-for-water-sensitive-mob-damage.patch rename to patches/server/0138-Toggle-for-water-sensitive-mob-damage.patch diff --git a/patches/server/0138-Config-to-always-tame-in-Creative.patch b/patches/server/0139-Config-to-always-tame-in-Creative.patch similarity index 98% rename from patches/server/0138-Config-to-always-tame-in-Creative.patch rename to patches/server/0139-Config-to-always-tame-in-Creative.patch index dbbb151cc..f503d60b3 100644 --- a/patches/server/0138-Config-to-always-tame-in-Creative.patch +++ b/patches/server/0139-Config-to-always-tame-in-Creative.patch @@ -59,7 +59,7 @@ index dd514cbf2f03b688eb4d8cd49052f1775d3adebb..ed33573a96e96d557156fbe2f725e3d6 this.navigation.stop(); this.setTarget((LivingEntity) null); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3616e81a44c10d94351520c66ed694abb98411ab..a33038ff82f8f1b33b091e7068a8a8d5ee186e30 100644 +index ae397e14d579d4039d9a8b70a29d96b8a9cf944e..eaa12080ab5a533256837436d35bccdd4d9877e8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -111,6 +111,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0139-End-crystal-explosion-options.patch b/patches/server/0140-End-crystal-explosion-options.patch similarity index 98% rename from patches/server/0139-End-crystal-explosion-options.patch rename to patches/server/0140-End-crystal-explosion-options.patch index ea3b092cc..e3cffbf2e 100644 --- a/patches/server/0139-End-crystal-explosion-options.patch +++ b/patches/server/0140-End-crystal-explosion-options.patch @@ -52,7 +52,7 @@ index e1493079d06a91f3e14e333e2a0408725a8f5bea..59d7f4ef118b2a87d1fe9cc1dd2fea89 this.onDestroyedBy(source); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a33038ff82f8f1b33b091e7068a8a8d5ee186e30..3afbda85a14a392854344b9f8253087d467d6663 100644 +index eaa12080ab5a533256837436d35bccdd4d9877e8..a03de24458a11d5a09b30d7211eab9556d5d034f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -451,6 +451,35 @@ public class PurpurWorldConfig { diff --git a/patches/server/0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0141-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch similarity index 100% rename from patches/server/0140-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch rename to patches/server/0141-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch diff --git a/patches/server/0141-Dont-run-with-scissors.patch b/patches/server/0142-Dont-run-with-scissors.patch similarity index 98% rename from patches/server/0141-Dont-run-with-scissors.patch rename to patches/server/0142-Dont-run-with-scissors.patch index 0c38082f8..a9a06c6cd 100644 --- a/patches/server/0141-Dont-run-with-scissors.patch +++ b/patches/server/0142-Dont-run-with-scissors.patch @@ -95,7 +95,7 @@ index 47f4c08c354c2d683dd0959c22c68eb78920a5da..cd2474c2bb19ef83a469daf8b28af7f9 public static String serverModName = "Purpur"; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index bad1ac223d77cc178d78702a7f7d68c0fe226bee..d9b51013633328cd75bab5c6033c0b6c56f25780 100644 +index 64d115cd17f9239b34d1d4f91a77c33f28da79d5..4c2104933f76b314764bbbd050d9700f70851a44 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -191,6 +191,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0142-One-Punch-Man.patch b/patches/server/0143-One-Punch-Man.patch similarity index 96% rename from patches/server/0142-One-Punch-Man.patch rename to patches/server/0143-One-Punch-Man.patch index 5e7974be4..bf3f6495f 100644 --- a/patches/server/0142-One-Punch-Man.patch +++ b/patches/server/0143-One-Punch-Man.patch @@ -30,7 +30,7 @@ index 6a7a83a3fc58cbb7e97c0ba13715a8e6ea5f6de6..e9ee22f12f542f0c2d1a4ecedc891d70 if (human) { // PAIL: Be sure to drag all this code from the EntityHuman subclass each update. diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d9b51013633328cd75bab5c6033c0b6c56f25780..4c80c6cc54ab24f969fb12352801bf8294efdd5e 100644 +index 4c2104933f76b314764bbbd050d9700f70851a44..c003e9a99467b1a10139d1ef27eaa5d853ced27f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -336,6 +336,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch b/patches/server/0144-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch similarity index 98% rename from patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch rename to patches/server/0144-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch index 40a79198a..ac73c1eeb 100644 --- a/patches/server/0143-Configurable-Ender-Pearl-cooldown-damage-and-Endermi.patch +++ b/patches/server/0144-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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4c80c6cc54ab24f969fb12352801bf8294efdd5e..3738ab9fb98cadcb79c7d87d4948581f8277fd2c 100644 +index c003e9a99467b1a10139d1ef27eaa5d853ced27f..90ff91029c4a25c63b316865a23facafac570d15 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -193,6 +193,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch b/patches/server/0145-Config-to-ignore-nearby-mobs-when-sleeping.patch similarity index 96% rename from patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch rename to patches/server/0145-Config-to-ignore-nearby-mobs-when-sleeping.patch index 2b91dd6fe..7d52f6875 100644 --- a/patches/server/0144-Config-to-ignore-nearby-mobs-when-sleeping.patch +++ b/patches/server/0145-Config-to-ignore-nearby-mobs-when-sleeping.patch @@ -18,7 +18,7 @@ index 4980b0b46e75a4bc914cb3719d8b394fbcd8c224..c74e15d4776d98f288454eb609a798a1 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3738ab9fb98cadcb79c7d87d4948581f8277fd2c..d3ee82025c0e15398ff670951300d0d4ed2dec86 100644 +index 90ff91029c4a25c63b316865a23facafac570d15..9d33d2e2d9135586149497e48c1581e2ccef61f4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -345,6 +345,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0145-Add-back-player-spawned-endermite-API.patch b/patches/server/0146-Add-back-player-spawned-endermite-API.patch similarity index 100% rename from patches/server/0145-Add-back-player-spawned-endermite-API.patch rename to patches/server/0146-Add-back-player-spawned-endermite-API.patch diff --git a/patches/server/0146-Config-Enderman-aggressiveness-towards-Endermites.patch b/patches/server/0147-Config-Enderman-aggressiveness-towards-Endermites.patch similarity index 100% rename from patches/server/0146-Config-Enderman-aggressiveness-towards-Endermites.patch rename to patches/server/0147-Config-Enderman-aggressiveness-towards-Endermites.patch diff --git a/patches/server/0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch b/patches/server/0148-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch similarity index 100% rename from patches/server/0147-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch rename to patches/server/0148-Config-to-ignore-Dragon-Head-wearers-and-stare-aggro.patch diff --git a/patches/server/0148-Tick-fluids-config.patch b/patches/server/0149-Tick-fluids-config.patch similarity index 97% rename from patches/server/0148-Tick-fluids-config.patch rename to patches/server/0149-Tick-fluids-config.patch index 87f6e2a52..17b54e8f4 100644 --- a/patches/server/0148-Tick-fluids-config.patch +++ b/patches/server/0149-Tick-fluids-config.patch @@ -36,7 +36,7 @@ index 43e8ef1d6a65d4fd3fe53a587639ffb814368217..9c22a730772f71b34c63d1e43d48943f } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a5c25519d6a2fd11f957c425c6142195034e0e17..c04cd1b4d34f2a5904b67952c5d4283ce008408b 100644 +index ba7ecc009bd808d2c93017d2bdc1511f01291bcb..593675412750aa4aa5a9a59d034911008612f191 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -123,6 +123,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0149-Config-to-disable-Llama-caravans.patch b/patches/server/0150-Config-to-disable-Llama-caravans.patch similarity index 100% rename from patches/server/0149-Config-to-disable-Llama-caravans.patch rename to patches/server/0150-Config-to-disable-Llama-caravans.patch diff --git a/patches/server/0150-Config-to-make-Creepers-explode-on-death.patch b/patches/server/0151-Config-to-make-Creepers-explode-on-death.patch similarity index 100% rename from patches/server/0150-Config-to-make-Creepers-explode-on-death.patch rename to patches/server/0151-Config-to-make-Creepers-explode-on-death.patch diff --git a/patches/server/0151-Configurable-ravager-griefable-blocks-list.patch b/patches/server/0152-Configurable-ravager-griefable-blocks-list.patch similarity index 100% rename from patches/server/0151-Configurable-ravager-griefable-blocks-list.patch rename to patches/server/0152-Configurable-ravager-griefable-blocks-list.patch diff --git a/patches/server/0152-Sneak-to-bulk-process-composter.patch b/patches/server/0153-Sneak-to-bulk-process-composter.patch similarity index 98% rename from patches/server/0152-Sneak-to-bulk-process-composter.patch rename to patches/server/0153-Sneak-to-bulk-process-composter.patch index f42e054e9..16d4a684e 100644 --- a/patches/server/0152-Sneak-to-bulk-process-composter.patch +++ b/patches/server/0153-Sneak-to-bulk-process-composter.patch @@ -75,7 +75,7 @@ index 2b1983d61fd3ed856770146de5cdfd33b4f63a46..9315c819a0c113313a8e6f97e02b4d13 int i = (Integer) iblockdata.getValue(ComposterBlock.LEVEL); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5eab9497e568c86cbc795b78cb6a07406f329d6b..cc1074cee651e0a3b06943474fe2525dda3b0aa1 100644 +index 36cc2736e023a6c0273a511be6a11aaecb5a140a..92ee2a41275c5b308b90c2e67b3802861d1f7438 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -462,6 +462,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0153-Config-for-skipping-night.patch b/patches/server/0154-Config-for-skipping-night.patch similarity index 92% rename from patches/server/0153-Config-for-skipping-night.patch rename to patches/server/0154-Config-for-skipping-night.patch index 915c424c9..37fc0f8bc 100644 --- a/patches/server/0153-Config-for-skipping-night.patch +++ b/patches/server/0154-Config-for-skipping-night.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for skipping night diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ce01371b78b995c46d4143c2d177b448720760af..7156ca622cb5233cd9a0bd5fd77b8db0b7b29772 100644 +index 156bac4f1c6d4577a424e773cb175a2f737b99cf..8696f8035508a26497a0715e47593d92f184337d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -625,7 +625,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -18,7 +18,7 @@ index ce01371b78b995c46d4143c2d177b448720760af..7156ca622cb5233cd9a0bd5fd77b8db0 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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cc1074cee651e0a3b06943474fe2525dda3b0aa1..a7c7b9607c53cc2735ce0d9a8003621a30fec0a5 100644 +index 92ee2a41275c5b308b90c2e67b3802861d1f7438..f07c2a1a3cfa05e500e581297e663c7e00dc7496 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -348,6 +348,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0154-Add-config-for-villager-trading.patch b/patches/server/0155-Add-config-for-villager-trading.patch similarity index 100% rename from patches/server/0154-Add-config-for-villager-trading.patch rename to patches/server/0155-Add-config-for-villager-trading.patch diff --git a/patches/server/0155-Allow-infinity-on-crossbows.patch b/patches/server/0156-Allow-infinity-on-crossbows.patch similarity index 100% rename from patches/server/0155-Allow-infinity-on-crossbows.patch rename to patches/server/0156-Allow-infinity-on-crossbows.patch diff --git a/patches/server/0156-Drowning-Settings.patch b/patches/server/0157-Drowning-Settings.patch similarity index 97% rename from patches/server/0156-Drowning-Settings.patch rename to patches/server/0157-Drowning-Settings.patch index 0a59a75b4..f461c27f8 100644 --- a/patches/server/0156-Drowning-Settings.patch +++ b/patches/server/0157-Drowning-Settings.patch @@ -40,7 +40,7 @@ index e9ee22f12f542f0c2d1a4ecedc891d708491a8eb..4f9b44c1a1421969f454cb2984d0b7ce } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 454c2537b03add477174e01b8c4f0b74c512f3d6..0a76aefd53a52ab582ef2bf5f9c55f46e7439d34 100644 +index fd22332802f798142d25b90b324741ca4319ae16..8b3538280abad92ce8619fccfb586ac9171fa41e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -158,6 +158,15 @@ public class PurpurWorldConfig { diff --git a/patches/server/0157-Break-individual-slabs-when-sneaking.patch b/patches/server/0158-Break-individual-slabs-when-sneaking.patch similarity index 97% rename from patches/server/0157-Break-individual-slabs-when-sneaking.patch rename to patches/server/0158-Break-individual-slabs-when-sneaking.patch index 1799058a6..62c0f46be 100644 --- a/patches/server/0157-Break-individual-slabs-when-sneaking.patch +++ b/patches/server/0158-Break-individual-slabs-when-sneaking.patch @@ -47,7 +47,7 @@ index 18b603d646081926343dea108b55d641df1c2c34..fdbbd2e5d4fd970a4593b55f16bd0f82 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 0a76aefd53a52ab582ef2bf5f9c55f46e7439d34..7a7a5ffbee371d92899beb3defee9e6ebf8a9e71 100644 +index 8b3538280abad92ce8619fccfb586ac9171fa41e..db5560f477e416b4b7c5887efbd215af2b24815a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -577,6 +577,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch b/patches/server/0159-Config-to-disable-hostile-mob-spawn-on-ice.patch similarity index 96% rename from patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch rename to patches/server/0159-Config-to-disable-hostile-mob-spawn-on-ice.patch index 5f5c57815..507d57ea3 100644 --- a/patches/server/0158-Config-to-disable-hostile-mob-spawn-on-ice.patch +++ b/patches/server/0159-Config-to-disable-hostile-mob-spawn-on-ice.patch @@ -24,7 +24,7 @@ index 55c245d0dfa369dc6de2197ae37335fba4fae4ae..c9b40515f4c2ff1eedfc9510930c3bae return false; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7a7a5ffbee371d92899beb3defee9e6ebf8a9e71..28cfb198b936c24bdad05ce5603847811335d911 100644 +index db5560f477e416b4b7c5887efbd215af2b24815a..b4a28c2e29a4709f422e5526579e71d5e500f5e0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -540,6 +540,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch b/patches/server/0160-Config-to-show-Armor-Stand-arms-on-spawn.patch similarity index 96% rename from patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch rename to patches/server/0160-Config-to-show-Armor-Stand-arms-on-spawn.patch index 9f4e89c7c..ae8859fd6 100644 --- a/patches/server/0159-Config-to-show-Armor-Stand-arms-on-spawn.patch +++ b/patches/server/0160-Config-to-show-Armor-Stand-arms-on-spawn.patch @@ -17,7 +17,7 @@ index 6bd31ed84049bc36a060b5e01b0599bf5f47765c..bdb0efdcac171a92a0e05557db7d099f public ArmorStand(Level world, double x, double y, double z) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 28cfb198b936c24bdad05ce5603847811335d911..cbee1bd44f6eef66a6b2073e8a8bf051e1aca9fa 100644 +index b4a28c2e29a4709f422e5526579e71d5e500f5e0..c8daa26f4f773221364ba659fe26dab9d3a4b1b6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -101,6 +101,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0160-Option-to-make-doors-require-redstone.patch b/patches/server/0161-Option-to-make-doors-require-redstone.patch similarity index 98% rename from patches/server/0160-Option-to-make-doors-require-redstone.patch rename to patches/server/0161-Option-to-make-doors-require-redstone.patch index 0d6443bcd..178dbc11e 100644 --- a/patches/server/0160-Option-to-make-doors-require-redstone.patch +++ b/patches/server/0161-Option-to-make-doors-require-redstone.patch @@ -67,7 +67,7 @@ index aa5289f652392515952cc10f70627ed2cdc6c398..d1d3323559f12f60ef0564e2218ca153 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index cbee1bd44f6eef66a6b2073e8a8bf051e1aca9fa..3bcdbd82230d54f64a560882fbc85439af5e425f 100644 +index c8daa26f4f773221364ba659fe26dab9d3a4b1b6..8aaef0bd5ae9ec8b6e7556b6e9d81fd16beda0cb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -487,6 +487,16 @@ public class PurpurWorldConfig { diff --git a/patches/server/0161-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0162-Config-to-allow-for-unsafe-enchants.patch similarity index 100% rename from patches/server/0161-Config-to-allow-for-unsafe-enchants.patch rename to patches/server/0162-Config-to-allow-for-unsafe-enchants.patch diff --git a/patches/server/0162-Configurable-sponge-absorption.patch b/patches/server/0163-Configurable-sponge-absorption.patch similarity index 97% rename from patches/server/0162-Configurable-sponge-absorption.patch rename to patches/server/0163-Configurable-sponge-absorption.patch index 5c9de46f7..c43524bf4 100644 --- a/patches/server/0162-Configurable-sponge-absorption.patch +++ b/patches/server/0163-Configurable-sponge-absorption.patch @@ -43,7 +43,7 @@ index 7304b2659eb45bc4bc9fa7c43e6ca07221d0fc73..d96e3fbc0fd4275c29e7e6154ef66e9e } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3bcdbd82230d54f64a560882fbc85439af5e425f..3c8e0d9c26473759bc4b2428b17b995eeb8f9182 100644 +index 8aaef0bd5ae9ec8b6e7556b6e9d81fd16beda0cb..a7250582f5b75d6f1b6d96ab503db87dbf16980a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -606,6 +606,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0163-Projectile-offset-config.patch b/patches/server/0164-Projectile-offset-config.patch similarity index 99% rename from patches/server/0163-Projectile-offset-config.patch rename to patches/server/0164-Projectile-offset-config.patch index 80498476a..2a457127b 100644 --- a/patches/server/0163-Projectile-offset-config.patch +++ b/patches/server/0164-Projectile-offset-config.patch @@ -96,7 +96,7 @@ index 5beaafec0759543d3bddf99028c97d0d005be209..086f746cc632a90c67a6c30ea9197c5b entitythrowntrident.pickup = AbstractArrow.Pickup.CREATIVE_ONLY; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3c8e0d9c26473759bc4b2428b17b995eeb8f9182..c185c158f8173fd3c675a699281ec2083f7dd675 100644 +index a7250582f5b75d6f1b6d96ab503db87dbf16980a..690db14fb2b32cfa53e0864704c1ba4d7cc95c5b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -417,6 +417,23 @@ public class PurpurWorldConfig { diff --git a/patches/server/0164-Config-for-powered-rail-activation-distance.patch b/patches/server/0165-Config-for-powered-rail-activation-distance.patch similarity index 94% rename from patches/server/0164-Config-for-powered-rail-activation-distance.patch rename to patches/server/0165-Config-for-powered-rail-activation-distance.patch index e13522905..1673e36b9 100644 --- a/patches/server/0164-Config-for-powered-rail-activation-distance.patch +++ b/patches/server/0165-Config-for-powered-rail-activation-distance.patch @@ -18,7 +18,7 @@ index 7fddb6fa8fd30ef88346a59f7867aae792f13772..40893e71fe8447b695350273bef9623b } else { int j = pos.getX(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index c185c158f8173fd3c675a699281ec2083f7dd675..57b8e78a8b625a8024eb780bf4136723970d94ef 100644 +index 690db14fb2b32cfa53e0864704c1ba4d7cc95c5b..e87624e72af07eae74763130b60d18bc746c4f55 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -592,6 +592,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0165-Piglin-portal-spawn-modifier.patch b/patches/server/0166-Piglin-portal-spawn-modifier.patch similarity index 100% rename from patches/server/0165-Piglin-portal-spawn-modifier.patch rename to patches/server/0166-Piglin-portal-spawn-modifier.patch diff --git a/patches/server/0166-Config-to-change-max-number-of-bees.patch b/patches/server/0167-Config-to-change-max-number-of-bees.patch similarity index 100% rename from patches/server/0166-Config-to-change-max-number-of-bees.patch rename to patches/server/0167-Config-to-change-max-number-of-bees.patch diff --git a/patches/server/0167-Config-for-wither-explosion-radius.patch b/patches/server/0168-Config-for-wither-explosion-radius.patch similarity index 100% rename from patches/server/0167-Config-for-wither-explosion-radius.patch rename to patches/server/0168-Config-for-wither-explosion-radius.patch diff --git a/patches/server/0168-Gamemode-extra-permissions.patch b/patches/server/0169-Gamemode-extra-permissions.patch similarity index 100% rename from patches/server/0168-Gamemode-extra-permissions.patch rename to patches/server/0169-Gamemode-extra-permissions.patch diff --git a/patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch b/patches/server/0170-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch similarity index 96% rename from patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch rename to patches/server/0170-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch index aac79f432..f1aa5b653 100644 --- a/patches/server/0169-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch +++ b/patches/server/0170-Config-for-changing-the-blocks-that-turn-into-dirt-p.patch @@ -18,7 +18,7 @@ index 32995cb5efdad0bc34ecacacb78cccd21220ba8d..ee1ed9262e4f2a8f1889feb7b2d4f64a 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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 31e05cf3dbc075062d358150232cc681ae1eddc1..04bb336f57476cd0234feb1e8f17daad5b2a10e3 100644 +index ada571cec108251e891bd80aeab1a115ed50415f..15635f65629a79d311b379acfd1bef52ea2aa7ca 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -434,6 +434,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0170-Configurable-piston-push-limit.patch b/patches/server/0171-Configurable-piston-push-limit.patch similarity index 96% rename from patches/server/0170-Configurable-piston-push-limit.patch rename to patches/server/0171-Configurable-piston-push-limit.patch index 583e0345e..1dd627ec2 100644 --- a/patches/server/0170-Configurable-piston-push-limit.patch +++ b/patches/server/0171-Configurable-piston-push-limit.patch @@ -36,7 +36,7 @@ index 744d91546d1a810f60a43c15ed74b4158f341a4a..354538daefa603f6df5a139b6bff87db } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 04bb336f57476cd0234feb1e8f17daad5b2a10e3..fccb81528dc58c1d3e204954f610e2e04165e958 100644 +index 15635f65629a79d311b379acfd1bef52ea2aa7ca..95dd923b2102df7feb799b25f5daf57d012b3f31 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -602,6 +602,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0171-Configurable-broadcast-settings.patch b/patches/server/0172-Configurable-broadcast-settings.patch similarity index 100% rename from patches/server/0171-Configurable-broadcast-settings.patch rename to patches/server/0172-Configurable-broadcast-settings.patch diff --git a/patches/server/0172-Configurable-mob-blindness.patch b/patches/server/0173-Configurable-mob-blindness.patch similarity index 96% rename from patches/server/0172-Configurable-mob-blindness.patch rename to patches/server/0173-Configurable-mob-blindness.patch index 04cc71e88..cca6fbf05 100644 --- a/patches/server/0172-Configurable-mob-blindness.patch +++ b/patches/server/0173-Configurable-mob-blindness.patch @@ -28,7 +28,7 @@ index 4f9b44c1a1421969f454cb2984d0b7ce21357225..5fd7fc273f7b33e24d9b1a320c0bdd76 return d0; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index fccb81528dc58c1d3e204954f610e2e04165e958..ed7006fd22c9a9bbb519e75f8d4578b9bab3831e 100644 +index 95dd923b2102df7feb799b25f5daf57d012b3f31..9b4560b61f61d7693477a7b25356532f8082060b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -126,6 +126,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0173-Hide-hidden-players-from-entity-selector.patch b/patches/server/0174-Hide-hidden-players-from-entity-selector.patch similarity index 100% rename from patches/server/0173-Hide-hidden-players-from-entity-selector.patch rename to patches/server/0174-Hide-hidden-players-from-entity-selector.patch diff --git a/patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch b/patches/server/0175-Config-for-health-to-impact-Creeper-explosion-radius.patch similarity index 100% rename from patches/server/0174-Config-for-health-to-impact-Creeper-explosion-radius.patch rename to patches/server/0175-Config-for-health-to-impact-Creeper-explosion-radius.patch diff --git a/patches/server/0175-Iron-golem-calm-anger-options.patch b/patches/server/0176-Iron-golem-calm-anger-options.patch similarity index 100% rename from patches/server/0175-Iron-golem-calm-anger-options.patch rename to patches/server/0176-Iron-golem-calm-anger-options.patch diff --git a/patches/server/0176-Breedable-parrots.patch b/patches/server/0177-Breedable-parrots.patch similarity index 100% rename from patches/server/0176-Breedable-parrots.patch rename to patches/server/0177-Breedable-parrots.patch diff --git a/patches/server/0177-Configurable-powered-rail-boost-modifier.patch b/patches/server/0178-Configurable-powered-rail-boost-modifier.patch similarity index 96% rename from patches/server/0177-Configurable-powered-rail-boost-modifier.patch rename to patches/server/0178-Configurable-powered-rail-boost-modifier.patch index 820b78ba0..e24660fe3 100644 --- a/patches/server/0177-Configurable-powered-rail-boost-modifier.patch +++ b/patches/server/0178-Configurable-powered-rail-boost-modifier.patch @@ -18,7 +18,7 @@ index 05031a1a8b9c42ea5cdf9d8ad9b6aeebe1fc823c..8c6e5e98dd5f425bd9322c01bba06c90 Vec3 vec3d5 = this.getDeltaMovement(); double d21 = vec3d5.x; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7485c50a148c08597ae21b0c0c4951cf5df99ae8..81db1f714160bad239648a6e77e2436a430947da 100644 +index 326af738e7475d9d78fb2bb6a877b86e895b0e48..286f783fa346f27660247747fb4ff9d81d1b7471 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -265,6 +265,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch b/patches/server/0179-Add-config-change-multiplier-critical-damage-value.patch similarity index 96% rename from patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch rename to patches/server/0179-Add-config-change-multiplier-critical-damage-value.patch index bc5118b77..1e7345f44 100644 --- a/patches/server/0178-Add-config-change-multiplier-critical-damage-value.patch +++ b/patches/server/0179-Add-config-change-multiplier-critical-damage-value.patch @@ -18,7 +18,7 @@ index b416c8606ef53aa49458bb6f36689068bc9b54cc..d9fe4f09e48f67fd4b79528a38fcaef9 f += f1; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 81db1f714160bad239648a6e77e2436a430947da..f9075c3d3a0bf7da8c3969606f07129671833a2e 100644 +index 286f783fa346f27660247747fb4ff9d81d1b7471..c71a70be7184327acc03460900b655b2aaa3080a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -364,6 +364,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch b/patches/server/0180-Option-to-disable-dragon-egg-teleporting.patch similarity index 95% rename from patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch rename to patches/server/0180-Option-to-disable-dragon-egg-teleporting.patch index 19211cc12..beb9d6d3b 100644 --- a/patches/server/0179-Option-to-disable-dragon-egg-teleporting.patch +++ b/patches/server/0180-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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index f9075c3d3a0bf7da8c3969606f07129671833a2e..2f77797e267a9da4327137c6abb68a9a9edf9ce8 100644 +index c71a70be7184327acc03460900b655b2aaa3080a..9f145c5d4564033a3555c41bc7500df31bf92ace 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -535,6 +535,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0180-Config-for-unverified-username-message.patch b/patches/server/0181-Config-for-unverified-username-message.patch similarity index 100% rename from patches/server/0180-Config-for-unverified-username-message.patch rename to patches/server/0181-Config-for-unverified-username-message.patch diff --git a/patches/server/0181-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0182-Make-anvil-cumulative-cost-configurable.patch similarity index 100% rename from patches/server/0181-Make-anvil-cumulative-cost-configurable.patch rename to patches/server/0182-Make-anvil-cumulative-cost-configurable.patch diff --git a/patches/server/0182-ShulkerBox-allow-oversized-stacks.patch b/patches/server/0183-ShulkerBox-allow-oversized-stacks.patch similarity index 97% rename from patches/server/0182-ShulkerBox-allow-oversized-stacks.patch rename to patches/server/0183-ShulkerBox-allow-oversized-stacks.patch index f20d62264..a23e4ca80 100644 --- a/patches/server/0182-ShulkerBox-allow-oversized-stacks.patch +++ b/patches/server/0183-ShulkerBox-allow-oversized-stacks.patch @@ -35,7 +35,7 @@ index 0ca6d495005bded447c3f940dfd571a003301cb0..f4c47f7a7f2572dedbaee4890c98e1f3 blockEntity.saveToItem(itemStack); if (shulkerBoxBlockEntity.hasCustomName()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 2f77797e267a9da4327137c6abb68a9a9edf9ce8..93ae0620013ceef2f52ecd57a97e6397dcbc8e96 100644 +index 9f145c5d4564033a3555c41bc7500df31bf92ace..b7967ccd13ff0bfb5ac687a57de4409d05d30bd7 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -644,6 +644,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0183-Bee-can-work-when-raining-or-at-night.patch b/patches/server/0184-Bee-can-work-when-raining-or-at-night.patch similarity index 100% rename from patches/server/0183-Bee-can-work-when-raining-or-at-night.patch rename to patches/server/0184-Bee-can-work-when-raining-or-at-night.patch diff --git a/patches/server/0184-API-for-any-mob-to-burn-daylight.patch b/patches/server/0185-API-for-any-mob-to-burn-daylight.patch similarity index 100% rename from patches/server/0184-API-for-any-mob-to-burn-daylight.patch rename to patches/server/0185-API-for-any-mob-to-burn-daylight.patch diff --git a/patches/server/0185-Config-MobEffect-by-world.patch b/patches/server/0186-Config-MobEffect-by-world.patch similarity index 98% rename from patches/server/0185-Config-MobEffect-by-world.patch rename to patches/server/0186-Config-MobEffect-by-world.patch index 82666ea6e..77d5cf2d4 100644 --- a/patches/server/0185-Config-MobEffect-by-world.patch +++ b/patches/server/0186-Config-MobEffect-by-world.patch @@ -40,7 +40,7 @@ index 17ffab92f4ae2c06fa9f9249a474d4b6c9c55090..bb15cf2aa35ce8754bba56f5b312d92b ((ServerPlayer) entityhuman).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 15796f7fac9105433fc4bbae688d5683e9c3ba40..a444bbe09709a01dc8785449eacfe6364b3cdf95 100644 +index 0576d3523a90c835a99485306ed032b0f28d6fd8..d9a1f1cdeb0c0b65edb11332fdc88b15080ac129 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -321,6 +321,21 @@ public class PurpurWorldConfig { diff --git a/patches/server/0186-Beacon-Activation-Range-Configurable.patch b/patches/server/0187-Beacon-Activation-Range-Configurable.patch similarity index 96% rename from patches/server/0186-Beacon-Activation-Range-Configurable.patch rename to patches/server/0187-Beacon-Activation-Range-Configurable.patch index 651cae5ab..9afab9bc3 100644 --- a/patches/server/0186-Beacon-Activation-Range-Configurable.patch +++ b/patches/server/0187-Beacon-Activation-Range-Configurable.patch @@ -26,7 +26,7 @@ index 5f6eeb36f57bd342b18590c8f0ffb668d2bf273c..59259dd3d8d8fd02c02d7435a4443779 } else { return effectRange; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a444bbe09709a01dc8785449eacfe6364b3cdf95..5d548c0e03e01aaf08b0a7f7368a7683c1e6eb2b 100644 +index d9a1f1cdeb0c0b65edb11332fdc88b15080ac129..8df2cf319c4804dc3de2f210609296be596ad131 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -507,6 +507,17 @@ public class PurpurWorldConfig { diff --git a/patches/server/0187-Add-toggle-for-sand-duping-fix.patch b/patches/server/0188-Add-toggle-for-sand-duping-fix.patch similarity index 95% rename from patches/server/0187-Add-toggle-for-sand-duping-fix.patch rename to patches/server/0188-Add-toggle-for-sand-duping-fix.patch index 5b5b45cab..ba54bb813 100644 --- a/patches/server/0187-Add-toggle-for-sand-duping-fix.patch +++ b/patches/server/0188-Add-toggle-for-sand-duping-fix.patch @@ -27,7 +27,7 @@ index ef07967b64180c54338b8fb2ba1780adec87f333..71e4178bf7d553141719c8a6cb7488d3 } // Paper end - fix sand duping diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 5d548c0e03e01aaf08b0a7f7368a7683c1e6eb2b..19fca7b84002b023cd9b9b2493f37a4178b57b51 100644 +index 8df2cf319c4804dc3de2f210609296be596ad131..df6569a4d1d023143e14d5be694c9e2283ed550f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -670,6 +670,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch similarity index 97% rename from patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch rename to patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch index 3356fe299..5b70b5ca9 100644 --- a/patches/server/0188-Add-toggle-for-end-portal-safe-teleporting.patch +++ b/patches/server/0189-Add-toggle-for-end-portal-safe-teleporting.patch @@ -45,7 +45,7 @@ index 04bae5085756842ce88710646a17e9dc1aad5994..e7658fa9806701505e15cbf1d28ea3bd entity.portalWorld = ((ServerLevel)world); entity.portalBlock = pos.immutable(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 19fca7b84002b023cd9b9b2493f37a4178b57b51..7459fb8fa0e3b14d58e8bb5e89bc4fc2237e2011 100644 +index df6569a4d1d023143e14d5be694c9e2283ed550f..5317dc8eab6b3ee49d7514bf9d4e06c2cb7c3cf5 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -621,6 +621,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0189-Flying-Fall-Damage-API.patch b/patches/server/0190-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/server/0189-Flying-Fall-Damage-API.patch rename to patches/server/0190-Flying-Fall-Damage-API.patch diff --git a/patches/server/0190-Make-lightning-rod-range-configurable.patch b/patches/server/0191-Make-lightning-rod-range-configurable.patch similarity index 96% rename from patches/server/0190-Make-lightning-rod-range-configurable.patch rename to patches/server/0191-Make-lightning-rod-range-configurable.patch index 6843532d0..e225ff0c9 100644 --- a/patches/server/0190-Make-lightning-rod-range-configurable.patch +++ b/patches/server/0191-Make-lightning-rod-range-configurable.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make lightning rod range configurable diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 7156ca622cb5233cd9a0bd5fd77b8db0b7b29772..b5d335a0467c6a5674dc3f4b0c33e841ce6ee4f2 100644 +index 8696f8035508a26497a0715e47593d92f184337d..f5b6a9736937350b9036a03473862d707b8f3d46 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -935,7 +935,7 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch b/patches/server/0192-Burp-after-eating-food-fills-hunger-bar-completely.patch similarity index 97% rename from patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch rename to patches/server/0192-Burp-after-eating-food-fills-hunger-bar-completely.patch index 2fe588d10..06aa909df 100644 --- a/patches/server/0191-Burp-after-eating-food-fills-hunger-bar-completely.patch +++ b/patches/server/0192-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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7459fb8fa0e3b14d58e8bb5e89bc4fc2237e2011..bfbbdd1d368b8c22204b4efcc33a4d252df7feac 100644 +index 5317dc8eab6b3ee49d7514bf9d4e06c2cb7c3cf5..3f027244cc41ce2ab28425b92b15ba752d1d77e0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -380,6 +380,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0192-Allow-player-join-full-server-by-permission.patch b/patches/server/0193-Allow-player-join-full-server-by-permission.patch similarity index 100% rename from patches/server/0192-Allow-player-join-full-server-by-permission.patch rename to patches/server/0193-Allow-player-join-full-server-by-permission.patch diff --git a/patches/server/0193-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0194-Add-permission-bypass-for-portal-waiting.patch similarity index 100% rename from patches/server/0193-Add-permission-bypass-for-portal-waiting.patch rename to patches/server/0194-Add-permission-bypass-for-portal-waiting.patch diff --git a/patches/server/0194-Shulker-spawn-from-bullet-options.patch b/patches/server/0195-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0194-Shulker-spawn-from-bullet-options.patch rename to patches/server/0195-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0195-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0196-Eating-glow-berries-adds-glow-effect.patch similarity index 97% rename from patches/server/0195-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0196-Eating-glow-berries-adds-glow-effect.patch index 994c93f18..188bf1052 100644 --- a/patches/server/0195-Eating-glow-berries-adds-glow-effect.patch +++ b/patches/server/0196-Eating-glow-berries-adds-glow-effect.patch @@ -18,7 +18,7 @@ index 21c9733065f6ecb265e4df8a7080697356c796ac..1ce51253b755c2ea4dca94c567935b07 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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 57abf9cd3f7c96c23a2c56fb414ceb68557581a4..18e8f9a54235be5d887dacf7db05a6ddc240c78e 100644 +index fd2d7270179fa111ea1dbf2f9f8447cd459b33e0..72712004bd5d176e0b7857de5b07487c088259fb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -212,6 +212,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0196-Option-to-make-drowned-break-doors.patch b/patches/server/0197-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0196-Option-to-make-drowned-break-doors.patch rename to patches/server/0197-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0197-Configurable-hunger-starvation-damage.patch b/patches/server/0198-Configurable-hunger-starvation-damage.patch similarity index 100% rename from patches/server/0197-Configurable-hunger-starvation-damage.patch rename to patches/server/0198-Configurable-hunger-starvation-damage.patch diff --git a/patches/server/0198-Enhance-SysoutCatcher.patch b/patches/server/0199-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0198-Enhance-SysoutCatcher.patch rename to patches/server/0199-Enhance-SysoutCatcher.patch diff --git a/patches/server/0199-Armor-click-equip-options.patch b/patches/server/0200-Armor-click-equip-options.patch similarity index 98% rename from patches/server/0199-Armor-click-equip-options.patch rename to patches/server/0200-Armor-click-equip-options.patch index 8b9287fae..e26befd57 100644 --- a/patches/server/0199-Armor-click-equip-options.patch +++ b/patches/server/0200-Armor-click-equip-options.patch @@ -58,7 +58,7 @@ index 42f79d418ec4e2dbeac9a217d9dc144cda2ef714..250c0e31825f772d3fee7a523f150cb2 return InteractionResultHolder.fail(itemStack); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ccc7a7ab410389f5b7fba118b6ff893116f759a0..d098f9a3ee2568c45b051586e36c1a9aea44dada 100644 +index 901da4d174761d3fded38c9228d738934f338998..027378dd64551ca29422235f804aa21e3546d7c8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -383,6 +383,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0200-Add-uptime-command.patch b/patches/server/0201-Add-uptime-command.patch similarity index 100% rename from patches/server/0200-Add-uptime-command.patch rename to patches/server/0201-Add-uptime-command.patch diff --git a/patches/server/0201-Structure-seed-options.patch b/patches/server/0202-Structure-seed-options.patch similarity index 100% rename from patches/server/0201-Structure-seed-options.patch rename to patches/server/0202-Structure-seed-options.patch diff --git a/patches/server/0202-Tool-actionable-options.patch b/patches/server/0203-Tool-actionable-options.patch similarity index 99% rename from patches/server/0202-Tool-actionable-options.patch rename to patches/server/0203-Tool-actionable-options.patch index 35ed312c8..b5efefa44 100644 --- a/patches/server/0202-Tool-actionable-options.patch +++ b/patches/server/0203-Tool-actionable-options.patch @@ -111,7 +111,7 @@ index 180aec596110309aade13d2080f8824d152b07cb..bf0e1f481b4c81f0663366bbe597b066 return InteractionResult.PASS; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d098f9a3ee2568c45b051586e36c1a9aea44dada..22648636601e60b43743509f597f5ac650d309fa 100644 +index 027378dd64551ca29422235f804aa21e3546d7c8..5ac1b7709a5fe26ad07b99671913e339a9a8288e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -510,6 +510,153 @@ public class PurpurWorldConfig { diff --git a/patches/server/0203-Store-placer-on-Block-when-placed.patch b/patches/server/0204-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0203-Store-placer-on-Block-when-placed.patch rename to patches/server/0204-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0204-Summoner-API.patch b/patches/server/0205-Summoner-API.patch similarity index 100% rename from patches/server/0204-Summoner-API.patch rename to patches/server/0205-Summoner-API.patch diff --git a/patches/server/0205-Customizable-sleeping-actionbar-messages.patch b/patches/server/0206-Customizable-sleeping-actionbar-messages.patch similarity index 97% rename from patches/server/0205-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0206-Customizable-sleeping-actionbar-messages.patch index ca064f80a..2d0a4eb5f 100644 --- a/patches/server/0205-Customizable-sleeping-actionbar-messages.patch +++ b/patches/server/0206-Customizable-sleeping-actionbar-messages.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Customizable sleeping actionbar messages diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index b5d335a0467c6a5674dc3f4b0c33e841ce6ee4f2..fe7be109e659ef998992fe48bc28b9e656191089 100644 +index f5b6a9736937350b9036a03473862d707b8f3d46..5de5e89d8ef092cc9de87fb53f363a5136426907 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -984,11 +984,27 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0206-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0207-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 96% rename from patches/server/0206-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0207-option-to-disable-shulker-box-items-from-dropping-co.patch index c34e96ca6..ebfbaa4a8 100644 --- a/patches/server/0206-option-to-disable-shulker-box-items-from-dropping-co.patch +++ b/patches/server/0207-option-to-disable-shulker-box-items-from-dropping-co.patch @@ -19,7 +19,7 @@ index 62d6c5b7590ff4faef5d8c7a8be03155b7338480..72d94c79db5a6d0d41220b34ba6a1787 CompoundTag nbttagcompound = BlockItem.getBlockEntityData(itemstack); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 22648636601e60b43743509f597f5ac650d309fa..6826a2bc2a359140e562b5e3278b31d878216bd6 100644 +index 5ac1b7709a5fe26ad07b99671913e339a9a8288e..159e6247d6499cba126b7010e7b61164bf0d6d0f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -213,6 +213,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0207-Silk-touchable-budding-amethyst.patch b/patches/server/0208-Silk-touchable-budding-amethyst.patch similarity index 100% rename from patches/server/0207-Silk-touchable-budding-amethyst.patch rename to patches/server/0208-Silk-touchable-budding-amethyst.patch diff --git a/patches/server/0208-Big-dripleaf-tilt-delay.patch b/patches/server/0209-Big-dripleaf-tilt-delay.patch similarity index 96% rename from patches/server/0208-Big-dripleaf-tilt-delay.patch rename to patches/server/0209-Big-dripleaf-tilt-delay.patch index d5ccb266b..8acc71d3c 100644 --- a/patches/server/0208-Big-dripleaf-tilt-delay.patch +++ b/patches/server/0209-Big-dripleaf-tilt-delay.patch @@ -24,7 +24,7 @@ index 63aa6b82ba21ec8e8f362b390063e4e275a979a5..81ed6e69494337f402a6d9f854fb26fa if (i != -1) { world.scheduleTick(blockposition, (Block) this, i); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3a9cb286cc53011cf50d00098fc2e02e58929be4..a8a9c96520340041290ab0ccb0a717bad3cf2fb6 100644 +index 98bfdf9f8845ed919f2f6f062d4fc2eff95ddbe7..71d969a78d14948ca7ed5b730a900692e5ee4bf2 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -691,6 +691,22 @@ public class PurpurWorldConfig { diff --git a/patches/server/0209-Player-ridable-in-water-option.patch b/patches/server/0210-Player-ridable-in-water-option.patch similarity index 96% rename from patches/server/0209-Player-ridable-in-water-option.patch rename to patches/server/0210-Player-ridable-in-water-option.patch index 0fb4482c5..b6601eb69 100644 --- a/patches/server/0209-Player-ridable-in-water-option.patch +++ b/patches/server/0210-Player-ridable-in-water-option.patch @@ -21,7 +21,7 @@ index 1eb57eeaec24570cade410f40de9e8c244734217..870e794392b94d140db6d5650c3e7ae3 if (!this.isPassenger() && this.onGround && !this.isInWater() && !this.isInPowderSnow) { if (this.getShoulderEntityLeft().isEmpty()) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a8a9c96520340041290ab0ccb0a717bad3cf2fb6..fd141a7e78e8b59266e0a5b7969187c21ea0d3ae 100644 +index 71d969a78d14948ca7ed5b730a900692e5ee4bf2..e125753d1d5d592b623f141d87966862b6d9846e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -387,6 +387,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0210-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0211-Config-to-disable-Enderman-teleport-on-projectile-hi.patch similarity index 100% rename from patches/server/0210-Config-to-disable-Enderman-teleport-on-projectile-hi.patch rename to patches/server/0211-Config-to-disable-Enderman-teleport-on-projectile-hi.patch diff --git a/patches/server/0211-Add-compass-command.patch b/patches/server/0212-Add-compass-command.patch similarity index 99% rename from patches/server/0211-Add-compass-command.patch rename to patches/server/0212-Add-compass-command.patch index 39c98914e..48e90a6af 100644 --- a/patches/server/0211-Add-compass-command.patch +++ b/patches/server/0212-Add-compass-command.patch @@ -89,7 +89,7 @@ index 5665689a93b3feb1c3622c9447f07a22cb57bbe8..312d29bc2fff8553fd2b58b0b89670d3 hideHiddenPlayersFromEntitySelector = getBoolean("settings.command.hide-hidden-players-from-entity-selector", hideHiddenPlayersFromEntitySelector); uptimeFormat = getString("settings.command.uptime.format", uptimeFormat); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d02663b591c7106205778f2cb5b84d376d798c43..30fd55d1ed21d7f994f9defa1c48a4983ba25a9b 100644 +index bdf2ebb27cc67da95930c9971de3cf2e66bb14d3..1686fb653f35cfd42364a61012b47724ccea115f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -214,6 +214,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0212-Config-to-prevent-horses-from-standing-with-riders.patch b/patches/server/0213-Config-to-prevent-horses-from-standing-with-riders.patch similarity index 100% rename from patches/server/0212-Config-to-prevent-horses-from-standing-with-riders.patch rename to patches/server/0213-Config-to-prevent-horses-from-standing-with-riders.patch diff --git a/patches/server/0213-Toggle-for-kinetic-damage.patch b/patches/server/0214-Toggle-for-kinetic-damage.patch similarity index 95% rename from patches/server/0213-Toggle-for-kinetic-damage.patch rename to patches/server/0214-Toggle-for-kinetic-damage.patch index e6563adc0..51db557a3 100644 --- a/patches/server/0213-Toggle-for-kinetic-damage.patch +++ b/patches/server/0214-Toggle-for-kinetic-damage.patch @@ -17,7 +17,7 @@ index 6959ea94bc2efc4417345365be4c506ee11c60bf..6e7af1939df4ff99d6d4645f7ed27011 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 72c10c03f5c0c43fe7f68b647f5ee06d1fc057ef..afcda37ba58e364239fad9ab719188b6eab52b84 100644 +index cbfaebf03d9de4086306e7feac0f894e2ec0a23f..1d1151f341f005be3ee4c4ec8cce04491628c331 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -176,12 +176,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0214-Add-Option-for-disable-observer-clocks.patch b/patches/server/0215-Add-Option-for-disable-observer-clocks.patch similarity index 95% rename from patches/server/0214-Add-Option-for-disable-observer-clocks.patch rename to patches/server/0215-Add-Option-for-disable-observer-clocks.patch index c04026b02..34ac0cef1 100644 --- a/patches/server/0214-Add-Option-for-disable-observer-clocks.patch +++ b/patches/server/0215-Add-Option-for-disable-observer-clocks.patch @@ -18,7 +18,7 @@ index 25c2c44bde443ab08734253ed7c98c81a345e573..e6a8c78a1a76241bcc6f0dee07838cb4 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index afcda37ba58e364239fad9ab719188b6eab52b84..7afc9e3785b718a5eb756ac3b4478bf6905087df 100644 +index 1d1151f341f005be3ee4c4ec8cce04491628c331..994bf424da78ac632e7967b14c2dabda4d4be00a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -359,6 +359,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0215-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0216-Customizeable-Zombie-Villager-curing-times.patch similarity index 100% rename from patches/server/0215-Customizeable-Zombie-Villager-curing-times.patch rename to patches/server/0216-Customizeable-Zombie-Villager-curing-times.patch diff --git a/patches/server/0216-Option-for-sponges-to-work-on-lava.patch b/patches/server/0217-Option-for-sponges-to-work-on-lava.patch similarity index 95% rename from patches/server/0216-Option-for-sponges-to-work-on-lava.patch rename to patches/server/0217-Option-for-sponges-to-work-on-lava.patch index 1bdac22af..526995d3a 100644 --- a/patches/server/0216-Option-for-sponges-to-work-on-lava.patch +++ b/patches/server/0217-Option-for-sponges-to-work-on-lava.patch @@ -18,7 +18,7 @@ index d96e3fbc0fd4275c29e7e6154ef66e9ed1a5d829..df04a571ebd3c04bc7b58c1ee5661a1f ++i; if (j < world.purpurConfig.spongeAbsorptionRadius) { // Purpur diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d2b2c7bd740aff87713c1cdec295b2bc32325a8d..54d6fbcd738dc84a1bc4234b8e89b00f500cf9c1 100644 +index eeb6d629c945b8c3066a344ddd19ce665a454fc1..2bfd21b5dc2b96e68c90dff93ec34bb8c90da333 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -891,9 +891,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0217-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0218-Toggle-for-Wither-s-spawn-sound.patch similarity index 100% rename from patches/server/0217-Toggle-for-Wither-s-spawn-sound.patch rename to patches/server/0218-Toggle-for-Wither-s-spawn-sound.patch diff --git a/patches/server/0218-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0219-Cactus-breaks-from-solid-neighbors-config.patch similarity index 95% rename from patches/server/0218-Cactus-breaks-from-solid-neighbors-config.patch rename to patches/server/0219-Cactus-breaks-from-solid-neighbors-config.patch index b99486636..ddcb82474 100644 --- a/patches/server/0218-Cactus-breaks-from-solid-neighbors-config.patch +++ b/patches/server/0219-Cactus-breaks-from-solid-neighbors-config.patch @@ -18,7 +18,7 @@ index 0fbabb84ef13e68b12212d9bfeb885c78893c116..56fa0e377b20ed063e47358be9e6bba8 return false; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7120d004cb6398c0b68fdf1608ad0f75111e2557..79262b4ae6e15c2323ecc7901acf2c8bc0411a09 100644 +index 67f196626ee04c0366e3cd50413d4bb40016a870..1fd330da3aca6231a00b735691a8fc81229b87d0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -723,6 +723,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0219-Config-to-remove-curse-of-binding-with-weakness.patch b/patches/server/0220-Config-to-remove-curse-of-binding-with-weakness.patch similarity index 96% rename from patches/server/0219-Config-to-remove-curse-of-binding-with-weakness.patch rename to patches/server/0220-Config-to-remove-curse-of-binding-with-weakness.patch index 66b684f8f..c3d8ed55b 100644 --- a/patches/server/0219-Config-to-remove-curse-of-binding-with-weakness.patch +++ b/patches/server/0220-Config-to-remove-curse-of-binding-with-weakness.patch @@ -26,7 +26,7 @@ index 12643d60f4bfa8e07901aa0a556a1a245b0a7fb4..96a4a9f9b673a07630493290f5d5315e @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 79262b4ae6e15c2323ecc7901acf2c8bc0411a09..bac3d00594548f569a70d048cdd6bb10cd77f48b 100644 +index 1fd330da3aca6231a00b735691a8fc81229b87d0..0cff6adbaeba661cec9727cbbc32765dec33e3f3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -397,6 +397,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0220-Conduit-behavior-configuration.patch b/patches/server/0221-Conduit-behavior-configuration.patch similarity index 100% rename from patches/server/0220-Conduit-behavior-configuration.patch rename to patches/server/0221-Conduit-behavior-configuration.patch diff --git a/patches/server/0221-Cauldron-fill-chances.patch b/patches/server/0222-Cauldron-fill-chances.patch similarity index 100% rename from patches/server/0221-Cauldron-fill-chances.patch rename to patches/server/0222-Cauldron-fill-chances.patch diff --git a/patches/server/0222-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0223-Config-to-allow-mobs-to-pathfind-over-rails.patch similarity index 96% rename from patches/server/0222-Config-to-allow-mobs-to-pathfind-over-rails.patch rename to patches/server/0223-Config-to-allow-mobs-to-pathfind-over-rails.patch index 600ae1fca..39df8d125 100644 --- a/patches/server/0222-Config-to-allow-mobs-to-pathfind-over-rails.patch +++ b/patches/server/0223-Config-to-allow-mobs-to-pathfind-over-rails.patch @@ -18,7 +18,7 @@ index ede91a2fbe67480d2b6bcdeb776f87da0b69bdae..444bec169c0cd5fe1a23f1d14fae1a10 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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 11a3ac969544df828a78dff97e5ca3411b16f98f..38ec31046c2d883c133bd053d89c015d6ca0ced6 100644 +index 35f5784bc147836f95e6136f1eed6ce228cfc920..80b9246d659543381ea378430c8bd154c9d92d72 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -132,6 +132,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0223-Shulker-change-color-with-dye.patch b/patches/server/0224-Shulker-change-color-with-dye.patch similarity index 100% rename from patches/server/0223-Shulker-change-color-with-dye.patch rename to patches/server/0224-Shulker-change-color-with-dye.patch diff --git a/patches/server/0224-Extended-OfflinePlayer-API.patch b/patches/server/0225-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/server/0224-Extended-OfflinePlayer-API.patch rename to patches/server/0225-Extended-OfflinePlayer-API.patch diff --git a/patches/server/0225-Added-the-ability-to-add-combustible-items.patch b/patches/server/0226-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/server/0225-Added-the-ability-to-add-combustible-items.patch rename to patches/server/0226-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/server/0226-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0227-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 94% rename from patches/server/0226-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0227-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch index b119d7c4e..cf7c2942e 100644 --- a/patches/server/0226-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch +++ b/patches/server/0227-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index fe7be109e659ef998992fe48bc28b9e656191089..506e7a77d65215e29973771601176156705d11ba 100644 +index 5de5e89d8ef092cc9de87fb53f363a5136426907..9b425b9443e491dc832548f5dc733bf3d29da801 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1143,6 +1143,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -25,7 +25,7 @@ index fe7be109e659ef998992fe48bc28b9e656191089..506e7a77d65215e29973771601176156 // 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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3b68fe0f5ec84600e4bfd722a0787ab52af973fd..7aa7e6ccbe65b49a29f1938c4fd3c17ce7c24aac 100644 +index c1d32420041d78aaf3ba5c5ba11191ed955578e1..031f5a908707b54ecac0f9b55025c9d08444dc92 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -133,6 +133,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0227-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0228-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 98% rename from patches/server/0227-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0228-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch index 6ef6516f8..2ef45a7b5 100644 --- a/patches/server/0227-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch +++ b/patches/server/0228-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch @@ -45,7 +45,7 @@ index bcc1ce196c1dbf60cf6ae73d95766dc41ed22012..ad0ee0d333ffd862fe74ac3a097c51d5 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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7aa7e6ccbe65b49a29f1938c4fd3c17ce7c24aac..d92a9d187fea8afc1ea0453addda99cd715c034e 100644 +index 031f5a908707b54ecac0f9b55025c9d08444dc92..be6c531fa6f53bdf53040f8b6e1b7f13bd7e17ca 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -683,6 +683,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0229-Shift-right-click-to-use-exp-for-mending.patch similarity index 98% rename from patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0229-Shift-right-click-to-use-exp-for-mending.patch index 35910a52a..a67cfca26 100644 --- a/patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch +++ b/patches/server/0229-Shift-right-click-to-use-exp-for-mending.patch @@ -48,7 +48,7 @@ index aa41e4aed283297b923985f7ceee914cb62666a9..4d61504698a54af354fdf047426f8777 cancelled = event.useItemInHand() == Event.Result.DENY; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d92a9d187fea8afc1ea0453addda99cd715c034e..58ba485716b6d2141a8aa202cbd049c1ba7a4a1d 100644 +index be6c531fa6f53bdf53040f8b6e1b7f13bd7e17ca..da7bace72794ae1188f18462f12e48a86b49ee5f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -404,6 +404,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0229-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0230-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0229-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0230-Dolphins-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0230-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0231-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0230-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0231-Cows-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0232-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 96% rename from patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0232-Option-for-beds-to-explode-on-villager-sleep.patch index 2038a3479..d26b1704d 100644 --- a/patches/server/0231-Option-for-beds-to-explode-on-villager-sleep.patch +++ b/patches/server/0232-Option-for-beds-to-explode-on-villager-sleep.patch @@ -22,7 +22,7 @@ index 89435b0742064d77c7cc8bb871949acc9852f2c0..f04778287545e9619ee0359f1e51151d this.brain.setMemory(MemoryModuleType.LAST_SLEPT, this.level.getGameTime()); // CraftBukkit - decompile error this.brain.eraseMemory(MemoryModuleType.WALK_TARGET); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 302bcc8413d99be8d79c58c9ecabc5e2bd6e493b..061e2a6c362c6a3d65520835b7f0b63d656def81 100644 +index b88a695d1521ae3a2dbf1e1bba9f79a9e66abcda..a7870ac5214814d5b109b1b9534adcac8f4ec671 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -702,11 +702,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0232-Halloween-options-and-optimizations.patch b/patches/server/0233-Halloween-options-and-optimizations.patch similarity index 100% rename from patches/server/0232-Halloween-options-and-optimizations.patch rename to patches/server/0233-Halloween-options-and-optimizations.patch diff --git a/patches/server/0233-Config-for-grindstones.patch b/patches/server/0234-Config-for-grindstones.patch similarity index 100% rename from patches/server/0233-Config-for-grindstones.patch rename to patches/server/0234-Config-for-grindstones.patch diff --git a/patches/server/0234-UPnP-Port-Forwarding.patch b/patches/server/0235-UPnP-Port-Forwarding.patch similarity index 100% rename from patches/server/0234-UPnP-Port-Forwarding.patch rename to patches/server/0235-UPnP-Port-Forwarding.patch diff --git a/patches/server/0235-Campfire-option-for-lit-when-placed.patch b/patches/server/0236-Campfire-option-for-lit-when-placed.patch similarity index 96% rename from patches/server/0235-Campfire-option-for-lit-when-placed.patch rename to patches/server/0236-Campfire-option-for-lit-when-placed.patch index 5354f6529..266c863c3 100644 --- a/patches/server/0235-Campfire-option-for-lit-when-placed.patch +++ b/patches/server/0236-Campfire-option-for-lit-when-placed.patch @@ -18,7 +18,7 @@ index a4c44cb59dee29cf227dbb51bfc1576d89dfb2e3..551bacade8642e6aad17120d8a901bcc @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 03e2531b7057eaa2c52c641ff311ca8654a35c19..d2485e5f86a4fb010daf867ea1ff293c137fd23e 100644 +index 07de23c955b523eb24b73062bed64484e63652e8..09bc2158fa55dd7a1a28f864052fe75829d8295d 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -745,6 +745,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0236-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0237-options-to-extinguish-fire-blocks-with-snowballs.patch similarity index 98% rename from patches/server/0236-options-to-extinguish-fire-blocks-with-snowballs.patch rename to patches/server/0237-options-to-extinguish-fire-blocks-with-snowballs.patch index 5a3ec7a40..b9996a9c2 100644 --- a/patches/server/0236-options-to-extinguish-fire-blocks-with-snowballs.patch +++ b/patches/server/0237-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/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index d2485e5f86a4fb010daf867ea1ff293c137fd23e..ed943bcee4bcd988cff15e3121161e9d102e787d 100644 +index 09bc2158fa55dd7a1a28f864052fe75829d8295d..15808105f0e0d233c6bb9b731100cd4aded944f4 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -223,6 +223,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0237-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0238-Add-option-to-disable-zombie-villagers-cure.patch similarity index 100% rename from patches/server/0237-Add-option-to-disable-zombie-villagers-cure.patch rename to patches/server/0238-Add-option-to-disable-zombie-villagers-cure.patch diff --git a/patches/server/0238-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0239-Persistent-BlockEntity-Lore-and-DisplayName.patch similarity index 99% rename from patches/server/0238-Persistent-BlockEntity-Lore-and-DisplayName.patch rename to patches/server/0239-Persistent-BlockEntity-Lore-and-DisplayName.patch index 20e7d6beb..e0b29f6f3 100644 --- a/patches/server/0238-Persistent-BlockEntity-Lore-and-DisplayName.patch +++ b/patches/server/0239-Persistent-BlockEntity-Lore-and-DisplayName.patch @@ -195,7 +195,7 @@ index b96d57b0bcf21508f8e03e96b7553eb486fdf212..d3de829a4ab5f5a127fb026a8cb4ef4e + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 8d620dad9c7995b4e8ed30188acfc9959e3e5d42..e29b7864457c951e62644a040f03e9af722914fd 100644 +index 65bcdead59468e94932866f4003d1b97b6288623..d0d901ad9837ba4b64b78e3a4e0d93e67a278cc3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -124,6 +124,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0239-Signs-allow-color-codes.patch b/patches/server/0240-Signs-allow-color-codes.patch similarity index 98% rename from patches/server/0239-Signs-allow-color-codes.patch rename to patches/server/0240-Signs-allow-color-codes.patch index e2ee0e484..3be5caf91 100644 --- a/patches/server/0239-Signs-allow-color-codes.patch +++ b/patches/server/0240-Signs-allow-color-codes.patch @@ -70,7 +70,7 @@ index 6c96c3dde4e1b1b1b6952841edb41006e73737e9..c02cf76cce353aff189b3e0a967e88f7 public CompoundTag getUpdateTag() { return this.saveWithoutMetadata(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index e29b7864457c951e62644a040f03e9af722914fd..7049742009d6deb4e05588c06e50daddc1258e5f 100644 +index d0d901ad9837ba4b64b78e3a4e0d93e67a278cc3..34d28faa731652a803405f9c97e0c6334a9f5ac0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -915,8 +915,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0240-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch b/patches/server/0241-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch similarity index 99% rename from patches/server/0240-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch rename to patches/server/0241-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch index 9f56fc231..f0dec0695 100644 --- a/patches/server/0240-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch +++ b/patches/server/0241-Kelp-weeping-and-twisting-vines-configurable-max-gro.patch @@ -131,7 +131,7 @@ index e5c135ec059746b75fe58516809584221285cdbe..b09ccc493c7503aa99a64d760b5bc769 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 7049742009d6deb4e05588c06e50daddc1258e5f..dad9ee9b52a152bd64f116e83ed95e29c62003ad 100644 +index 34d28faa731652a803405f9c97e0c6334a9f5ac0..e200eb02abaaff75195532193b5499e04545d18b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -768,6 +768,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0241-Mobs-always-drop-experience.patch b/patches/server/0242-Mobs-always-drop-experience.patch similarity index 100% rename from patches/server/0241-Mobs-always-drop-experience.patch rename to patches/server/0242-Mobs-always-drop-experience.patch diff --git a/patches/server/0242-Potion-NamespacedKey.patch b/patches/server/0243-Potion-NamespacedKey.patch similarity index 100% rename from patches/server/0242-Potion-NamespacedKey.patch rename to patches/server/0243-Potion-NamespacedKey.patch diff --git a/patches/server/0243-Grindstone-API.patch b/patches/server/0244-Grindstone-API.patch similarity index 100% rename from patches/server/0243-Grindstone-API.patch rename to patches/server/0244-Grindstone-API.patch diff --git a/patches/server/0244-Option-to-prevent-spiders-from-climbing-world-border.patch b/patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch similarity index 100% rename from patches/server/0244-Option-to-prevent-spiders-from-climbing-world-border.patch rename to patches/server/0245-Option-to-prevent-spiders-from-climbing-world-border.patch diff --git a/patches/server/0245-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0246-Ability-for-hoe-to-replant-crops-and-nether-warts.patch similarity index 98% rename from patches/server/0245-Ability-for-hoe-to-replant-crops-and-nether-warts.patch rename to patches/server/0246-Ability-for-hoe-to-replant-crops-and-nether-warts.patch index 1fc695871..21ea0a30a 100644 --- a/patches/server/0245-Ability-for-hoe-to-replant-crops-and-nether-warts.patch +++ b/patches/server/0246-Ability-for-hoe-to-replant-crops-and-nether-warts.patch @@ -74,7 +74,7 @@ index d1d10a7a62c7372634e22d6df8fc7d085d051237..e6a37649900f55d7178f7cd876b71c5d + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 19822b3807a08c75d2d8039d0783ec7cc371aca9..881ce9d1f084f8de86daa7669ce0badff4e582c2 100644 +index 493ebb58ddbcd6d78e48b7fe5f66d3a385c38746..c3f66860b5a153eb1a8f88d81fd0e7f19383a5eb 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -545,6 +545,8 @@ public class PurpurWorldConfig { diff --git a/patches/server/0246-Shearing-jeb-produces-random-color-wool.patch b/patches/server/0247-Shearing-jeb-produces-random-color-wool.patch similarity index 100% rename from patches/server/0246-Shearing-jeb-produces-random-color-wool.patch rename to patches/server/0247-Shearing-jeb-produces-random-color-wool.patch diff --git a/patches/server/0247-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0248-Turtle-eggs-random-tick-crack-chance.patch similarity index 96% rename from patches/server/0247-Turtle-eggs-random-tick-crack-chance.patch rename to patches/server/0248-Turtle-eggs-random-tick-crack-chance.patch index c0504b4f5..f85baf1b0 100644 --- a/patches/server/0247-Turtle-eggs-random-tick-crack-chance.patch +++ b/patches/server/0248-Turtle-eggs-random-tick-crack-chance.patch @@ -32,7 +32,7 @@ index 4907e0acb7d01b7f57b75579e58ce743e3e000bb..5e6df1d6cbaecb986d1b8d382fe673a2 @Override diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 98eb49d68ffa866247fc7672c087cbd955d76867..5dfab4b06ac52424a4a45a12ec435d6d6330cbcc 100644 +index 4e89843d98bf0cd09032eeed36e0c2f90af15e5e..1e7b7a560b12b3de0a23124c58bc73e001189d92 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -963,11 +963,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0248-Mob-head-visibility-percent.patch b/patches/server/0249-Mob-head-visibility-percent.patch similarity index 100% rename from patches/server/0248-Mob-head-visibility-percent.patch rename to patches/server/0249-Mob-head-visibility-percent.patch diff --git a/patches/server/0249-Configurable-valid-characters-for-usernames.patch b/patches/server/0250-Configurable-valid-characters-for-usernames.patch similarity index 100% rename from patches/server/0249-Configurable-valid-characters-for-usernames.patch rename to patches/server/0250-Configurable-valid-characters-for-usernames.patch diff --git a/patches/server/0250-Shears-can-have-looting-enchantment.patch b/patches/server/0251-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/server/0250-Shears-can-have-looting-enchantment.patch rename to patches/server/0251-Shears-can-have-looting-enchantment.patch diff --git a/patches/server/0251-Stop-bees-from-dying-after-stinging.patch b/patches/server/0252-Stop-bees-from-dying-after-stinging.patch similarity index 100% rename from patches/server/0251-Stop-bees-from-dying-after-stinging.patch rename to patches/server/0252-Stop-bees-from-dying-after-stinging.patch diff --git a/patches/server/0252-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0253-Give-bee-counts-in-beehives-to-Purpur-clients.patch similarity index 100% rename from patches/server/0252-Give-bee-counts-in-beehives-to-Purpur-clients.patch rename to patches/server/0253-Give-bee-counts-in-beehives-to-Purpur-clients.patch diff --git a/patches/server/0253-Configurable-farmland-trample-height.patch b/patches/server/0254-Configurable-farmland-trample-height.patch similarity index 97% rename from patches/server/0253-Configurable-farmland-trample-height.patch rename to patches/server/0254-Configurable-farmland-trample-height.patch index fb7f87640..45520129d 100644 --- a/patches/server/0253-Configurable-farmland-trample-height.patch +++ b/patches/server/0254-Configurable-farmland-trample-height.patch @@ -35,7 +35,7 @@ index e5a3e3a4367dfb924624a913b816b3fd56e3fefd..7068cb39ab264fa0c65febff01236b8d org.bukkit.event.Cancellable cancellable; if (entity instanceof Player) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index ff48b818df8d2f2f9ca399257242f47e78cbc5e9..81f7e2bebd0a0b5347057edc27c95c31d4f5fbcb 100644 +index 96a586d893373cf21ee3d1510f54d897faad457a..f8eec38a4cec2946e1e2cd56cf82ebd637040067 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -834,6 +834,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0254-Configurable-player-pickup-exp-delay.patch b/patches/server/0255-Configurable-player-pickup-exp-delay.patch similarity index 97% rename from patches/server/0254-Configurable-player-pickup-exp-delay.patch rename to patches/server/0255-Configurable-player-pickup-exp-delay.patch index db294d189..b27ef1b99 100644 --- a/patches/server/0254-Configurable-player-pickup-exp-delay.patch +++ b/patches/server/0255-Configurable-player-pickup-exp-delay.patch @@ -37,7 +37,7 @@ index 870e794392b94d140db6d5650c3e7ae3dd6f593d..7344324517fb10ee6ab3467b40fcb9cd } else if (!entity.isRemoved()) { this.touch(entity); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 81f7e2bebd0a0b5347057edc27c95c31d4f5fbcb..b9d4912e24e647d0f0807a79abe8476363686b17 100644 +index f8eec38a4cec2946e1e2cd56cf82ebd637040067..bfa029905775534a5ac5d01aa0085c4f08de4cf9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -413,6 +413,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0255-Allow-void-trading.patch b/patches/server/0256-Allow-void-trading.patch similarity index 93% rename from patches/server/0255-Allow-void-trading.patch rename to patches/server/0256-Allow-void-trading.patch index 3dc6a1953..1af4f8aae 100644 --- a/patches/server/0255-Allow-void-trading.patch +++ b/patches/server/0256-Allow-void-trading.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow void trading diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 506e7a77d65215e29973771601176156705d11ba..6d61c3685030705fab277e271473db018e0a7292 100644 +index 9b425b9443e491dc832548f5dc733bf3d29da801..1182e5b5015153b55eb3e74b3ae466e260566954 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -2681,7 +2681,7 @@ public class ServerLevel extends Level implements WorldGenLevel { @@ -18,7 +18,7 @@ index 506e7a77d65215e29973771601176156705d11ba..6d61c3685030705fab277e271473db01 } // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index b9d4912e24e647d0f0807a79abe8476363686b17..e37d31a008c46eabd07b034df6c1df6e30df459d 100644 +index bfa029905775534a5ac5d01aa0085c4f08de4cf9..f187872e96f41e5c97c9f1bc71c859310769f914 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -414,6 +414,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0256-Dont-eat-blocks-in-non-ticking-chunks.patch b/patches/server/0257-Dont-eat-blocks-in-non-ticking-chunks.patch similarity index 100% rename from patches/server/0256-Dont-eat-blocks-in-non-ticking-chunks.patch rename to patches/server/0257-Dont-eat-blocks-in-non-ticking-chunks.patch diff --git a/patches/server/0257-Configurable-phantom-size.patch b/patches/server/0258-Configurable-phantom-size.patch similarity index 100% rename from patches/server/0257-Configurable-phantom-size.patch rename to patches/server/0258-Configurable-phantom-size.patch diff --git a/patches/server/0258-Configurable-food-attributes.patch b/patches/server/0259-Configurable-food-attributes.patch similarity index 100% rename from patches/server/0258-Configurable-food-attributes.patch rename to patches/server/0259-Configurable-food-attributes.patch diff --git a/patches/server/0259-Max-joins-per-second.patch b/patches/server/0260-Max-joins-per-second.patch similarity index 100% rename from patches/server/0259-Max-joins-per-second.patch rename to patches/server/0260-Max-joins-per-second.patch diff --git a/patches/server/0260-Configurable-minimum-demand-for-trades.patch b/patches/server/0261-Configurable-minimum-demand-for-trades.patch similarity index 100% rename from patches/server/0260-Configurable-minimum-demand-for-trades.patch rename to patches/server/0261-Configurable-minimum-demand-for-trades.patch diff --git a/patches/server/0261-Lobotomize-stuck-villagers.patch b/patches/server/0262-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0261-Lobotomize-stuck-villagers.patch rename to patches/server/0262-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0262-Option-for-villager-display-trade-item.patch b/patches/server/0263-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0262-Option-for-villager-display-trade-item.patch rename to patches/server/0263-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0263-Fill-command-max-area-option.patch b/patches/server/0264-Fill-command-max-area-option.patch similarity index 100% rename from patches/server/0263-Fill-command-max-area-option.patch rename to patches/server/0264-Fill-command-max-area-option.patch diff --git a/patches/server/0264-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0265-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 95% rename from patches/server/0264-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0265-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch index 30f693bc7..b29a1b2c7 100644 --- a/patches/server/0264-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch +++ b/patches/server/0265-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch @@ -17,7 +17,7 @@ index 18389f46902bb9879ac6d734723e9a720724dc48..b2b8663a9cff08bacdab91c7bb014ba6 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 4847a19105125d5083fe6bd990c85f2d3f874c82..9e040534c6e7154765ec126a6bbadb37de0350e5 100644 +index c1affafde07585dbde862430da0b1dac1d67004c..26eebec4e0ea35ffbed09b9e7192cdf58cc08243 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -952,8 +952,10 @@ public class PurpurWorldConfig { diff --git a/patches/server/0265-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0266-Config-for-mob-last-hurt-by-player-time.patch similarity index 97% rename from patches/server/0265-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0266-Config-for-mob-last-hurt-by-player-time.patch index d70675843..20831afff 100644 --- a/patches/server/0265-Config-for-mob-last-hurt-by-player-time.patch +++ b/patches/server/0266-Config-for-mob-last-hurt-by-player-time.patch @@ -38,7 +38,7 @@ index 1e854090c986f480e35fac5c6f347e72904f9ab5..76a4803decea19f8bed8cb11e73bd789 // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 9e040534c6e7154765ec126a6bbadb37de0350e5..a38b75383704b910ca89de66b6058fb7825b9811 100644 +index 26eebec4e0ea35ffbed09b9e7192cdf58cc08243..fcfa2d9585eeb61a44e2e9d2519f2a7b7837a762 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -136,6 +136,7 @@ public class PurpurWorldConfig { diff --git a/patches/server/0266-Anvil-repair-damage-options.patch b/patches/server/0267-Anvil-repair-damage-options.patch similarity index 98% rename from patches/server/0266-Anvil-repair-damage-options.patch rename to patches/server/0267-Anvil-repair-damage-options.patch index 78f6f42d9..8ff0ac986 100644 --- a/patches/server/0266-Anvil-repair-damage-options.patch +++ b/patches/server/0267-Anvil-repair-damage-options.patch @@ -64,7 +64,7 @@ index 1b23352a9deae37f9c947fef1b1f8a2875507cfa..ad5aad3682926e2e8965bb87ad8d5381 return InteractionResult.SUCCESS; } else { diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a38b75383704b910ca89de66b6058fb7825b9811..11be49c97e805f6b16b9139abc701b7214ac0d2d 100644 +index fcfa2d9585eeb61a44e2e9d2519f2a7b7837a762..04b22296fa2f7ba49eace98dcf9faf9f0fcd90e0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -699,8 +699,12 @@ public class PurpurWorldConfig { diff --git a/patches/server/0267-Fix-legacy-colors-in-console.patch b/patches/server/0268-Fix-legacy-colors-in-console.patch similarity index 100% rename from patches/server/0267-Fix-legacy-colors-in-console.patch rename to patches/server/0268-Fix-legacy-colors-in-console.patch diff --git a/patches/server/0268-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0269-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 96% rename from patches/server/0268-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0269-Option-to-disable-turtle-egg-trampling-with-feather-.patch index ed329468f..9574da3f3 100644 --- a/patches/server/0268-Option-to-disable-turtle-egg-trampling-with-feather-.patch +++ b/patches/server/0269-Option-to-disable-turtle-egg-trampling-with-feather-.patch @@ -20,7 +20,7 @@ index 5e6df1d6cbaecb986d1b8d382fe673a2cbb76115..6151226a88a9ca44955821521641e788 // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 11be49c97e805f6b16b9139abc701b7214ac0d2d..ccf56c1a804dad02faa16a8ba8efad2c3b3a59a2 100644 +index 04b22296fa2f7ba49eace98dcf9faf9f0fcd90e0..8ef68901082975716b3684b240fb847b04d70b55 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -978,12 +978,14 @@ public class PurpurWorldConfig { diff --git a/patches/server/0269-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0270-Add-toggle-for-enchant-level-clamping.patch similarity index 100% rename from patches/server/0269-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0270-Add-toggle-for-enchant-level-clamping.patch diff --git a/patches/server/0270-Config-to-prevent-horses-from-standing-when-hurt.patch b/patches/server/0271-Config-to-prevent-horses-from-standing-when-hurt.patch similarity index 100% rename from patches/server/0270-Config-to-prevent-horses-from-standing-when-hurt.patch rename to patches/server/0271-Config-to-prevent-horses-from-standing-when-hurt.patch diff --git a/patches/server/0271-Drop-incompatible-tests.patch b/patches/server/0272-Drop-incompatible-tests.patch similarity index 100% rename from patches/server/0271-Drop-incompatible-tests.patch rename to patches/server/0272-Drop-incompatible-tests.patch diff --git a/patches/server/0272-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0273-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0272-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0273-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0273-Stonecutter-damage.patch b/patches/server/0274-Stonecutter-damage.patch similarity index 98% rename from patches/server/0273-Stonecutter-damage.patch rename to patches/server/0274-Stonecutter-damage.patch index 04acf5faa..d9248a0a6 100644 --- a/patches/server/0273-Stonecutter-damage.patch +++ b/patches/server/0274-Stonecutter-damage.patch @@ -95,7 +95,7 @@ index 127df4a4c5c84f5e260104a4cc8ef092f7cf9e07..bcb386d4cbd37ed41cf27808c7104d27 public static boolean advancementOnlyBroadcastToAffectedPlayer = false; diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 3d83e4124c827acf19db788af2b02afd11150df4..a22b9f2125469418bc22c81a0c604f358449c8f5 100644 +index 553e86c7461be4f9ee5b3c4b48013688b3a3debe..af2128d8baa30f826850320c79aff037cebd5059 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -973,6 +973,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0274-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0275-Configurable-damage-settings-for-magma-blocks.patch similarity index 96% rename from patches/server/0274-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0275-Configurable-damage-settings-for-magma-blocks.patch index f3193aa5b..b76a9215c 100644 --- a/patches/server/0274-Configurable-damage-settings-for-magma-blocks.patch +++ b/patches/server/0275-Configurable-damage-settings-for-magma-blocks.patch @@ -18,7 +18,7 @@ index d3540a4daaa8021ae009bfd4d9ef4f1172ab4c56..2b250439f263f64db7920536ed6eaf64 entity.hurt(DamageSource.HOT_FLOOR, 1.0F); org.bukkit.craftbukkit.event.CraftEventFactory.blockDamage = null; // CraftBukkit diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index a22b9f2125469418bc22c81a0c604f358449c8f5..322eecc6688df6c3c56d88632993ad7f960156c1 100644 +index af2128d8baa30f826850320c79aff037cebd5059..831753b4bb6be4d13e90905d41be99bf5874bade 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -909,6 +909,13 @@ public class PurpurWorldConfig { diff --git a/patches/server/0275-Add-config-for-snow-on-blue-ice.patch b/patches/server/0276-Add-config-for-snow-on-blue-ice.patch similarity index 95% rename from patches/server/0275-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0276-Add-config-for-snow-on-blue-ice.patch index 790e1f456..cdeb26f4c 100644 --- a/patches/server/0275-Add-config-for-snow-on-blue-ice.patch +++ b/patches/server/0276-Add-config-for-snow-on-blue-ice.patch @@ -22,7 +22,7 @@ index 14e00c7feb1c051d56a3d27cd00dcef072dd771a..4952fb1aaaafb55baa0fddb389f966a1 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 322eecc6688df6c3c56d88632993ad7f960156c1..e4dd5b270441276c18d8d7578f8ad8519278fafd 100644 +index 831753b4bb6be4d13e90905d41be99bf5874bade..cef54b0dbaa04cb236c602073489812a37fa4950 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -878,9 +878,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0276-Fix-bold-text-in-console.patch b/patches/server/0277-Fix-bold-text-in-console.patch similarity index 100% rename from patches/server/0276-Fix-bold-text-in-console.patch rename to patches/server/0277-Fix-bold-text-in-console.patch diff --git a/patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch b/patches/server/0278-Add-log-suppression-for-sent-expired-chat.patch similarity index 100% rename from patches/server/0277-Add-log-suppression-for-sent-expired-chat.patch rename to patches/server/0278-Add-log-suppression-for-sent-expired-chat.patch diff --git a/patches/server/0278-Fix-RandomSource-NPE.patch b/patches/server/0278-Fix-RandomSource-NPE.patch deleted file mode 100644 index 3c42bb408..000000000 --- a/patches/server/0278-Fix-RandomSource-NPE.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: BillyGalbreath -Date: Sun, 12 Jun 2022 09:18:57 -0500 -Subject: [PATCH] Fix RandomSource NPE - - -diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -index ec23064d5a6d70508fad7cffc6126cfd6f7a62cb..9874a74e0803ca38ee14f704f5575bd09691283e 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -@@ -136,7 +136,7 @@ public class LevelChunk extends ChunkAccess { - this.fluidTicks = fluidTickScheduler; - // CraftBukkit start - this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this); -- this.lightningTick = this.level.getThreadUnsafeRandom().nextInt(100000) << 1; // Pufferfish - initialize lightning tick -+ this.lightningTick = java.util.concurrent.ThreadLocalRandom.current().nextInt(100000) << 1; // Pufferfish - initialize lightning tick // Purpur - } - - public org.bukkit.Chunk bukkitChunk;