From 965cf53cd5067d9f3facf87eed5132c0c82f9878 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 7 Jun 2023 18:24:39 +0200 Subject: [PATCH] Start working on 1.20 --- README.md | 4 +- build.gradle.kts | 4 +- gradle.properties | 4 +- .../api/0001-Convert-project-to-Gradle.patch | 36 +-- patches/api/0002-Build-system-changes.patch | 22 +- patches/api/0003-Test-changes.patch | 4 +- patches/api/0004-Add-FastUtil-to-Bukkit.patch | 6 +- patches/api/0005-Adventure.patch | 110 ++++---- .../0007-Use-ASM-for-event-executors.patch | 6 +- patches/api/0008-Paper-Plugins.patch | 12 +- patches/api/0010-Timings-v2.patch | 4 +- .../0012-Player-affects-spawning-API.patch | 4 +- patches/api/0017-Add-view-distance-API.patch | 4 +- ...cord-chat-API-from-spigot-subclasses.patch | 4 +- .../0022-Add-exception-reporting-event.patch | 2 +- .../0025-Player-Tab-List-and-Title-APIs.patch | 4 +- .../api/0027-Complete-resource-pack-API.patch | 6 +- ...0046-Add-String-based-Action-Bar-API.patch | 6 +- patches/api/0055-Fix-upstream-javadocs.patch | 16 +- .../0066-ensureServerConversions-API.patch | 2 +- ...low-plugins-to-use-SLF4J-for-logging.patch | 4 +- ...-get-a-BlockState-without-a-snapshot.patch | 2 +- ...nt-protocol-version-and-virtual-host.patch | 2 +- ...0-Ability-to-apply-mending-to-XP-API.patch | 6 +- patches/api/0081-PreCreatureSpawnEvent.patch | 2 +- ...-Add-setPlayerProfile-API-for-Skulls.patch | 16 +- ...dd-extended-PaperServerListPingEvent.patch | 2 +- .../0091-Player.setPlayerProfile-API.patch | 4 +- ...4-Add-openSign-method-to-HumanEntity.patch | 4 +- ...95-Add-Ban-Methods-to-Player-Objects.patch | 4 +- ...ld.spawnParticle-API-and-add-Builder.patch | 4 +- ...0107-ItemStack-getMaxItemUseDuration.patch | 2 +- ...PI-additions-for-quantity-flags-lore.patch | 2 +- patches/api/0117-RangedEntity-API.patch | 2 +- ...ile-Entities-from-a-chunk-without-sn.patch | 2 +- ...e-attack-cooldown-methods-for-Player.patch | 4 +- patches/api/0145-Improve-death-events.patch | 2 +- ...CanPlaceOn-and-CanDestroy-NBT-values.patch | 2 +- patches/api/0152-Material-API-additions.patch | 6 +- patches/api/0153-Add-Material-Tags.patch | 4 +- .../api/0170-Add-PlayerPostRespawnEvent.patch | 2 +- .../0172-Fix-Spigot-annotation-mistakes.patch | 10 +- ...0174-PlayerDeathEvent-getItemsToKeep.patch | 2 +- .../0177-Add-BlockSoundGroup-interface.patch | 2 +- ...181-Improve-Block-breakNaturally-API.patch | 2 +- ...layerDeathEvent-shouldDropExperience.patch | 2 +- .../0189-Add-Player-Client-Options-API.patch | 4 +- ...92-Add-item-slot-convenience-methods.patch | 4 +- patches/api/0193-Villager-Restocks-API.patch | 2 +- .../0196-Add-villager-reputation-API.patch | 2 +- patches/api/0197-Spawn-Reason-API.patch | 2 +- .../0202-Support-components-in-ItemMeta.patch | 2 +- patches/api/0206-Brand-support.patch | 4 +- ...-Add-methods-to-get-translation-keys.patch | 20 +- ...ate-HoverEvent-from-ItemStack-Entity.patch | 2 +- .../api/0218-Player-elytra-boost-API.patch | 4 +- patches/api/0224-Add-Destroy-Speed-API.patch | 2 +- ...0234-Additional-Block-Material-API-s.patch | 2 +- ...et-Material-from-Boats-and-Minecarts.patch | 4 +- patches/api/0245-Add-sendOpLevel-API.patch | 4 +- .../api/0247-Add-StructuresLocateEvent.patch | 4 +- .../api/0249-Added-missing-vanilla-tags.patch | 4 +- ...Cache-the-result-of-Material-isBlock.patch | 8 +- patches/api/0266-Item-Rarity-API.patch | 4 +- ...290-Attributes-API-for-item-defaults.patch | 4 +- .../api/0293-Add-PlayerKickEvent-causes.patch | 2 +- .../0300-Missing-Entity-Behavior-API.patch | 2 +- ...o-find-targets-for-lightning-strikes.patch | 2 +- .../0317-Get-entity-default-attributes.patch | 4 +- ...Collidable-methods-to-various-places.patch | 4 +- .../0328-Add-player-health-update-API.patch | 4 +- patches/api/0343-Multi-Block-Change-API.patch | 4 +- .../api/0347-More-PotionEffectType-API.patch | 4 +- .../api/0349-Implement-regenerateChunk.patch | 2 +- patches/api/0350-Add-GameEvent-tags.patch | 4 +- .../api/0357-Add-getComputedBiome-API.patch | 2 +- patches/api/0371-More-Teleport-API.patch | 4 +- ...stom-Chat-Completion-Suggestions-API.patch | 4 +- .../0383-Elder-Guardian-appearance-API.patch | 4 +- .../0391-Add-Player-Warden-Warning-API.patch | 4 +- ...lly-mark-mc-experimental-API-as-such.patch | 85 ++---- patches/api/0400-fix-Instruments.patch | 30 +-- .../0402-Add-Sneaking-API-for-Entities.patch | 2 +- patches/api/0405-Flying-Fall-Damage-API.patch | 4 +- ...Replace-ItemFlag.HIDE_POTION_EFFECTS.patch | 10 +- patches/api/0408-Win-Screen-API.patch | 4 +- .../server/0001-Setup-Gradle-project.patch | 44 +-- patches/server/0002-Remap-fixes.patch | 12 +- .../server/0003-Build-system-changes.patch | 10 +- patches/server/0004-Test-changes.patch | 16 +- patches/server/0005-Paper-config-files.patch | 52 ++-- patches/server/0006-MC-Dev-fixes.patch | 32 +-- patches/server/0008-CB-fixes.patch | 24 +- patches/server/0009-MC-Utils.patch | 250 +++++++++--------- .../server/0010-Adventure.patch | 0 .../server/0011-Paper-command.patch | 0 .../server/0012-Paper-Metrics.patch | 0 .../server/0013-Paper-Plugins.patch | 0 .../server/0014-Timings-v2.patch | 0 .../0015-Rewrite-dataconverter-system.patch | 0 .../server/0016-Starlight.patch | 0 .../server/0017-Add-TickThread.patch | 0 .../server/0018-Rewrite-chunk-system.patch | 0 ...-option-to-load-extra-plugin-jars-no.patch | 0 ...actus-bamboo-and-reed-growth-heights.patch | 0 ...figurable-baby-zombie-movement-speed.patch | 0 ...022-Configurable-fishing-time-ranges.patch | 0 ...d-mobs-to-jump-and-take-water-damage.patch | 0 ...-despawn-distances-for-living-entiti.patch | 0 ...5-Allow-for-toggling-of-spawn-chunks.patch | 0 ...ck-and-tnt-entities-at-the-specified.patch | 0 ...ient-crashes-server-lists-and-Mojang.patch | 0 .../0028-Implement-Paper-VersionChecker.patch | 0 ...d-version-history-to-version-command.patch | 0 .../0030-Player-affects-spawning-API.patch | 0 ...031-Further-improve-server-tick-loop.patch | 0 ...032-Only-refresh-abilities-if-needed.patch | 0 .../server/0033-Entity-Origin-API.patch | 0 ...event-tile-entity-and-entity-crashes.patch | 0 ...nfigurable-top-of-nether-void-damage.patch | 0 ...e-before-converting-and-renaming-pla.patch | 0 .../0037-Always-tick-falling-blocks.patch | 0 .../0038-Configurable-end-credits.patch | 0 ...-explosions-processing-dead-entities.patch | 0 .../server/0040-Optimize-explosions.patch | 0 .../0041-Disable-explosion-knockback.patch | 0 .../server/0042-Disable-thunder.patch | 0 .../server/0043-Disable-ice-and-snow.patch | 0 ...4-Configurable-mob-spawner-tick-rate.patch | 0 ...45-Implement-PlayerLocaleChangeEvent.patch | 0 .../server/0046-Add-BeaconEffectEvent.patch | 0 ...figurable-container-update-tick-rate.patch | 0 .../0048-Use-UserCache-for-player-heads.patch | 0 .../0049-Disable-spigot-tick-limiters.patch | 0 .../0050-Add-PlayerInitialSpawnEvent.patch | 0 ...urable-Disabling-Cat-Chest-Detection.patch | 0 ...52-Ensure-commands-are-not-ran-async.patch | 0 ...chunks-are-slime-spawn-chunks-toggle.patch | 0 .../0054-Expose-server-CommandMap.patch | 0 ...e-informative-in-maxHealth-exception.patch | 0 .../0056-Player-Tab-List-and-Title-APIs.patch | 0 ...dd-configurable-portal-search-radius.patch | 0 .../server/0058-Add-velocity-warnings.patch | 0 ...ble-inter-world-teleportation-safety.patch | 0 .../0060-Add-exception-reporting-event.patch | 0 ...-don-t-need-to-when-cerealising-text.patch | 0 ...oreboards-for-non-players-by-default.patch | 0 ...working-with-arrows-stuck-in-living-.patch | 0 .../server/0064-Chunk-Save-Reattempt.patch | 0 .../0065-Complete-resource-pack-API.patch | 0 ...ading-permissions.yml-before-plugins.patch | 0 ...llow-Reloading-of-Custom-Permissions.patch | 0 .../0068-Remove-Metadata-on-reload.patch | 0 ...069-Handle-Item-Meta-Inconsistencies.patch | 0 ...urable-Non-Player-Arrow-Despawn-Rate.patch | 0 .../server/0071-Add-World-Util-Methods.patch | 0 ...2-Custom-replacement-for-eaten-items.patch | 0 ...th-absorb-values-and-repair-bad-data.patch | 0 ...074-Use-a-Shared-Random-for-Entities.patch | 0 ...le-spawn-chances-for-skeleton-horses.patch | 0 ...ldBounds-and-getBlockState-for-inlin.patch | 0 ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch | 0 ...Entity-AddTo-RemoveFrom-World-Events.patch | 0 ...79-Configurable-Chunk-Inhabited-Time.patch | 0 .../server/0080-EntityPathfindEvent.patch | 0 ...egionFileCache-and-make-configurable.patch | 0 ...2-Do-not-load-chunks-for-Pathfinding.patch | 0 ...0083-Add-PlayerUseUnknownEntityEvent.patch | 0 ...-Configurable-Grass-Spread-Tick-Rate.patch | 0 ...g-BlockPlaceEvent-triggering-physics.patch | 0 .../server/0086-Optimize-DataBits.patch | 0 ...nilla-per-world-scoreboard-coloring-.patch | 0 .../0088-Configurable-Player-Collision.patch | 0 ...ent-to-allow-plugins-to-handle-clien.patch | 0 .../0090-Configurable-RCON-IP-address.patch | 0 ...ityRegainHealthEvent-isFastRegen-API.patch | 0 ...-to-configure-frosted_ice-properties.patch | 0 ...-possibility-for-getServer-singleton.patch | 0 ...item-frames-performance-and-bug-fixe.patch | 0 ...-API-Replenishable-Lootables-Feature.patch | 0 ...y-scoreboard-teams-to-scoreboard.dat.patch | 0 ...tem-property-for-disabling-watchdoge.patch | 0 .../0098-Async-GameProfileCache-saving.patch | 0 ...9-Optional-TNT-doesn-t-move-in-water.patch | 0 ...r-redstone-torch-rapid-clock-removal.patch | 0 .../0101-Add-server-name-parameter.patch | 0 ...-sounds-to-same-world-if-limiting-ra.patch | 0 .../server/0103-Fix-Old-Sign-Conversion.patch | 0 ...blocking-on-Network-Manager-creation.patch | 0 ...e-profiles-that-have-no-UUID-and-no-.patch | 0 ...setting-for-proxy-online-mode-status.patch | 0 ...ptimise-BlockState-s-hashCode-equals.patch | 0 ...onfigurable-packet-in-spam-threshold.patch | 0 ...09-Configurable-flying-kick-messages.patch | 0 .../server/0110-Add-EntityZapEvent.patch | 0 ...-entity-nbt-data-from-falling-blocks.patch | 0 ...112-Cache-user-authenticator-threads.patch | 0 ...3-Allow-Reloading-of-Command-Aliases.patch | 0 ...4-Add-source-to-PlayerExpChangeEvent.patch | 0 .../0115-Add-ProjectileCollideEvent.patch | 0 ...vent-Pathfinding-out-of-World-Border.patch | 0 ...imize-World.isLoaded-BlockPosition-Z.patch | 0 ...-Bound-Treasure-Maps-to-World-Border.patch | 0 ...figurable-Cartographer-Treasure-Maps.patch | 0 .../0120-Optimize-ItemStack.isEmpty.patch | 0 ...to-control-if-armour-stands-can-move.patch | 0 .../0122-String-based-Action-Bar-API.patch | 0 ...23-Properly-fix-item-duplication-bug.patch | 0 .../server/0124-Firework-API-s.patch | 0 .../0125-PlayerTeleportEndGatewayEvent.patch | 0 ...rovide-E-TE-Chunk-count-stat-methods.patch | 0 .../0127-Enforce-Sync-Player-Saves.patch | 0 ...llow-entities-to-ride-themselves-572.patch | 0 ...PI-for-Reason-Source-Triggering-play.patch | 0 .../server/0130-Cap-Entity-Collisions.patch | 0 ...e-CraftScheduler-Async-Task-Debugger.patch | 0 .../0132-Do-not-let-armorstands-drown.patch | 0 ...le-async-calls-to-restart-the-server.patch | 0 ...ke-parrots-stay-on-shoulders-despite.patch | 0 ...n-option-to-prevent-player-names-fro.patch | 0 ...oleAppender-for-console-improvements.patch | 0 ...urable-option-to-disable-creeper-lin.patch | 0 .../server/0138-Item-canEntityPickup.patch | 0 ...PlayerPickupItemEvent-setFlyAtPlayer.patch | 0 .../0140-PlayerAttemptPickupItemEvent.patch | 0 ...-profile-lookups-to-worldgen-threads.patch | 0 .../server/0142-Add-UnknownCommandEvent.patch | 0 .../server/0143-Basic-PlayerProfile-API.patch | 0 .../0144-Shoulder-Entities-Release-API.patch | 0 .../server/0145-Profile-Lookup-Events.patch | 0 ...player-logins-during-server-shutdown.patch | 0 .../server/0147-Entity-fromMobSpawner.patch | 0 ...48-Improve-the-Saddle-API-for-Horses.patch | 0 ...mplement-ensureServerConversions-API.patch | 0 .../0150-Implement-getI18NDisplayName.patch | 0 .../0151-ProfileWhitelistVerifyEvent.patch | 0 .../0152-Fix-this-stupid-bullshit.patch | 0 .../server/0153-LivingEntity-setKiller.patch | 0 ...awns-should-honor-nametags-and-leash.patch | 0 ...imer-when-spawner-event-is-cancelled.patch | 0 ...-a-custom-authentication-servers-dow.patch | 0 ...n-prefixes-using-Log4J-configuration.patch | 0 ...e-Log4J-Configuration-Plugin-Loggers.patch | 0 .../server/0159-Add-PlayerJumpEvent.patch | 0 ...dle-ServerboundKeepAlivePacket-async.patch | 0 ...nt-protocol-version-and-virtual-host.patch | 0 ...rt-serverside-behavior-of-keepalives.patch | 0 ...dEffects-only-to-players-who-can-see.patch | 0 .../0164-Add-PlayerArmorChangeEvent.patch | 0 ...rom-being-processed-when-the-player-.patch | 0 ...66-Fix-MC-117075-TE-Unload-Lag-Spike.patch | 0 ...e-implementations-for-captured-block.patch | 0 ...-get-a-BlockState-without-a-snapshot.patch | 0 .../server/0169-AsyncTabCompleteEvent.patch | 0 .../0170-PlayerPickupExperienceEvent.patch | 0 ...1-Ability-to-apply-mending-to-XP-API.patch | 0 ...2-PlayerNaturallySpawnCreaturesEvent.patch | 0 ...-Add-setPlayerProfile-API-for-Skulls.patch | 0 .../server/0174-PreCreatureSpawnEvent.patch | 0 .../0175-Fill-Profile-Property-Events.patch | 0 ...PlayerAdvancementCriterionGrantEvent.patch | 0 .../0177-Add-ArmorStand-Item-Meta.patch | 0 ...-Extend-Player-Interact-cancellation.patch | 0 .../0179-Tameable-getOwnerUniqueId-API.patch | 0 ...r-crits-helps-mitigate-hacked-client.patch | 0 ...le-Explicit-Network-Manager-Flushing.patch | 0 ...nt-extended-PaperServerListPingEvent.patch | 0 ...e-PlayerProfile-in-AsyncPreLoginEven.patch | 0 .../0184-Player.setPlayerProfile-API.patch | 0 .../server/0185-getPlayerUniqueId-API.patch | 0 .../0186-Improved-Async-Task-Scheduler.patch | 0 ...ke-legacy-ping-handler-more-reliable.patch | 0 ...ServerListPingEvent-for-legacy-pings.patch | 0 ...89-Flag-to-disable-the-channel-limit.patch | 0 ...0-Add-openSign-method-to-HumanEntity.patch | 0 ...urable-sprint-interruption-on-attack.patch | 0 ...-allowed-colored-signs-to-be-created.patch | 0 .../server/0193-EndermanEscapeEvent.patch | 0 .../0194-Enderman.teleportRandomly.patch | 0 ...0195-Block-Enderpearl-Travel-Exploit.patch | 0 ...ld.spawnParticle-API-and-add-Builder.patch | 0 ...sted-Ice-from-loading-holding-chunks.patch | 0 .../0198-EndermanAttackPlayerEvent.patch | 0 .../server/0199-WitchConsumePotionEvent.patch | 0 .../server/0200-WitchThrowPotionEvent.patch | 0 ...Item-entities-with-World.spawnEntity.patch | 0 .../server/0202-WitchReadyPotionEvent.patch | 0 ...0203-ItemStack-getMaxItemUseDuration.patch | 0 ...lement-EntityTeleportEndGatewayEvent.patch | 0 ...ed-flag-on-cancel-of-Explosion-Event.patch | 0 .../0206-Fix-CraftEntity-hashCode.patch | 0 ...le-Alternative-LootPool-Luck-Formula.patch | 0 ...ils-when-failing-to-save-player-data.patch | 0 ...e-shield-blocking-delay-configurable.patch | 0 .../0210-Improve-EntityShootBowEvent.patch | 0 .../server/0211-PlayerReadyArrowEvent.patch | 0 ...KnockbackByEntityEvent-and-EntityPus.patch | 0 .../server/0213-Expand-Explosions-API.patch | 0 ...ivingEntity-Hand-Raised-Item-Use-API.patch | 0 .../server/0215-RangedEntity-API.patch | 0 ...to-disable-ender-dragon-legacy-check.patch | 0 ...7-Implement-World.getEntity-UUID-API.patch | 0 .../0218-InventoryCloseEvent-Reason-API.patch | 0 .../server/0219-Vex-get-setSummoner-API.patch | 0 ...nventory-when-cancelling-PlayerInter.patch | 0 ...r-to-keep-logging-IO-off-main-thread.patch | 0 ...-more-information-to-Entity.toString.patch | 0 .../server/0223-EnderDragon-Events.patch | 0 .../server/0224-PlayerElytraBoostEvent.patch | 0 .../0225-PlayerLaunchProjectileEvent.patch | 0 .../0226-Improve-BlockPosition-inlining.patch | 0 ...t-armor-stands-from-doing-entity-loo.patch | 0 ...8-Vanished-players-don-t-have-rights.patch | 0 ...Allow-disabling-armour-stand-ticking.patch | 0 .../server/0230-SkeletonHorse-Additions.patch | 0 ...on-t-call-getItemMeta-on-hasItemMeta.patch | 0 ...32-Implement-Expanded-ArmorStand-API.patch | 0 .../server/0233-AnvilDamageEvent.patch | 0 .../server/0234-Add-TNTPrimeEvent.patch | 0 ...nd-make-tab-spam-limits-configurable.patch | 0 .../server/0236-Fix-NBT-type-issues.patch | 0 ...Remove-unnecessary-itemmeta-handling.patch | 0 ...ies-option-to-debug-dupe-uuid-issues.patch | 0 ...dd-Early-Warning-Feature-to-WatchDog.patch | 0 ...40-Use-ConcurrentHashMap-in-JsonList.patch | 0 ...41-Use-a-Queue-for-Queueing-Commands.patch | 0 ...ile-Entities-from-a-chunk-without-sn.patch | 0 ...ptimize-BlockPosition-helper-methods.patch | 0 ...default-mob-spawn-range-and-water-an.patch | 0 .../server/0245-Slime-Pathfinder-Events.patch | 0 ...le-speed-for-water-flowing-over-lava.patch | 0 ...247-Optimize-CraftBlockData-Creation.patch | 0 .../server/0248-Optimize-MappedRegistry.patch | 0 .../0249-Add-PhantomPreSpawnEvent.patch | 0 .../server/0250-Add-More-Creeper-API.patch | 0 .../0251-Inventory-removeItemAnySlot.patch | 0 ...loadChunk-int-int-false-load-unconve.patch | 0 ...-ray-tracing-methods-to-LivingEntity.patch | 0 ...e-attack-cooldown-methods-for-Player.patch | 0 .../server/0255-Improve-death-events.patch | 0 ...ow-chests-to-be-placed-with-NBT-data.patch | 0 .../server/0257-Mob-Pathfinding-API.patch | 0 ...-for-CanPlaceOn-and-CanDestroy-NBT-v.patch | 0 ...ent-chunk-loading-from-Fluid-Flowing.patch | 0 ...ent-Mob-AI-Rules-from-Loading-Chunks.patch | 0 ...wning-from-loading-generating-chunks.patch | 0 ...nt-furnace-cook-speed-multiplier-API.patch | 0 ...arseException-in-Entity-and-TE-names.patch | 0 .../0264-Honor-EntityAgeable.ageLock.patch | 0 ...ble-connection-throttle-kick-message.patch | 0 .../0266-Hook-into-CB-plugin-rewrites.patch | 0 .../server/0267-PreSpawnerSpawnEvent.patch | 0 ...268-Add-LivingEntity-getTargetEntity.patch | 0 .../server/0269-Add-sun-related-API.patch | 0 .../server/0270-Turtle-API.patch | 0 ...tator-target-events-and-improve-impl.patch | 0 ...ther-worlds-for-shooter-of-projectil.patch | 0 .../server/0273-Add-more-Witch-API.patch | 0 ...owned-for-Villager-Aggression-Config.patch | 0 ...event-players-from-moving-into-unloa.patch | 0 ...76-Reset-players-airTicks-on-respawn.patch | 0 ...-after-profile-lookups-if-not-needed.patch | 0 ...er-Thread-Pool-and-Thread-Priorities.patch | 0 .../0279-Optimize-World-Time-Updates.patch | 0 ...store-custom-InventoryHolder-support.patch | 0 .../0281-Use-Vanilla-Minecart-Speeds.patch | 0 .../0282-Fix-SpongeAbsortEvent-handling.patch | 0 ...t-allow-digging-into-unloaded-chunks.patch | 0 ...ault-permission-message-configurable.patch | 0 ...Prevent-rayTrace-from-loading-chunks.patch | 0 ...e-Large-Packets-disconnecting-client.patch | 0 ...entity-dismount-during-teleportation.patch | 0 .../server/0288-Add-more-Zombie-API.patch | 0 .../server/0289-Book-Size-Limits.patch | 0 .../0290-Add-PlayerConnectionCloseEvent.patch | 0 ...Prevent-Enderman-from-loading-chunks.patch | 0 ...-replace-OfflinePlayer-getLastPlayed.patch | 0 ...vehicle-tracking-issue-on-disconnect.patch | 0 ...-remove-from-being-called-on-Players.patch | 0 .../server/0295-BlockDestroyEvent.patch | 0 .../0296-Async-command-map-building.patch | 0 .../0297-Implement-Brigadier-Mojang-API.patch | 0 ...om-Shapeless-Custom-Crafting-Recipes.patch | 0 .../0299-Limit-Client-Sign-length-more.patch | 0 ...ConvertSigns-boolean-every-sign-save.patch | 0 ...-Manager-and-add-advanced-packet-sup.patch | 0 ...le-Oversized-Tile-Entities-in-chunks.patch | 0 ...oggleEvent-when-whitelist-is-toggled.patch | 0 .../0304-Entity-getEntitySpawnReason.patch | 0 .../server/0305-Fire-event-on-GS4-query.patch | 0 ...306-Implement-PlayerPostRespawnEvent.patch | 0 ...-for-pickupDelay-breaks-picking-up-i.patch | 0 .../server/0308-Server-Tick-Events.patch | 0 ...0309-PlayerDeathEvent-getItemsToKeep.patch | 0 ...-Optimize-Captured-TileEntity-Lookup.patch | 0 .../server/0311-Add-Heightmap-API.patch | 0 .../0312-Mob-Spawner-API-Enhancements.patch | 0 ...l-to-changed-postToMainThread-method.patch | 0 ...n-item-frames-are-modified-MC-123450.patch | 0 .../0315-Implement-CraftBlockSoundGroup.patch | 0 ...le-Keep-Spawn-Loaded-range-per-world.patch | 0 ...317-Allow-Saving-of-Oversized-Chunks.patch | 0 ...318-Expose-the-internal-current-tick.patch | 0 ...319-Fix-World-isChunkGenerated-calls.patch | 0 ...ate-location-if-we-failed-to-read-it.patch | 0 ...al-Spawned-mobs-towards-natural-spaw.patch | 0 ...gurable-projectile-relative-velocity.patch | 0 .../0323-offset-item-frame-ticking.patch | 0 .../server/0324-Fix-MC-158900.patch | 0 ...revent-consuming-the-wrong-itemstack.patch | 0 ...26-Dont-send-unnecessary-sign-update.patch | 0 ...d-option-to-disable-pillager-patrols.patch | 0 ...0328-Flat-bedrock-generator-settings.patch | 0 ...nk-loads-when-villagers-try-to-find-.patch | 0 ...5656-Fix-Follow-Range-Initial-Target.patch | 0 .../0331-Duplicate-UUID-Resolve-Option.patch | 0 ...layerDeathEvent-shouldDropExperience.patch | 0 ...oading-chunks-checking-hive-position.patch | 0 ...Chunks-from-Hoppers-and-other-things.patch | 0 ...rializing-mismatching-chunk-coordina.patch | 0 ...ptimise-EntityGetter-getPlayerByUUID.patch | 0 ...0337-Fix-items-not-falling-correctly.patch | 0 .../server/0338-Lag-compensate-eating.patch | 0 ...mize-call-to-getFluid-for-explosions.patch | 0 ...k-in-stack-not-having-effects-when-d.patch | 0 .../0341-Entity-Activation-Range-2.0.patch | 0 .../0342-Increase-Light-Queue-Size.patch | 0 .../server/0343-Anti-Xray.patch | 0 ...lement-alternative-item-despawn-rate.patch | 0 .../0345-Tracking-Range-Improvements.patch | 0 ...x-items-vanishing-through-end-portal.patch | 0 ...ement-optional-per-player-mob-spawns.patch | 0 ...get-gravity-in-void.-Fixes-MC-167279.patch | 0 ...349-Improve-Block-breakNaturally-API.patch | 0 ...e-getChunkAt-calls-for-loaded-chunks.patch | 0 .../0351-Add-debug-for-sync-chunk-loads.patch | 0 ...52-Remove-garbage-Java-version-check.patch | 0 .../server/0353-Add-ThrownEggHatchEvent.patch | 0 .../server/0354-Entity-Jump-API.patch | 0 ...n-to-nerf-pigmen-from-nether-portals.patch | 0 .../0356-Make-the-GUI-graph-fancier.patch | 0 ...357-add-hand-to-BlockMultiPlaceEvent.patch | 0 ...ripwire-hook-placement-before-update.patch | 0 ...to-allow-iron-golems-to-spawn-in-air.patch | 0 ...-chance-of-villager-zombie-infection.patch | 0 .../server/0361-Optimise-Chunk-getFluid.patch | 0 ...erbose-world-setting-to-false-by-def.patch | 0 ...-Add-tick-times-API-and-mspt-command.patch | 0 ...364-Expose-MinecraftServer-isRunning.patch | 0 ...Add-Raw-Byte-ItemStack-Serialization.patch | 0 ...spawn-settings-and-per-player-option.patch | 0 ...nnections-shouldn-t-hold-up-shutdown.patch | 0 ...low-bees-to-load-chunks-for-beehives.patch | 0 ...-PlayerChunkMap-adds-crashing-server.patch | 0 .../server/0370-Don-t-tick-dead-players.patch | 0 ...d-Player-s-shouldn-t-be-able-to-move.patch | 0 ...ptimize-Collision-to-not-load-chunks.patch | 0 ...move-existing-players-to-world-spawn.patch | 0 ...oalSelector-Goal.Flag-Set-operations.patch | 0 .../0375-Improved-Watchdog-Support.patch | 0 .../server/0376-Optimize-Pathfinding.patch | 0 ...77-Reduce-Either-Optional-allocation.patch | 0 ...e-memory-footprint-of-NBTTagCompound.patch | 0 ...vent-opening-inventories-when-frozen.patch | 0 ...-entity-collision-code-if-not-needed.patch | 0 ...-Implement-Player-Client-Options-API.patch | 0 ...layer-is-attempted-to-be-removed-fro.patch | 0 ...g-Broken-behavior-of-PlayerJoinEvent.patch | 0 ...pawn-point-if-spawn-in-unloaded-worl.patch | 0 ...PlayerAttackEntityCooldownResetEvent.patch | 0 ...t-fire-BlockFade-on-worldgen-threads.patch | 0 ...ntom-creative-and-insomniac-controls.patch | 0 ...m-duplication-issues-and-teleport-is.patch | 0 .../server/0389-Villager-Restocks-API.patch | 0 ...PickItem-Packet-and-kick-for-invalid.patch | 0 .../server/0391-Expose-game-version.patch | 0 .../0392-Optimize-Voxel-Shape-Merging.patch | 0 ...-per-thread-native-byte-buffer-cache.patch | 0 .../server/0394-misc-debugging-dumps.patch | 0 ...95-Prevent-teleporting-dead-entities.patch | 0 ...ktraces-in-log-messages-crash-report.patch | 0 .../server/0397-Implement-Mob-Goal-API.patch | 0 .../0398-Add-villager-reputation-API.patch | 0 ...-maximum-exp-value-when-merging-orbs.patch | 0 .../server/0400-ExperienceOrbMergeEvent.patch | 0 ...1-Fix-PotionEffect-ignores-icon-flag.patch | 0 ...-brigadier-child-sorting-performance.patch | 0 .../server/0403-Potential-bed-API.patch | 0 ...Wait-for-Async-Tasks-during-shutdown.patch | 0 ...der-respects-game-and-entity-rules-f.patch | 0 ...and-End-Portal-Frames-from-being-des.patch | 0 ...bleInt-allocations-from-light-engine.patch | 0 ...llocation-of-Vec3D-by-entity-tracker.patch | 0 .../0409-Ensure-safe-gateway-teleport.patch | 0 ...n-for-console-having-all-permissions.patch | 0 ...erCloseEnoughForSpawning-to-use-dist.patch | 0 ...tance-map-to-optimise-entity-tracker.patch | 0 ...ix-villager-trading-demand-MC-163962.patch | 0 .../0414-Maps-shouldn-t-load-chunks.patch | 0 ...ookup-for-Treasure-Maps-Fixes-lag-fr.patch | 0 ...er-runTaskTimerAsynchronously-Plugin.patch | 0 ...ston-physics-inconsistency-MC-188840.patch | 0 .../server/0418-Fix-sand-duping.patch | 0 ...ssing-chunks-due-to-integer-overflow.patch | 0 ...-desync-in-playerconnection-causing-.patch | 0 ...Holder-method-without-block-snapshot.patch | 0 .../server/0422-Improve-Arrow-API.patch | 0 ...implement-PlayerRecipeBookClickEvent.patch | 0 ...4-Hide-sync-chunk-writes-behind-flag.patch | 0 ...25-Add-permission-for-command-blocks.patch | 0 ...sure-Entity-AABB-s-are-never-invalid.patch | 0 ...ld-Difficulty-Remembering-Difficulty.patch | 0 .../server/0428-Paper-dumpitem-command.patch | 0 ...-Legacy-Component-serialization-size.patch | 0 ...-Optimize-Bit-Operations-by-inlining.patch | 0 ...-Plugin-Tickets-to-API-Chunk-Methods.patch | 0 ...-incremental-chunk-and-player-saving.patch | 0 ...te-operations-for-updating-light-dat.patch | 0 ...0434-Support-old-UUID-format-for-NBT.patch | 0 ...up-duplicated-GameProfile-Properties.patch | 0 ...nvert-legacy-attributes-in-Item-Meta.patch | 0 ...-Remove-some-streams-from-structures.patch | 0 ...from-classes-related-villager-gossip.patch | 0 .../0439-Support-components-in-ItemMeta.patch | 0 ...ve-fix-EntityTargetLivingEntityEvent.patch | 0 .../server/0441-Add-entity-liquid-API.patch | 0 ...pdate-itemstack-legacy-name-and-lore.patch | 0 ...awn-player-in-correct-world-on-login.patch | 0 .../server/0444-Add-PrepareResultEvent.patch | 0 ...k-for-portal-on-world-gen-entity-add.patch | 0 ...ze-NetworkManager-Exception-Handling.patch | 0 ...ix-arrows-never-despawning-MC-125757.patch | 0 ...-Vanilla-Command-permission-checking.patch | 0 .../server/0449-Fix-SPIGOT-5989.patch | 0 ...4-Bukkit-world-container-is-not-used.patch | 0 ...-5885-Unable-to-disable-advancements.patch | 0 ...ataPlayer-leak-due-from-quitting-ear.patch | 0 ...Fix-some-rails-connecting-improperly.patch | 0 ...istake-in-CB-NBT-int-deserialization.patch | 0 ...erver-load-chunks-from-newer-version.patch | 0 .../server/0456-Brand-support.patch | 0 .../server/0457-Add-setMaxPlayers-API.patch | 0 ...yPickupItemAnimation-to-LivingEntity.patch | 0 .../0459-Don-t-require-FACING-data.patch | 0 ...geEvent-not-firing-for-all-use-cases.patch | 0 .../server/0461-Add-moon-phase-API.patch | 0 ...-headless-pistons-from-being-created.patch | 0 .../server/0463-Add-BellRingEvent.patch | 0 ...Add-zombie-targets-turtle-egg-config.patch | 0 .../server/0465-Buffer-joins-to-world.patch | 0 ...6-Eigencraft-redstone-implementation.patch | 0 ...rs-not-working-in-some-kick-messages.patch | 0 ...CreateEvent-needs-to-know-its-entity.patch | 0 .../0469-Fix-CraftTeam-null-check.patch | 0 .../server/0470-Add-more-Evoker-API.patch | 0 ...-Add-methods-to-get-translation-keys.patch | 0 ...ate-HoverEvent-from-ItemStack-Entity.patch | 0 .../0473-Cache-block-data-strings.patch | 0 ...ortation-and-cancel-velocity-if-tele.patch | 0 ...al-open-container-api-to-HumanEntity.patch | 0 ...taFixerUpper-Rewrite-Rules-on-demand.patch | 0 ...p-capture-to-capture-all-items-added.patch | 0 ...y-Counter-to-allow-plugins-to-use-va.patch | 0 ...-track-plugin-scoreboards-by-default.patch | 0 .../server/0480-Entity-isTicking.patch | 0 ...-non-whitelisted-player-when-white-l.patch | 0 ...x-Concurrency-issue-in-ShufflingList.patch | 0 ...Reset-Ender-Crystals-on-Dragon-Spawn.patch | 0 ...r-large-move-vectors-crashing-server.patch | 0 .../server/0485-Optimise-getType-calls.patch | 0 .../server/0486-Villager-resetOffers.patch | 0 ...ace-order-when-capturing-blockstates.patch | 0 ...blockpos-allocation-from-pathfinding.patch | 0 ...tem-locations-dropped-from-campfires.patch | 0 .../server/0490-Player-elytra-boost-API.patch | 0 ...491-Fixed-TileEntityBell-memory-leak.patch | 0 ...ling-up-when-item-stack-is-empty-in-.patch | 0 ...-Add-getOfflinePlayerIfCached-String.patch | 0 .../0494-Add-ignore-discounts-API.patch | 0 ...-Toggle-for-removing-existing-dragon.patch | 0 ...ix-client-lag-on-advancement-loading.patch | 0 .../0497-Item-no-age-no-player-pickup.patch | 0 ...der-Remove-Streams-Optimized-collect.patch | 0 ...0499-Beacon-API-custom-effect-ranges.patch | 0 .../server/0500-Add-API-for-quit-reason.patch | 0 ...ing-Trader-spawn-rate-config-options.patch | 0 .../0502-Expose-world-spawn-angle.patch | 0 .../server/0503-Add-Destroy-Speed-API.patch | 0 ...r-spawnParticle-x-y-z-precision-loss.patch | 0 ...505-Add-LivingEntity-clearActiveItem.patch | 0 .../0506-Add-PlayerItemCooldownEvent.patch | 0 ...prove-performance-of-the-end-generat.patch | 0 .../server/0508-More-lightning-API.patch | 0 ...-should-not-bypass-cramming-gamerule.patch | 0 ...d-missing-default-perms-for-commands.patch | 0 .../0511-Add-PlayerShearBlockEvent.patch | 0 ...ing-zombie-villager-discount-exploit.patch | 0 .../server/0513-Limit-recipe-packets.patch | 0 ...x-CraftSound-backwards-compatibility.patch | 0 ...0515-Player-Chunk-Load-Unload-Events.patch | 0 ...16-Optimize-Dynamic-get-Missing-Keys.patch | 0 ...7-Expose-LivingEntity-hurt-direction.patch | 0 ...-OBSTRUCTED-reason-to-BedEnterResult.patch | 0 ...m-invalid-ingredient-lists-in-Villag.patch | 0 ...erTradeEvent-and-PlayerPurchaseEvent.patch | 0 .../0521-Implement-TargetHitEvent.patch | 0 .../0522-MC-4-Fix-item-position-desync.patch | 0 ...0523-Additional-Block-Material-API-s.patch | 0 .../server/0524-Fix-harming-potion-dupe.patch | 0 ...-get-Material-from-Boats-and-Minecar.patch | 0 .../server/0526-Cache-burn-durations.patch | 0 ...mob-spawner-spawn-egg-transformation.patch | 0 ...Fix-Not-a-string-Map-Conversion-spam.patch | 0 ...ement-PlayerFlowerPotManipulateEvent.patch | 0 ...-event-not-being-called-in-adventure.patch | 0 .../0531-Zombie-API-breaking-doors.patch | 0 ...0532-Fix-nerfed-slime-when-splitting.patch | 0 .../0533-Add-EntityLoadCrossbowEvent.patch | 0 .../0534-Added-WorldGameRuleChangeEvent.patch | 0 ...5-Added-ServerResourcesReloadedEvent.patch | 0 ...ld-settings-for-mobs-picking-up-loot.patch | 0 ...Implemented-BlockFailedDispenseEvent.patch | 0 ...8-Added-PlayerLecternPageChangeEvent.patch | 0 ...9-Added-PlayerLoomPatternSelectEvent.patch | 0 ...onfigurable-door-breaking-difficulty.patch | 0 ...pty-commands-shall-not-be-dispatched.patch | 0 ...PI-to-expose-exact-interaction-point.patch | 0 .../server/0543-Remove-stale-POIs.patch | 0 .../0544-Fix-villager-boat-exploit.patch | 0 .../server/0545-Add-sendOpLevel-API.patch | 0 .../0546-TODO-Registry-Modification-API.patch | 0 .../0547-Add-StructuresLocateEvent.patch | 0 ...n-for-requiring-a-player-participant.patch | 0 ...ileHitEvent-call-when-fireballs-dead.patch | 0 ...onent-with-empty-text-instead-of-thr.patch | 0 ...0551-Make-schedule-command-per-world.patch | 0 ...0552-Configurable-max-leash-distance.patch | 0 ...0553-Implement-BlockPreDispenseEvent.patch | 0 ...ing-of-PlayerChangeBeaconEffectEvent.patch | 0 ...le-for-always-placing-the-dragon-egg.patch | 0 ...d-PlayerStonecutterRecipeSelectEvent.patch | 0 ...Leash-variable-to-EntityUnleashEvent.patch | 0 ...-shield-blocking-on-dimension-change.patch | 0 .../server/0559-add-DragonEggFormEvent.patch | 0 .../server/0560-EntityMoveEvent.patch | 0 ...disable-pathfinding-updates-on-block.patch | 0 .../0562-Inline-shift-direction-fields.patch | 0 ...w-adding-items-to-BlockDropItemEvent.patch | 0 ...ainThreadExecutor-to-BukkitScheduler.patch | 0 ...-entity-allow-attribute-registration.patch | 0 ...fix-dead-slime-setSize-invincibility.patch | 0 ...ipes-should-return-an-immutable-list.patch | 0 ...pport-for-hex-color-codes-in-console.patch | 0 .../server/0569-Expose-Tracked-Players.patch | 0 ...70-Remove-streams-from-SensorNearest.patch | 0 ...per-exception-on-empty-JsonList-file.patch | 0 .../server/0572-Improve-ServerGUI.patch | 0 ...sure-plate-EntityInteractEvent-for-i.patch | 0 ...0574-fix-converting-txt-to-json-file.patch | 0 .../server/0575-Add-worldborder-events.patch | 0 .../0576-added-PlayerNameEntityEvent.patch | 0 ...-grindstones-from-overstacking-items.patch | 0 .../0578-Add-recipe-to-cook-events.patch | 0 .../server/0579-Add-Block-isValidTool.patch | 0 ...-using-signs-inside-spawn-protection.patch | 0 .../server/0581-Expand-world-key-API.patch | 0 ...lternative-constructor-for-Rotations.patch | 0 .../server/0583-Item-Rarity-API.patch | 0 ...opy-TESign-isEditable-from-snapshots.patch | 0 ...ed-item-when-player-has-disconnected.patch | 0 ...telist-use-configurable-kick-message.patch | 0 ...ignore-result-of-PlayerEditBookEvent.patch | 0 ...588-Entity-load-save-limit-per-chunk.patch | 0 .../server/0589-Expose-protocol-version.patch | 0 ...tab-completions-for-brigadier-comman.patch | 0 ...ItemConsumeEvent-cancelling-properly.patch | 0 .../server/0592-Add-bypass-host-check.patch | 0 .../0593-Set-area-affect-cloud-rotation.patch | 0 ...-add-isDeeplySleeping-to-HumanEntity.patch | 0 ...-add-consumeFuel-to-FurnaceBurnEvent.patch | 0 ...t-set-drop-chance-to-EntityEquipment.patch | 0 ...fix-PigZombieAngerEvent-cancellation.patch | 0 ...fix-PlayerItemHeldEvent-firing-twice.patch | 0 .../0599-Added-PlayerDeepSleepEvent.patch | 0 .../server/0600-More-World-API.patch | 0 .../0601-Added-PlayerBedFailEnterEvent.patch | 0 ...s-to-convert-between-Component-and-B.patch | 0 ...wn-acting-as-a-bed-respawn-from-the-.patch | 0 ...eacon-activation-deactivation-events.patch | 0 ...d-RespawnFlags-to-PlayerRespawnEvent.patch | 0 ...Add-Channel-initialization-listeners.patch | 0 ...mmands-if-tab-completion-is-disabled.patch | 0 .../0608-Add-more-WanderingTrader-API.patch | 0 ...Add-EntityBlockStorage-clearEntities.patch | 0 ...essage-to-PlayerAdvancementDoneEvent.patch | 0 ...-address-to-AsyncPlayerPreLoginEvent.patch | 0 .../server/0612-Inventory-close.patch | 0 ...n-in-sunlight-API-for-Phantoms-and-S.patch | 0 .../0614-Fix-CraftPotionBrewer-cache.patch | 0 .../server/0615-Add-basic-Datapack-API.patch | 0 ...nment-variable-to-disable-server-gui.patch | 0 ...ditions-to-PlayerGameModeChangeEvent.patch | 0 .../0618-ItemStack-repair-check-API.patch | 0 .../server/0619-More-Enchantment-API.patch | 0 ...ove-range-check-for-block-placing-up.patch | 0 ...x-and-optimise-world-force-upgrading.patch | 0 .../server/0622-Add-Mob-lookAt-API.patch | 0 .../0623-Add-Unix-domain-socket-support.patch | 0 .../0624-Add-EntityInsideBlockEvent.patch | 0 ...625-Attributes-API-for-item-defaults.patch | 0 ...cause-to-Weather-ThunderChangeEvents.patch | 0 .../server/0627-More-Lidded-Block-API.patch | 0 ...628-Limit-item-frame-cursors-on-maps.patch | 0 .../0629-Add-PlayerKickEvent-causes.patch | 0 .../0630-Add-PufferFishStateChangeEvent.patch | 0 ...yerBucketEmptyEvent-result-itemstack.patch | 0 ...ttedContainer-instead-of-ThreadingDe.patch | 0 ...n-to-fix-items-merging-through-walls.patch | 0 .../0634-Add-BellRevealRaiderEvent.patch | 0 .../0635-Fix-invulnerable-end-crystals.patch | 0 ...636-Add-ElderGuardianAppearanceEvent.patch | 0 .../0637-Fix-dangerous-end-portal-logic.patch | 0 ...e-Biome-Mob-Lookups-for-Mob-Spawning.patch | 0 ...9-Make-item-validations-configurable.patch | 0 .../server/0640-Line-Of-Sight-Changes.patch | 0 .../0641-add-per-world-spawn-limits.patch | 0 .../0642-Fix-potions-splash-events.patch | 0 .../0643-Add-more-LimitedRegion-API.patch | 0 ...PlayerDropItemEvent-using-wrong-item.patch | 0 .../0645-Missing-Entity-Behavior-API.patch | 0 ...nect-for-book-edit-is-called-on-main.patch | 0 ...-of-Block-applyBoneMeal-always-being.patch | 0 ...etChunkIfLoadedImmediately-in-places.patch | 0 ...from-signs-not-firing-command-events.patch | 0 .../0650-Adds-PlayerArmSwingEvent.patch | 0 ...k-event-leave-message-not-being-sent.patch | 0 ...g-for-mobs-immune-to-default-effects.patch | 0 ...ncorrect-message-for-outdated-client.patch | 0 ...n-t-apply-cramming-damage-to-players.patch | 0 ...nd-timings-for-sensors-and-behaviors.patch | 0 ...a-bunch-of-missing-forceDrop-toggles.patch | 0 .../server/0657-Stinger-API.patch | 0 ...ncy-issue-with-empty-map-items-in-CB.patch | 0 .../0659-Add-System.out-err-catcher.patch | 0 .../0660-Fix-test-not-bootstrapping.patch | 0 ...s-to-contain-the-source-jars-in-stac.patch | 0 ...2-Improve-boat-collision-performance.patch | 0 ...-AFK-kick-while-watching-end-credits.patch | 0 ...riting-of-comments-to-server.propert.patch | 0 .../server/0665-Add-PlayerSetSpawnEvent.patch | 0 ...ers-respect-inventory-max-stack-size.patch | 0 ...mize-entity-tracker-passenger-checks.patch | 0 ...g-option-for-Piglins-guarding-chests.patch | 0 .../0669-Added-EntityDamageItemEvent.patch | 0 ...ptimize-indirect-passenger-iteration.patch | 0 ...tem-frame-map-cursor-update-interval.patch | 0 ...-Make-EntityUnleashEvent-cancellable.patch | 0 ...0673-Clear-bucket-NBT-after-dispense.patch | 0 ...target-without-changing-other-things.patch | 0 .../0675-Add-BlockBreakBlockEvent.patch | 0 ...prevent-NBT-copy-in-smithing-recipes.patch | 0 .../server/0677-More-CommandBlock-API.patch | 0 ...d-missing-team-sidebar-display-slots.patch | 0 .../0679-Add-back-EntityPortalExitEvent.patch | 0 ...o-find-targets-for-lightning-strikes.patch | 0 .../0681-Get-entity-default-attributes.patch | 0 .../server/0682-Left-handed-API.patch | 0 .../0683-Add-more-advancement-API.patch | 0 ...0684-Add-ItemFactory-getSpawnEgg-API.patch | 0 .../server/0685-Add-critical-damage-API.patch | 0 .../0686-Fix-issues-with-mob-conversion.patch | 0 ...Collidable-methods-to-various-places.patch | 0 .../server/0688-Goat-ram-API.patch | 0 ...Add-API-for-resetting-a-single-score.patch | 0 ...90-Add-Raw-Byte-Entity-Serialization.patch | 0 ...691-Vanilla-command-permission-fixes.patch | 0 ...-logic-for-inventories-on-chunk-unlo.patch | 0 ...693-Fix-GameProfileCache-concurrency.patch | 0 ...0694-Improve-and-expand-AsyncCatcher.patch | 0 ...aper-mobcaps-and-paper-playermobcaps.patch | 0 ...itize-ResourceLocation-error-logging.patch | 0 ...trolled-flushing-for-network-manager.patch | 0 .../0698-Optimise-general-POI-access.patch | 0 .../0699-Optimise-chunk-tick-iteration.patch | 0 .../0700-Execute-chunk-tasks-mid-tick.patch | 0 ...culate-regionfile-header-if-it-is-co.patch | 0 ...lementation-for-blockstate-state-loo.patch | 0 ...l-more-information-in-watchdog-dumps.patch | 0 ...ally-inline-methods-in-BlockPosition.patch | 0 .../0705-Distance-manager-tick-timings.patch | 0 ...uler-threads-according-to-the-plugin.patch | 0 ...d-getChunkAt-has-inlined-logic-for-l.patch | 0 .../0708-Add-packet-limiter-config.patch | 0 ...bour-chunk-data-off-disk-when-conver.patch | 0 ...ush-calls-for-entity-tracker-packets.patch | 0 ...t-lookup-fluid-state-when-raytracing.patch | 0 .../server/0712-Time-scoreboard-search.patch | 0 ...-packets-for-hard-colliding-entities.patch | 0 ...14-Do-not-run-raytrace-logic-for-AIR.patch | 0 ...primise-map-impl-for-tracked-players.patch | 0 ...timise-BlockSoil-nearby-water-lookup.patch | 0 .../0717-Optimise-random-block-ticking.patch | 0 ...18-Optimise-non-flush-packet-sending.patch | 0 .../0719-Optimise-nearby-player-lookups.patch | 0 .../0720-Remove-streams-for-villager-AI.patch | 0 ...ocity-compression-and-cipher-natives.patch | 0 ...thread-worker-count-for-low-core-cou.patch | 0 ...Fix-Bukkit-NamespacedKey-shenanigans.patch | 0 ...entory-not-closing-on-entity-removal.patch | 0 ...irement-before-suggesting-root-nodes.patch | 0 ...-ServerboundCommandSuggestionPacket-.patch | 0 ...rnColor-on-tropical-fish-bucket-meta.patch | 0 .../0728-Ensure-valid-vehicle-status.patch | 0 ...oftlocked-end-exit-portal-generation.patch | 0 ...or-causing-a-crash-when-trying-to-ge.patch | 0 ...n-t-log-debug-logging-being-disabled.patch | 0 ...ious-menus-with-empty-level-accesses.patch | 0 .../0733-Preserve-overstacked-loot.patch | 0 ...date-head-rotation-in-missing-places.patch | 0 ...-unintended-light-block-manipulation.patch | 0 .../0736-Fix-CraftCriteria-defaults-map.patch | 0 ...-Fix-upstreams-block-state-factories.patch | 0 ...tion-for-logging-player-ip-addresses.patch | 0 .../0739-Configurable-feature-seeds.patch | 0 ...apper-didnt-account-for-entity-sende.patch | 0 .../0741-Add-root-admin-user-detection.patch | 0 ...ways-allow-item-changing-in-Fireball.patch | 0 ...-t-attempt-to-teleport-dead-entities.patch | 0 ...sive-velocity-through-repeated-crits.patch | 0 ...de-code-using-deprecated-for-removal.patch | 0 ...tochunk-light-sources-unless-it-is-m.patch | 0 ...removing-recipes-from-RecipeIterator.patch | 0 ...oversized-item-data-in-equipment-and.patch | 0 ...de-unnecessary-itemmeta-from-clients.patch | 0 .../0750-Fix-Spigot-growth-modifiers.patch | 0 ...rOpenersCounter-openCount-from-going.patch | 0 .../0752-Add-PlayerItemFrameChangeEvent.patch | 0 .../0753-Add-player-health-update-API.patch | 0 .../server/0754-Optimize-HashMapPalette.patch | 0 ...llow-delegation-to-vanilla-chunk-gen.patch | 0 ...single-and-multi-AABB-VoxelShapes-an.patch | 0 ...on-checking-in-player-move-packet-ha.patch | 0 ...t-isSectionEmpty-int-and-optimize-Pa.patch | 0 .../server/0759-Add-more-Campfire-API.patch | 0 ...-data-to-disk-if-it-serializes-witho.patch | 0 ...761-Fix-tripwire-state-inconsistency.patch | 0 ...ward-CraftEntity-in-teleport-command.patch | 0 .../0763-Improve-scoreboard-entries.patch | 0 .../0764-Entity-powdered-snow-API.patch | 0 .../0765-Add-API-for-item-entity-health.patch | 0 ...y-type-tags-suggestions-in-selectors.patch | 0 ...max-block-light-for-monster-spawning.patch | 0 ...-pistons-and-BlockPistonRetractEvent.patch | 0 ...mplifiers-greater-than-127-correctly.patch | 0 ...d-canSmelt-methods-to-FurnaceInvento.patch | 0 .../0771-Fix-bees-aging-inside-hives.patch | 0 .../server/0772-Bucketable-API.patch | 0 .../server/0773-Validate-usernames.patch | 0 ...ter-animal-spawn-height-configurable.patch | 0 ...vanilla-BiomeProvider-from-WorldInfo.patch | 0 ...tion-for-worlds-affected-by-time-cmd.patch | 0 ...rload-to-PersistentDataContainer-has.patch | 0 ...78-Multiple-Entries-with-Scoreboards.patch | 0 ...0779-Reset-placed-block-on-exception.patch | 0 ...-configurable-height-for-slime-spawn.patch | 0 ...Hostname-to-AsyncPlayerPreLoginEvent.patch | 0 .../0782-Fix-xp-reward-for-baby-zombies.patch | 0 .../0783-Kick-on-main-for-illegal-chat.patch | 0 ...ulti-Block-Change-API-Implementation.patch | 0 .../server/0785-Fix-NotePlayEvent.patch | 0 .../server/0786-Freeze-Tick-Lock-API.patch | 0 .../server/0787-Dolphin-API.patch | 0 .../0788-More-PotionEffectType-API.patch | 0 ...-for-StructureTemplate.Pallete-cache.patch | 0 ...-command-sender-which-forwards-feedb.patch | 0 ...d-missing-structure-set-seed-configs.patch | 0 .../0792-Implement-regenerateChunk.patch | 0 ...elled-powdered-snow-bucket-placement.patch | 0 ...date-calls-to-CraftServer-getSpawnLi.patch | 0 .../server/0795-Add-GameEvent-tags.patch | 0 ...sks-fairly-for-worlds-while-waiting-.patch | 0 .../server/0797-Furnace-RecipesUsed-API.patch | 0 ...igurable-sculk-sensor-listener-range.patch | 0 ...dd-missing-block-data-mins-and-maxes.patch | 0 ...efault-CustomSpawners-in-custom-worl.patch | 0 ...o-worldlist-before-initing-the-world.patch | 0 .../0802-Fix-Entity-Position-Desync.patch | 0 .../server/0803-Custom-Potion-Mixes.patch | 0 ...804-Force-close-world-loading-screen.patch | 0 ...0805-Fix-falling-block-spawn-methods.patch | 0 ...-Expose-furnace-minecart-push-values.patch | 0 ...rojectileHitEvent-for-piercing-arrow.patch | 0 .../server/0808-More-Projectile-API.patch | 0 ...ix-swamp-hut-cat-generation-deadlock.patch | 0 ...cle-movement-from-players-while-tele.patch | 0 .../0811-Implement-getComputedBiome-API.patch | 0 .../0812-Make-some-itemstacks-nonnull.patch | 0 ...0813-Implement-enchantWithLevels-API.patch | 0 .../0814-Fix-saving-in-unloadWorld.patch | 0 .../0815-Buffer-OOB-setBlock-calls.patch | 0 .../0816-Add-TameableDeathMessageEvent.patch | 0 ...lock-data-for-EntityChangeBlockEvent.patch | 0 ...ables-running-when-mob-loot-gamerule.patch | 0 ...assenger-world-matches-ridden-entity.patch | 0 ...ard-against-invalid-entity-positions.patch | 0 .../server/0821-cache-resource-keys.patch | 0 ...hange-the-podium-for-the-EnderDragon.patch | 0 ...verriding-a-block-entity-during-worl.patch | 0 ...reGrowEvent-species-for-RED_MUSHROOM.patch | 0 ...nt-tile-entity-copies-loading-chunks.patch | 0 ...tead-of-display-name-in-PlayerList-g.patch | 0 ...rs-not-spawning-outside-slime-chunks.patch | 0 ...s-ServerLevel-for-gamerule-callbacks.patch | 0 ...king-amount-to-PlayerItemDamageEvent.patch | 0 .../0830-WorldCreator-keepSpawnLoaded.patch | 0 ...x-NPE-for-BlockDataMeta-getBlockData.patch | 0 ..._destroyed-trigger-in-the-correct-pl.patch | 0 ...eEvent-and-CollarColorable-interface.patch | 0 ...-CauldronLevelChange-on-initial-fill.patch | 0 ...-snow-cauldrons-not-turning-to-water.patch | 0 .../0836-Add-PlayerStopUsingItemEvent.patch | 0 ...837-FallingBlock-auto-expire-setting.patch | 0 .../server/0838-Don-t-tick-markers.patch | 0 ...o-not-accept-invalid-client-settings.patch | 0 .../0840-Add-support-for-Proxy-Protocol.patch | 0 ...ix-OfflinePlayer-getBedSpawnLocation.patch | 0 ...ntory-for-smokers-and-blast-furnaces.patch | 0 .../0843-Sanitize-Sent-BlockEntity-NBT.patch | 0 ...t-selector-resolving-in-books-by-def.patch | 0 ...entity-loading-causing-async-lookups.patch | 0 ...n-on-world-create-while-being-ticked.patch | 0 ...nate-Current-redstone-implementation.patch | 0 ...848-Dont-resent-entity-on-art-update.patch | 0 .../0849-Add-WardenAngerChangeEvent.patch | 0 ...-strict-advancement-dimension-checks.patch | 0 ...rtant-BlockStateListPopulator-method.patch | 0 .../server/0852-Nameable-Banner-API.patch | 0 ...broadcast-messages-to-command-blocks.patch | 0 ...mpty-items-from-being-added-to-world.patch | 0 ...shPotion-and-LingeringPotion-spawnin.patch | 0 ...onent-in-resource-pack-rejection-mes.patch | 0 .../server/0857-Add-Player-getFishHook.patch | 0 ...-chunk-for-dynamic-game-event-listen.patch | 0 ...us-missing-EntityDropItemEvent-calls.patch | 0 ...-debug-information-to-chat-packet-er.patch | 0 .../server/0861-Fix-Bee-flower-NPE.patch | 0 ...g-not-using-commands.spam-exclusions.patch | 0 .../server/0863-More-Teleport-API.patch | 0 .../0864-Add-EntityPortalReadyEvent.patch | 0 ...-level-random-in-entity-constructors.patch | 0 ...ck-entities-after-destroy-prediction.patch | 0 ...-on-plugins-accessing-faraway-chunks.patch | 0 ...stom-Chat-Completion-Suggestions-API.patch | 0 .../0869-Add-missing-BlockFadeEvents.patch | 0 .../server/0870-Collision-API.patch | 0 ...and-message-for-brigadier-syntax-exc.patch | 0 ...e-invalid-signature-login-stacktrace.patch | 0 .../server/0873-Block-Ticking-API.patch | 0 ...4-Add-Velocity-IP-Forwarding-Support.patch | 0 ...random-in-ServerLoginPacketListenerI.patch | 0 ...0876-Add-NamespacedKey-biome-methods.patch | 0 ...ix-plugin-loggers-on-server-shutdown.patch | 0 ...ound-for-client-lag-spikes-MC-162253.patch | 0 ...ook-changes-from-crashing-the-server.patch | 0 ...ht-killed-statuses-should-be-false-f.patch | 0 ...ntityChangeBlockEvent-in-more-places.patch | 0 .../0882-Missing-eating-regain-reason.patch | 0 .../server/0883-Missing-effect-cause.patch | 0 ...-serialization-deserialization-for-P.patch | 0 ...arameter-to-ProjectileSource-launchP.patch | 0 ...86-Call-BlockPhysicsEvent-more-often.patch | 0 .../0887-Configurable-chat-thread-limit.patch | 0 ...-of-WorldCreator-keepSpawnLoaded-ret.patch | 0 ...ore-player-sending-on-dimension-chan.patch | 0 .../0890-fix-Jigsaw-block-kicking-user.patch | 0 ...rmEvent-for-mud-converting-into-clay.patch | 0 .../0892-Add-getDrops-to-BlockState.patch | 0 .../0893-Fix-a-bunch-of-vanilla-bugs.patch | 0 ...ry-onTrackingStart-during-navigation.patch | 0 .../0895-Fix-custom-piglin-loved-items.patch | 0 .../0896-EntityPickupItemEvent-fixes.patch | 0 ...-interactions-with-items-on-cooldown.patch | 0 ...8-Add-PlayerInventorySlotChangeEvent.patch | 0 .../0899-Elder-Guardian-appearance-API.patch | 0 ...low-changing-bed-s-occupied-property.patch | 0 .../0901-Add-entity-knockback-API.patch | 0 .../server/0902-Detect-headless-JREs.patch | 0 ...y-vehicle-collision-event-not-called.patch | 0 ...04-optimized-dirt-and-snow-spreading.patch | 0 .../0905-Added-EntityToggleSitEvent.patch | 0 .../0906-Add-fire-tick-delay-option.patch | 0 .../server/0907-Add-Moving-Piston-API.patch | 0 .../0908-Ignore-impossible-spawn-tick.patch | 0 ...-source-for-fireworks-from-dispenser.patch | 0 ...nt-suggestion-permissions-to-align-w.patch | 0 ...tEvent-cancellation-cant-fully-preve.patch | 0 ...-Prevent-compass-from-loading-chunks.patch | 0 .../0913-Add-PrePlayerAttackEntityEvent.patch | 0 ...re-reset-EnderDragon-boss-event-name.patch | 0 ...7-green-map-markers-do-not-disappear.patch | 0 .../0916-Add-Player-Warden-Warning-API.patch | 0 ...la-friendly-methods-to-update-trades.patch | 0 ...0918-Add-paper-dumplisteners-command.patch | 0 ...global-player-list-where-appropriate.patch | 0 ...async-entity-add-due-to-fungus-trees.patch | 0 .../server/0921-ItemStack-damage-API.patch | 0 .../server/0922-Friction-API.patch | 0 ...ntrol-player-s-insomnia-and-phantoms.patch | 0 .../0924-Fix-player-kick-on-shutdown.patch | 0 .../0925-Sync-offhand-slot-in-menus.patch | 0 .../0926-Player-Entity-Tracking-Events.patch | 0 .../server/0927-Limit-pet-look-distance.patch | 0 .../0928-Properly-resend-entities.patch | 0 ...and-additions-to-the-SpawnReason-API.patch | 0 .../server/0930-fix-Instruments.patch | 0 ...-for-some-hot-BlockBehavior-and-Flui.patch | 0 ...x-MapLike-Codec-missing-key-selector.patch | 0 ...ies-in-dispense-events-regarding-sta.patch | 0 .../0934-Improve-logging-and-errors.patch | 0 .../server/0935-Add-BlockLockCheckEvent.patch | 0 .../0936-Add-Sneaking-API-for-Entities.patch | 0 .../server/0937-Improve-PortalEvents.patch | 0 ...tion-for-spider-worldborder-climbing.patch | 0 ...ssing-SpigotConfig-logCommands-check.patch | 0 ...-Allay-stopDancing-while-not-dancing.patch | 0 .../server/0941-Flying-Fall-Damage.patch | 0 ...ded-block-state-to-BlockExplodeEvent.patch | 0 ...sion-moving-velocity-to-VehicleBlock.patch | 0 ...config-for-disabling-entity-tag-tags.patch | 0 ...le-player-info-update-packet-on-join.patch | 0 ...nk-items-during-EntityResurrectEvent.patch | 0 .../server/0947-Win-Screen-API.patch | 0 ...tItemStack-setAmount-null-assignment.patch | 0 ...Fix-force-opening-enchantment-tables.patch | 0 .../server/0950-Add-Entity-Body-Yaw-API.patch | 0 ...event-sleeping-villagers-moving-towa.patch | 0 ...when-a-captured-block-state-is-outda.patch | 0 .../0953-Add-EntityFertilizeEggEvent.patch | 0 ...ity-drop-not-updating-the-client-inv.patch | 0 ...ItemEvent-and-EntityCompostItemEvent.patch | 0 ...ectly-handle-ArmorStand-invisibility.patch | 0 ...vancement-triggers-for-entity-damage.patch | 0 ...0958-Fix-text-display-error-on-spawn.patch | 0 ...inventories-returning-null-Locations.patch | 0 .../server/0960-Add-Shearable-API.patch | 0 ...-Fix-SpawnEggMeta-get-setSpawnedType.patch | 0 ...okshelf-and-jukebox-setItem-with-air.patch | 0 .../server/0963-Optimize-Hoppers.patch | 0 ...hives-generating-from-using-bonemeal.patch | 0 .../0965-Fix-api-checking-banned-ips.patch | 0 ...ng-to-bad-recipes-in-furnace-like-ti.patch | 0 ...uence-violations-like-they-should-be.patch | 0 ...duplicate-animate-packet-for-records.patch | 0 ...expired-keys-from-impacting-new-join.patch | 0 ...nts-being-fired-from-unloaded-chunks.patch | 0 .../0971-Use-array-for-gamerule-storage.patch | 0 .../server/0972-Fix-block-place-logic.patch | 0 ...-Fix-a-couple-of-upstream-bed-issues.patch | 0 ...Fix-demo-flag-not-enabling-demo-mode.patch | 0 ...wListing-before-received-from-client.patch | 0 .../0976-Add-Mob-Experience-reward-API.patch | 0 ...-redstone-on-top-of-trap-doors-early.patch | 0 ...8-Fix-DamageCause-for-Falling-Blocks.patch | 0 ...-Lazy-Initialization-for-Enum-Fields.patch | 0 ...980-More-accurate-isInOpenWater-impl.patch | 0 ...access-to-lookups-field-in-RegistryO.patch | 0 ...recalcBlockCounts-for-empty-sections.patch | 0 ...eehive-without-any-players-nearby-th.patch | 0 .../0984-Expand-PlayerItemMendEvent.patch | 0 ...esh-ProjectileSource-for-projectiles.patch | 0 .../0986-Add-transient-modifier-API.patch | 0 work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 1075 files changed, 509 insertions(+), 562 deletions(-) rename patches/{ => unapplied}/server/0010-Adventure.patch (100%) rename patches/{ => unapplied}/server/0011-Paper-command.patch (100%) rename patches/{ => unapplied}/server/0012-Paper-Metrics.patch (100%) rename patches/{ => unapplied}/server/0013-Paper-Plugins.patch (100%) rename patches/{ => unapplied}/server/0014-Timings-v2.patch (100%) rename patches/{ => unapplied}/server/0015-Rewrite-dataconverter-system.patch (100%) rename patches/{ => unapplied}/server/0016-Starlight.patch (100%) rename patches/{ => unapplied}/server/0017-Add-TickThread.patch (100%) rename patches/{ => unapplied}/server/0018-Rewrite-chunk-system.patch (100%) rename patches/{ => unapplied}/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch (100%) rename patches/{ => unapplied}/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch (100%) rename patches/{ => unapplied}/server/0021-Configurable-baby-zombie-movement-speed.patch (100%) rename patches/{ => unapplied}/server/0022-Configurable-fishing-time-ranges.patch (100%) rename patches/{ => unapplied}/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch (100%) rename patches/{ => unapplied}/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch (100%) rename patches/{ => unapplied}/server/0025-Allow-for-toggling-of-spawn-chunks.patch (100%) rename patches/{ => unapplied}/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch (100%) rename patches/{ => unapplied}/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch (100%) rename patches/{ => unapplied}/server/0028-Implement-Paper-VersionChecker.patch (100%) rename patches/{ => unapplied}/server/0029-Add-version-history-to-version-command.patch (100%) rename patches/{ => unapplied}/server/0030-Player-affects-spawning-API.patch (100%) rename patches/{ => unapplied}/server/0031-Further-improve-server-tick-loop.patch (100%) rename patches/{ => unapplied}/server/0032-Only-refresh-abilities-if-needed.patch (100%) rename patches/{ => unapplied}/server/0033-Entity-Origin-API.patch (100%) rename patches/{ => unapplied}/server/0034-Prevent-tile-entity-and-entity-crashes.patch (100%) rename patches/{ => unapplied}/server/0035-Configurable-top-of-nether-void-damage.patch (100%) rename patches/{ => unapplied}/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch (100%) rename patches/{ => unapplied}/server/0037-Always-tick-falling-blocks.patch (100%) rename patches/{ => unapplied}/server/0038-Configurable-end-credits.patch (100%) rename patches/{ => unapplied}/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch (100%) rename patches/{ => unapplied}/server/0040-Optimize-explosions.patch (100%) rename patches/{ => unapplied}/server/0041-Disable-explosion-knockback.patch (100%) rename patches/{ => unapplied}/server/0042-Disable-thunder.patch (100%) rename patches/{ => unapplied}/server/0043-Disable-ice-and-snow.patch (100%) rename patches/{ => unapplied}/server/0044-Configurable-mob-spawner-tick-rate.patch (100%) rename patches/{ => unapplied}/server/0045-Implement-PlayerLocaleChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0046-Add-BeaconEffectEvent.patch (100%) rename patches/{ => unapplied}/server/0047-Configurable-container-update-tick-rate.patch (100%) rename patches/{ => unapplied}/server/0048-Use-UserCache-for-player-heads.patch (100%) rename patches/{ => unapplied}/server/0049-Disable-spigot-tick-limiters.patch (100%) rename patches/{ => unapplied}/server/0050-Add-PlayerInitialSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch (100%) rename patches/{ => unapplied}/server/0052-Ensure-commands-are-not-ran-async.patch (100%) rename patches/{ => unapplied}/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch (100%) rename patches/{ => unapplied}/server/0054-Expose-server-CommandMap.patch (100%) rename patches/{ => unapplied}/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch (100%) rename patches/{ => unapplied}/server/0056-Player-Tab-List-and-Title-APIs.patch (100%) rename patches/{ => unapplied}/server/0057-Add-configurable-portal-search-radius.patch (100%) rename patches/{ => unapplied}/server/0058-Add-velocity-warnings.patch (100%) rename patches/{ => unapplied}/server/0059-Configurable-inter-world-teleportation-safety.patch (100%) rename patches/{ => unapplied}/server/0060-Add-exception-reporting-event.patch (100%) rename patches/{ => unapplied}/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch (100%) rename patches/{ => unapplied}/server/0062-Disable-Scoreboards-for-non-players-by-default.patch (100%) rename patches/{ => unapplied}/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch (100%) rename patches/{ => unapplied}/server/0064-Chunk-Save-Reattempt.patch (100%) rename patches/{ => unapplied}/server/0065-Complete-resource-pack-API.patch (100%) rename patches/{ => unapplied}/server/0066-Default-loading-permissions.yml-before-plugins.patch (100%) rename patches/{ => unapplied}/server/0067-Allow-Reloading-of-Custom-Permissions.patch (100%) rename patches/{ => unapplied}/server/0068-Remove-Metadata-on-reload.patch (100%) rename patches/{ => unapplied}/server/0069-Handle-Item-Meta-Inconsistencies.patch (100%) rename patches/{ => unapplied}/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch (100%) rename patches/{ => unapplied}/server/0071-Add-World-Util-Methods.patch (100%) rename patches/{ => unapplied}/server/0072-Custom-replacement-for-eaten-items.patch (100%) rename patches/{ => unapplied}/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch (100%) rename patches/{ => unapplied}/server/0074-Use-a-Shared-Random-for-Entities.patch (100%) rename patches/{ => unapplied}/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch (100%) rename patches/{ => unapplied}/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch (100%) rename patches/{ => unapplied}/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch (100%) rename patches/{ => unapplied}/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch (100%) rename patches/{ => unapplied}/server/0079-Configurable-Chunk-Inhabited-Time.patch (100%) rename patches/{ => unapplied}/server/0080-EntityPathfindEvent.patch (100%) rename patches/{ => unapplied}/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch (100%) rename patches/{ => unapplied}/server/0082-Do-not-load-chunks-for-Pathfinding.patch (100%) rename patches/{ => unapplied}/server/0083-Add-PlayerUseUnknownEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0084-Configurable-Grass-Spread-Tick-Rate.patch (100%) rename patches/{ => unapplied}/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch (100%) rename patches/{ => unapplied}/server/0086-Optimize-DataBits.patch (100%) rename patches/{ => unapplied}/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch (100%) rename patches/{ => unapplied}/server/0088-Configurable-Player-Collision.patch (100%) rename patches/{ => unapplied}/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch (100%) rename patches/{ => unapplied}/server/0090-Configurable-RCON-IP-address.patch (100%) rename patches/{ => unapplied}/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch (100%) rename patches/{ => unapplied}/server/0092-Add-ability-to-configure-frosted_ice-properties.patch (100%) rename patches/{ => unapplied}/server/0093-remove-null-possibility-for-getServer-singleton.patch (100%) rename patches/{ => unapplied}/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch (100%) rename patches/{ => unapplied}/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch (100%) rename patches/{ => unapplied}/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch (100%) rename patches/{ => unapplied}/server/0097-System-property-for-disabling-watchdoge.patch (100%) rename patches/{ => unapplied}/server/0098-Async-GameProfileCache-saving.patch (100%) rename patches/{ => unapplied}/server/0099-Optional-TNT-doesn-t-move-in-water.patch (100%) rename patches/{ => unapplied}/server/0100-Faster-redstone-torch-rapid-clock-removal.patch (100%) rename patches/{ => unapplied}/server/0101-Add-server-name-parameter.patch (100%) rename patches/{ => unapplied}/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch (100%) rename patches/{ => unapplied}/server/0103-Fix-Old-Sign-Conversion.patch (100%) rename patches/{ => unapplied}/server/0104-Avoid-blocking-on-Network-Manager-creation.patch (100%) rename patches/{ => unapplied}/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch (100%) rename patches/{ => unapplied}/server/0106-Add-setting-for-proxy-online-mode-status.patch (100%) rename patches/{ => unapplied}/server/0107-Optimise-BlockState-s-hashCode-equals.patch (100%) rename patches/{ => unapplied}/server/0108-Configurable-packet-in-spam-threshold.patch (100%) rename patches/{ => unapplied}/server/0109-Configurable-flying-kick-messages.patch (100%) rename patches/{ => unapplied}/server/0110-Add-EntityZapEvent.patch (100%) rename patches/{ => unapplied}/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch (100%) rename patches/{ => unapplied}/server/0112-Cache-user-authenticator-threads.patch (100%) rename patches/{ => unapplied}/server/0113-Allow-Reloading-of-Command-Aliases.patch (100%) rename patches/{ => unapplied}/server/0114-Add-source-to-PlayerExpChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0115-Add-ProjectileCollideEvent.patch (100%) rename patches/{ => unapplied}/server/0116-Prevent-Pathfinding-out-of-World-Border.patch (100%) rename patches/{ => unapplied}/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch (100%) rename patches/{ => unapplied}/server/0118-Bound-Treasure-Maps-to-World-Border.patch (100%) rename patches/{ => unapplied}/server/0119-Configurable-Cartographer-Treasure-Maps.patch (100%) rename patches/{ => unapplied}/server/0120-Optimize-ItemStack.isEmpty.patch (100%) rename patches/{ => unapplied}/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch (100%) rename patches/{ => unapplied}/server/0122-String-based-Action-Bar-API.patch (100%) rename patches/{ => unapplied}/server/0123-Properly-fix-item-duplication-bug.patch (100%) rename patches/{ => unapplied}/server/0124-Firework-API-s.patch (100%) rename patches/{ => unapplied}/server/0125-PlayerTeleportEndGatewayEvent.patch (100%) rename patches/{ => unapplied}/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch (100%) rename patches/{ => unapplied}/server/0127-Enforce-Sync-Player-Saves.patch (100%) rename patches/{ => unapplied}/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch (100%) rename patches/{ => unapplied}/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch (100%) rename patches/{ => unapplied}/server/0130-Cap-Entity-Collisions.patch (100%) rename patches/{ => unapplied}/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch (100%) rename patches/{ => unapplied}/server/0132-Do-not-let-armorstands-drown.patch (100%) rename patches/{ => unapplied}/server/0133-Properly-handle-async-calls-to-restart-the-server.patch (100%) rename patches/{ => unapplied}/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch (100%) rename patches/{ => unapplied}/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch (100%) rename patches/{ => unapplied}/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch (100%) rename patches/{ => unapplied}/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch (100%) rename patches/{ => unapplied}/server/0138-Item-canEntityPickup.patch (100%) rename patches/{ => unapplied}/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch (100%) rename patches/{ => unapplied}/server/0140-PlayerAttemptPickupItemEvent.patch (100%) rename patches/{ => unapplied}/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch (100%) rename patches/{ => unapplied}/server/0142-Add-UnknownCommandEvent.patch (100%) rename patches/{ => unapplied}/server/0143-Basic-PlayerProfile-API.patch (100%) rename patches/{ => unapplied}/server/0144-Shoulder-Entities-Release-API.patch (100%) rename patches/{ => unapplied}/server/0145-Profile-Lookup-Events.patch (100%) rename patches/{ => unapplied}/server/0146-Block-player-logins-during-server-shutdown.patch (100%) rename patches/{ => unapplied}/server/0147-Entity-fromMobSpawner.patch (100%) rename patches/{ => unapplied}/server/0148-Improve-the-Saddle-API-for-Horses.patch (100%) rename patches/{ => unapplied}/server/0149-Implement-ensureServerConversions-API.patch (100%) rename patches/{ => unapplied}/server/0150-Implement-getI18NDisplayName.patch (100%) rename patches/{ => unapplied}/server/0151-ProfileWhitelistVerifyEvent.patch (100%) rename patches/{ => unapplied}/server/0152-Fix-this-stupid-bullshit.patch (100%) rename patches/{ => unapplied}/server/0153-LivingEntity-setKiller.patch (100%) rename patches/{ => unapplied}/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch (100%) rename patches/{ => unapplied}/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch (100%) rename patches/{ => unapplied}/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch (100%) rename patches/{ => unapplied}/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch (100%) rename patches/{ => unapplied}/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch (100%) rename patches/{ => unapplied}/server/0159-Add-PlayerJumpEvent.patch (100%) rename patches/{ => unapplied}/server/0160-handle-ServerboundKeepAlivePacket-async.patch (100%) rename patches/{ => unapplied}/server/0161-Expose-client-protocol-version-and-virtual-host.patch (100%) rename patches/{ => unapplied}/server/0162-revert-serverside-behavior-of-keepalives.patch (100%) rename patches/{ => unapplied}/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch (100%) rename patches/{ => unapplied}/server/0164-Add-PlayerArmorChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch (100%) rename patches/{ => unapplied}/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch (100%) rename patches/{ => unapplied}/server/0167-use-CB-BlockState-implementations-for-captured-block.patch (100%) rename patches/{ => unapplied}/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch (100%) rename patches/{ => unapplied}/server/0169-AsyncTabCompleteEvent.patch (100%) rename patches/{ => unapplied}/server/0170-PlayerPickupExperienceEvent.patch (100%) rename patches/{ => unapplied}/server/0171-Ability-to-apply-mending-to-XP-API.patch (100%) rename patches/{ => unapplied}/server/0172-PlayerNaturallySpawnCreaturesEvent.patch (100%) rename patches/{ => unapplied}/server/0173-Add-setPlayerProfile-API-for-Skulls.patch (100%) rename patches/{ => unapplied}/server/0174-PreCreatureSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0175-Fill-Profile-Property-Events.patch (100%) rename patches/{ => unapplied}/server/0176-PlayerAdvancementCriterionGrantEvent.patch (100%) rename patches/{ => unapplied}/server/0177-Add-ArmorStand-Item-Meta.patch (100%) rename patches/{ => unapplied}/server/0178-Extend-Player-Interact-cancellation.patch (100%) rename patches/{ => unapplied}/server/0179-Tameable-getOwnerUniqueId-API.patch (100%) rename patches/{ => unapplied}/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch (100%) rename patches/{ => unapplied}/server/0181-Disable-Explicit-Network-Manager-Flushing.patch (100%) rename patches/{ => unapplied}/server/0182-Implement-extended-PaperServerListPingEvent.patch (100%) rename patches/{ => unapplied}/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch (100%) rename patches/{ => unapplied}/server/0184-Player.setPlayerProfile-API.patch (100%) rename patches/{ => unapplied}/server/0185-getPlayerUniqueId-API.patch (100%) rename patches/{ => unapplied}/server/0186-Improved-Async-Task-Scheduler.patch (100%) rename patches/{ => unapplied}/server/0187-Make-legacy-ping-handler-more-reliable.patch (100%) rename patches/{ => unapplied}/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch (100%) rename patches/{ => unapplied}/server/0189-Flag-to-disable-the-channel-limit.patch (100%) rename patches/{ => unapplied}/server/0190-Add-openSign-method-to-HumanEntity.patch (100%) rename patches/{ => unapplied}/server/0191-Configurable-sprint-interruption-on-attack.patch (100%) rename patches/{ => unapplied}/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch (100%) rename patches/{ => unapplied}/server/0193-EndermanEscapeEvent.patch (100%) rename patches/{ => unapplied}/server/0194-Enderman.teleportRandomly.patch (100%) rename patches/{ => unapplied}/server/0195-Block-Enderpearl-Travel-Exploit.patch (100%) rename patches/{ => unapplied}/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch (100%) rename patches/{ => unapplied}/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch (100%) rename patches/{ => unapplied}/server/0198-EndermanAttackPlayerEvent.patch (100%) rename patches/{ => unapplied}/server/0199-WitchConsumePotionEvent.patch (100%) rename patches/{ => unapplied}/server/0200-WitchThrowPotionEvent.patch (100%) rename patches/{ => unapplied}/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch (100%) rename patches/{ => unapplied}/server/0202-WitchReadyPotionEvent.patch (100%) rename patches/{ => unapplied}/server/0203-ItemStack-getMaxItemUseDuration.patch (100%) rename patches/{ => unapplied}/server/0204-Implement-EntityTeleportEndGatewayEvent.patch (100%) rename patches/{ => unapplied}/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch (100%) rename patches/{ => unapplied}/server/0206-Fix-CraftEntity-hashCode.patch (100%) rename patches/{ => unapplied}/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch (100%) rename patches/{ => unapplied}/server/0208-Print-Error-details-when-failing-to-save-player-data.patch (100%) rename patches/{ => unapplied}/server/0209-Make-shield-blocking-delay-configurable.patch (100%) rename patches/{ => unapplied}/server/0210-Improve-EntityShootBowEvent.patch (100%) rename patches/{ => unapplied}/server/0211-PlayerReadyArrowEvent.patch (100%) rename patches/{ => unapplied}/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch (100%) rename patches/{ => unapplied}/server/0213-Expand-Explosions-API.patch (100%) rename patches/{ => unapplied}/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch (100%) rename patches/{ => unapplied}/server/0215-RangedEntity-API.patch (100%) rename patches/{ => unapplied}/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch (100%) rename patches/{ => unapplied}/server/0217-Implement-World.getEntity-UUID-API.patch (100%) rename patches/{ => unapplied}/server/0218-InventoryCloseEvent-Reason-API.patch (100%) rename patches/{ => unapplied}/server/0219-Vex-get-setSummoner-API.patch (100%) rename patches/{ => unapplied}/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch (100%) rename patches/{ => unapplied}/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch (100%) rename patches/{ => unapplied}/server/0222-add-more-information-to-Entity.toString.patch (100%) rename patches/{ => unapplied}/server/0223-EnderDragon-Events.patch (100%) rename patches/{ => unapplied}/server/0224-PlayerElytraBoostEvent.patch (100%) rename patches/{ => unapplied}/server/0225-PlayerLaunchProjectileEvent.patch (100%) rename patches/{ => unapplied}/server/0226-Improve-BlockPosition-inlining.patch (100%) rename patches/{ => unapplied}/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch (100%) rename patches/{ => unapplied}/server/0228-Vanished-players-don-t-have-rights.patch (100%) rename patches/{ => unapplied}/server/0229-Allow-disabling-armour-stand-ticking.patch (100%) rename patches/{ => unapplied}/server/0230-SkeletonHorse-Additions.patch (100%) rename patches/{ => unapplied}/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch (100%) rename patches/{ => unapplied}/server/0232-Implement-Expanded-ArmorStand-API.patch (100%) rename patches/{ => unapplied}/server/0233-AnvilDamageEvent.patch (100%) rename patches/{ => unapplied}/server/0234-Add-TNTPrimeEvent.patch (100%) rename patches/{ => unapplied}/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch (100%) rename patches/{ => unapplied}/server/0236-Fix-NBT-type-issues.patch (100%) rename patches/{ => unapplied}/server/0237-Remove-unnecessary-itemmeta-handling.patch (100%) rename patches/{ => unapplied}/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch (100%) rename patches/{ => unapplied}/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch (100%) rename patches/{ => unapplied}/server/0240-Use-ConcurrentHashMap-in-JsonList.patch (100%) rename patches/{ => unapplied}/server/0241-Use-a-Queue-for-Queueing-Commands.patch (100%) rename patches/{ => unapplied}/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch (100%) rename patches/{ => unapplied}/server/0243-Optimize-BlockPosition-helper-methods.patch (100%) rename patches/{ => unapplied}/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch (100%) rename patches/{ => unapplied}/server/0245-Slime-Pathfinder-Events.patch (100%) rename patches/{ => unapplied}/server/0246-Configurable-speed-for-water-flowing-over-lava.patch (100%) rename patches/{ => unapplied}/server/0247-Optimize-CraftBlockData-Creation.patch (100%) rename patches/{ => unapplied}/server/0248-Optimize-MappedRegistry.patch (100%) rename patches/{ => unapplied}/server/0249-Add-PhantomPreSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0250-Add-More-Creeper-API.patch (100%) rename patches/{ => unapplied}/server/0251-Inventory-removeItemAnySlot.patch (100%) rename patches/{ => unapplied}/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch (100%) rename patches/{ => unapplied}/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch (100%) rename patches/{ => unapplied}/server/0254-Expose-attack-cooldown-methods-for-Player.patch (100%) rename patches/{ => unapplied}/server/0255-Improve-death-events.patch (100%) rename patches/{ => unapplied}/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch (100%) rename patches/{ => unapplied}/server/0257-Mob-Pathfinding-API.patch (100%) rename patches/{ => unapplied}/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch (100%) rename patches/{ => unapplied}/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch (100%) rename patches/{ => unapplied}/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch (100%) rename patches/{ => unapplied}/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch (100%) rename patches/{ => unapplied}/server/0262-Implement-furnace-cook-speed-multiplier-API.patch (100%) rename patches/{ => unapplied}/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch (100%) rename patches/{ => unapplied}/server/0264-Honor-EntityAgeable.ageLock.patch (100%) rename patches/{ => unapplied}/server/0265-Configurable-connection-throttle-kick-message.patch (100%) rename patches/{ => unapplied}/server/0266-Hook-into-CB-plugin-rewrites.patch (100%) rename patches/{ => unapplied}/server/0267-PreSpawnerSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0268-Add-LivingEntity-getTargetEntity.patch (100%) rename patches/{ => unapplied}/server/0269-Add-sun-related-API.patch (100%) rename patches/{ => unapplied}/server/0270-Turtle-API.patch (100%) rename patches/{ => unapplied}/server/0271-Call-player-spectator-target-events-and-improve-impl.patch (100%) rename patches/{ => unapplied}/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch (100%) rename patches/{ => unapplied}/server/0273-Add-more-Witch-API.patch (100%) rename patches/{ => unapplied}/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch (100%) rename patches/{ => unapplied}/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch (100%) rename patches/{ => unapplied}/server/0276-Reset-players-airTicks-on-respawn.patch (100%) rename patches/{ => unapplied}/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch (100%) rename patches/{ => unapplied}/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch (100%) rename patches/{ => unapplied}/server/0279-Optimize-World-Time-Updates.patch (100%) rename patches/{ => unapplied}/server/0280-Restore-custom-InventoryHolder-support.patch (100%) rename patches/{ => unapplied}/server/0281-Use-Vanilla-Minecart-Speeds.patch (100%) rename patches/{ => unapplied}/server/0282-Fix-SpongeAbsortEvent-handling.patch (100%) rename patches/{ => unapplied}/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch (100%) rename patches/{ => unapplied}/server/0284-Make-the-default-permission-message-configurable.patch (100%) rename patches/{ => unapplied}/server/0285-Prevent-rayTrace-from-loading-chunks.patch (100%) rename patches/{ => unapplied}/server/0286-Handle-Large-Packets-disconnecting-client.patch (100%) rename patches/{ => unapplied}/server/0287-force-entity-dismount-during-teleportation.patch (100%) rename patches/{ => unapplied}/server/0288-Add-more-Zombie-API.patch (100%) rename patches/{ => unapplied}/server/0289-Book-Size-Limits.patch (100%) rename patches/{ => unapplied}/server/0290-Add-PlayerConnectionCloseEvent.patch (100%) rename patches/{ => unapplied}/server/0291-Prevent-Enderman-from-loading-chunks.patch (100%) rename patches/{ => unapplied}/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch (100%) rename patches/{ => unapplied}/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch (100%) rename patches/{ => unapplied}/server/0294-Block-Entity-remove-from-being-called-on-Players.patch (100%) rename patches/{ => unapplied}/server/0295-BlockDestroyEvent.patch (100%) rename patches/{ => unapplied}/server/0296-Async-command-map-building.patch (100%) rename patches/{ => unapplied}/server/0297-Implement-Brigadier-Mojang-API.patch (100%) rename patches/{ => unapplied}/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch (100%) rename patches/{ => unapplied}/server/0299-Limit-Client-Sign-length-more.patch (100%) rename patches/{ => unapplied}/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch (100%) rename patches/{ => unapplied}/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch (100%) rename patches/{ => unapplied}/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch (100%) rename patches/{ => unapplied}/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch (100%) rename patches/{ => unapplied}/server/0304-Entity-getEntitySpawnReason.patch (100%) rename patches/{ => unapplied}/server/0305-Fire-event-on-GS4-query.patch (100%) rename patches/{ => unapplied}/server/0306-Implement-PlayerPostRespawnEvent.patch (100%) rename patches/{ => unapplied}/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch (100%) rename patches/{ => unapplied}/server/0308-Server-Tick-Events.patch (100%) rename patches/{ => unapplied}/server/0309-PlayerDeathEvent-getItemsToKeep.patch (100%) rename patches/{ => unapplied}/server/0310-Optimize-Captured-TileEntity-Lookup.patch (100%) rename patches/{ => unapplied}/server/0311-Add-Heightmap-API.patch (100%) rename patches/{ => unapplied}/server/0312-Mob-Spawner-API-Enhancements.patch (100%) rename patches/{ => unapplied}/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch (100%) rename patches/{ => unapplied}/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch (100%) rename patches/{ => unapplied}/server/0315-Implement-CraftBlockSoundGroup.patch (100%) rename patches/{ => unapplied}/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch (100%) rename patches/{ => unapplied}/server/0317-Allow-Saving-of-Oversized-Chunks.patch (100%) rename patches/{ => unapplied}/server/0318-Expose-the-internal-current-tick.patch (100%) rename patches/{ => unapplied}/server/0319-Fix-World-isChunkGenerated-calls.patch (100%) rename patches/{ => unapplied}/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch (100%) rename patches/{ => unapplied}/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch (100%) rename patches/{ => unapplied}/server/0322-Configurable-projectile-relative-velocity.patch (100%) rename patches/{ => unapplied}/server/0323-offset-item-frame-ticking.patch (100%) rename patches/{ => unapplied}/server/0324-Fix-MC-158900.patch (100%) rename patches/{ => unapplied}/server/0325-Prevent-consuming-the-wrong-itemstack.patch (100%) rename patches/{ => unapplied}/server/0326-Dont-send-unnecessary-sign-update.patch (100%) rename patches/{ => unapplied}/server/0327-Add-option-to-disable-pillager-patrols.patch (100%) rename patches/{ => unapplied}/server/0328-Flat-bedrock-generator-settings.patch (100%) rename patches/{ => unapplied}/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch (100%) rename patches/{ => unapplied}/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch (100%) rename patches/{ => unapplied}/server/0331-Duplicate-UUID-Resolve-Option.patch (100%) rename patches/{ => unapplied}/server/0332-PlayerDeathEvent-shouldDropExperience.patch (100%) rename patches/{ => unapplied}/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch (100%) rename patches/{ => unapplied}/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch (100%) rename patches/{ => unapplied}/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch (100%) rename patches/{ => unapplied}/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch (100%) rename patches/{ => unapplied}/server/0337-Fix-items-not-falling-correctly.patch (100%) rename patches/{ => unapplied}/server/0338-Lag-compensate-eating.patch (100%) rename patches/{ => unapplied}/server/0339-Optimize-call-to-getFluid-for-explosions.patch (100%) rename patches/{ => unapplied}/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch (100%) rename patches/{ => unapplied}/server/0341-Entity-Activation-Range-2.0.patch (100%) rename patches/{ => unapplied}/server/0342-Increase-Light-Queue-Size.patch (100%) rename patches/{ => unapplied}/server/0343-Anti-Xray.patch (100%) rename patches/{ => unapplied}/server/0344-Implement-alternative-item-despawn-rate.patch (100%) rename patches/{ => unapplied}/server/0345-Tracking-Range-Improvements.patch (100%) rename patches/{ => unapplied}/server/0346-Fix-items-vanishing-through-end-portal.patch (100%) rename patches/{ => unapplied}/server/0347-implement-optional-per-player-mob-spawns.patch (100%) rename patches/{ => unapplied}/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch (100%) rename patches/{ => unapplied}/server/0349-Improve-Block-breakNaturally-API.patch (100%) rename patches/{ => unapplied}/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch (100%) rename patches/{ => unapplied}/server/0351-Add-debug-for-sync-chunk-loads.patch (100%) rename patches/{ => unapplied}/server/0352-Remove-garbage-Java-version-check.patch (100%) rename patches/{ => unapplied}/server/0353-Add-ThrownEggHatchEvent.patch (100%) rename patches/{ => unapplied}/server/0354-Entity-Jump-API.patch (100%) rename patches/{ => unapplied}/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch (100%) rename patches/{ => unapplied}/server/0356-Make-the-GUI-graph-fancier.patch (100%) rename patches/{ => unapplied}/server/0357-add-hand-to-BlockMultiPlaceEvent.patch (100%) rename patches/{ => unapplied}/server/0358-Validate-tripwire-hook-placement-before-update.patch (100%) rename patches/{ => unapplied}/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch (100%) rename patches/{ => unapplied}/server/0360-Configurable-chance-of-villager-zombie-infection.patch (100%) rename patches/{ => unapplied}/server/0361-Optimise-Chunk-getFluid.patch (100%) rename patches/{ => unapplied}/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch (100%) rename patches/{ => unapplied}/server/0363-Add-tick-times-API-and-mspt-command.patch (100%) rename patches/{ => unapplied}/server/0364-Expose-MinecraftServer-isRunning.patch (100%) rename patches/{ => unapplied}/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch (100%) rename patches/{ => unapplied}/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch (100%) rename patches/{ => unapplied}/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch (100%) rename patches/{ => unapplied}/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch (100%) rename patches/{ => unapplied}/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch (100%) rename patches/{ => unapplied}/server/0370-Don-t-tick-dead-players.patch (100%) rename patches/{ => unapplied}/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch (100%) rename patches/{ => unapplied}/server/0372-Optimize-Collision-to-not-load-chunks.patch (100%) rename patches/{ => unapplied}/server/0373-Don-t-move-existing-players-to-world-spawn.patch (100%) rename patches/{ => unapplied}/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch (100%) rename patches/{ => unapplied}/server/0375-Improved-Watchdog-Support.patch (100%) rename patches/{ => unapplied}/server/0376-Optimize-Pathfinding.patch (100%) rename patches/{ => unapplied}/server/0377-Reduce-Either-Optional-allocation.patch (100%) rename patches/{ => unapplied}/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch (100%) rename patches/{ => unapplied}/server/0379-Prevent-opening-inventories-when-frozen.patch (100%) rename patches/{ => unapplied}/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch (100%) rename patches/{ => unapplied}/server/0381-Implement-Player-Client-Options-API.patch (100%) rename patches/{ => unapplied}/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch (100%) rename patches/{ => unapplied}/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch (100%) rename patches/{ => unapplied}/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch (100%) rename patches/{ => unapplied}/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch (100%) rename patches/{ => unapplied}/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch (100%) rename patches/{ => unapplied}/server/0387-Add-phantom-creative-and-insomniac-controls.patch (100%) rename patches/{ => unapplied}/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch (100%) rename patches/{ => unapplied}/server/0389-Villager-Restocks-API.patch (100%) rename patches/{ => unapplied}/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch (100%) rename patches/{ => unapplied}/server/0391-Expose-game-version.patch (100%) rename patches/{ => unapplied}/server/0392-Optimize-Voxel-Shape-Merging.patch (100%) rename patches/{ => unapplied}/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch (100%) rename patches/{ => unapplied}/server/0394-misc-debugging-dumps.patch (100%) rename patches/{ => unapplied}/server/0395-Prevent-teleporting-dead-entities.patch (100%) rename patches/{ => unapplied}/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch (100%) rename patches/{ => unapplied}/server/0397-Implement-Mob-Goal-API.patch (100%) rename patches/{ => unapplied}/server/0398-Add-villager-reputation-API.patch (100%) rename patches/{ => unapplied}/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch (100%) rename patches/{ => unapplied}/server/0400-ExperienceOrbMergeEvent.patch (100%) rename patches/{ => unapplied}/server/0401-Fix-PotionEffect-ignores-icon-flag.patch (100%) rename patches/{ => unapplied}/server/0402-Optimize-brigadier-child-sorting-performance.patch (100%) rename patches/{ => unapplied}/server/0403-Potential-bed-API.patch (100%) rename patches/{ => unapplied}/server/0404-Wait-for-Async-Tasks-during-shutdown.patch (100%) rename patches/{ => unapplied}/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch (100%) rename patches/{ => unapplied}/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch (100%) rename patches/{ => unapplied}/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch (100%) rename patches/{ => unapplied}/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch (100%) rename patches/{ => unapplied}/server/0409-Ensure-safe-gateway-teleport.patch (100%) rename patches/{ => unapplied}/server/0410-Add-option-for-console-having-all-permissions.patch (100%) rename patches/{ => unapplied}/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch (100%) rename patches/{ => unapplied}/server/0412-Use-distance-map-to-optimise-entity-tracker.patch (100%) rename patches/{ => unapplied}/server/0413-Fix-villager-trading-demand-MC-163962.patch (100%) rename patches/{ => unapplied}/server/0414-Maps-shouldn-t-load-chunks.patch (100%) rename patches/{ => unapplied}/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch (100%) rename patches/{ => unapplied}/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch (100%) rename patches/{ => unapplied}/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch (100%) rename patches/{ => unapplied}/server/0418-Fix-sand-duping.patch (100%) rename patches/{ => unapplied}/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch (100%) rename patches/{ => unapplied}/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch (100%) rename patches/{ => unapplied}/server/0421-Inventory-getHolder-method-without-block-snapshot.patch (100%) rename patches/{ => unapplied}/server/0422-Improve-Arrow-API.patch (100%) rename patches/{ => unapplied}/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch (100%) rename patches/{ => unapplied}/server/0424-Hide-sync-chunk-writes-behind-flag.patch (100%) rename patches/{ => unapplied}/server/0425-Add-permission-for-command-blocks.patch (100%) rename patches/{ => unapplied}/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch (100%) rename patches/{ => unapplied}/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch (100%) rename patches/{ => unapplied}/server/0428-Paper-dumpitem-command.patch (100%) rename patches/{ => unapplied}/server/0429-Improve-Legacy-Component-serialization-size.patch (100%) rename patches/{ => unapplied}/server/0430-Optimize-Bit-Operations-by-inlining.patch (100%) rename patches/{ => unapplied}/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch (100%) rename patches/{ => unapplied}/server/0432-incremental-chunk-and-player-saving.patch (100%) rename patches/{ => unapplied}/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch (100%) rename patches/{ => unapplied}/server/0434-Support-old-UUID-format-for-NBT.patch (100%) rename patches/{ => unapplied}/server/0435-Clean-up-duplicated-GameProfile-Properties.patch (100%) rename patches/{ => unapplied}/server/0436-Convert-legacy-attributes-in-Item-Meta.patch (100%) rename patches/{ => unapplied}/server/0437-Remove-some-streams-from-structures.patch (100%) rename patches/{ => unapplied}/server/0438-Remove-streams-from-classes-related-villager-gossip.patch (100%) rename patches/{ => unapplied}/server/0439-Support-components-in-ItemMeta.patch (100%) rename patches/{ => unapplied}/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0441-Add-entity-liquid-API.patch (100%) rename patches/{ => unapplied}/server/0442-Update-itemstack-legacy-name-and-lore.patch (100%) rename patches/{ => unapplied}/server/0443-Spawn-player-in-correct-world-on-login.patch (100%) rename patches/{ => unapplied}/server/0444-Add-PrepareResultEvent.patch (100%) rename patches/{ => unapplied}/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch (100%) rename patches/{ => unapplied}/server/0446-Optimize-NetworkManager-Exception-Handling.patch (100%) rename patches/{ => unapplied}/server/0447-Fix-arrows-never-despawning-MC-125757.patch (100%) rename patches/{ => unapplied}/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch (100%) rename patches/{ => unapplied}/server/0449-Fix-SPIGOT-5989.patch (100%) rename patches/{ => unapplied}/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch (100%) rename patches/{ => unapplied}/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch (100%) rename patches/{ => unapplied}/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch (100%) rename patches/{ => unapplied}/server/0453-Fix-some-rails-connecting-improperly.patch (100%) rename patches/{ => unapplied}/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch (100%) rename patches/{ => unapplied}/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch (100%) rename patches/{ => unapplied}/server/0456-Brand-support.patch (100%) rename patches/{ => unapplied}/server/0457-Add-setMaxPlayers-API.patch (100%) rename patches/{ => unapplied}/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch (100%) rename patches/{ => unapplied}/server/0459-Don-t-require-FACING-data.patch (100%) rename patches/{ => unapplied}/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch (100%) rename patches/{ => unapplied}/server/0461-Add-moon-phase-API.patch (100%) rename patches/{ => unapplied}/server/0462-Prevent-headless-pistons-from-being-created.patch (100%) rename patches/{ => unapplied}/server/0463-Add-BellRingEvent.patch (100%) rename patches/{ => unapplied}/server/0464-Add-zombie-targets-turtle-egg-config.patch (100%) rename patches/{ => unapplied}/server/0465-Buffer-joins-to-world.patch (100%) rename patches/{ => unapplied}/server/0466-Eigencraft-redstone-implementation.patch (100%) rename patches/{ => unapplied}/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch (100%) rename patches/{ => unapplied}/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch (100%) rename patches/{ => unapplied}/server/0469-Fix-CraftTeam-null-check.patch (100%) rename patches/{ => unapplied}/server/0470-Add-more-Evoker-API.patch (100%) rename patches/{ => unapplied}/server/0471-Add-methods-to-get-translation-keys.patch (100%) rename patches/{ => unapplied}/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch (100%) rename patches/{ => unapplied}/server/0473-Cache-block-data-strings.patch (100%) rename patches/{ => unapplied}/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch (100%) rename patches/{ => unapplied}/server/0475-Add-additional-open-container-api-to-HumanEntity.patch (100%) rename patches/{ => unapplied}/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch (100%) rename patches/{ => unapplied}/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch (100%) rename patches/{ => unapplied}/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch (100%) rename patches/{ => unapplied}/server/0479-Lazily-track-plugin-scoreboards-by-default.patch (100%) rename patches/{ => unapplied}/server/0480-Entity-isTicking.patch (100%) rename patches/{ => unapplied}/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch (100%) rename patches/{ => unapplied}/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch (100%) rename patches/{ => unapplied}/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch (100%) rename patches/{ => unapplied}/server/0484-Fix-for-large-move-vectors-crashing-server.patch (100%) rename patches/{ => unapplied}/server/0485-Optimise-getType-calls.patch (100%) rename patches/{ => unapplied}/server/0486-Villager-resetOffers.patch (100%) rename patches/{ => unapplied}/server/0487-Retain-block-place-order-when-capturing-blockstates.patch (100%) rename patches/{ => unapplied}/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch (100%) rename patches/{ => unapplied}/server/0489-Fix-item-locations-dropped-from-campfires.patch (100%) rename patches/{ => unapplied}/server/0490-Player-elytra-boost-API.patch (100%) rename patches/{ => unapplied}/server/0491-Fixed-TileEntityBell-memory-leak.patch (100%) rename patches/{ => unapplied}/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch (100%) rename patches/{ => unapplied}/server/0493-Add-getOfflinePlayerIfCached-String.patch (100%) rename patches/{ => unapplied}/server/0494-Add-ignore-discounts-API.patch (100%) rename patches/{ => unapplied}/server/0495-Toggle-for-removing-existing-dragon.patch (100%) rename patches/{ => unapplied}/server/0496-Fix-client-lag-on-advancement-loading.patch (100%) rename patches/{ => unapplied}/server/0497-Item-no-age-no-player-pickup.patch (100%) rename patches/{ => unapplied}/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch (100%) rename patches/{ => unapplied}/server/0499-Beacon-API-custom-effect-ranges.patch (100%) rename patches/{ => unapplied}/server/0500-Add-API-for-quit-reason.patch (100%) rename patches/{ => unapplied}/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch (100%) rename patches/{ => unapplied}/server/0502-Expose-world-spawn-angle.patch (100%) rename patches/{ => unapplied}/server/0503-Add-Destroy-Speed-API.patch (100%) rename patches/{ => unapplied}/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch (100%) rename patches/{ => unapplied}/server/0505-Add-LivingEntity-clearActiveItem.patch (100%) rename patches/{ => unapplied}/server/0506-Add-PlayerItemCooldownEvent.patch (100%) rename patches/{ => unapplied}/server/0507-Significantly-improve-performance-of-the-end-generat.patch (100%) rename patches/{ => unapplied}/server/0508-More-lightning-API.patch (100%) rename patches/{ => unapplied}/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch (100%) rename patches/{ => unapplied}/server/0510-Added-missing-default-perms-for-commands.patch (100%) rename patches/{ => unapplied}/server/0511-Add-PlayerShearBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0512-Fix-curing-zombie-villager-discount-exploit.patch (100%) rename patches/{ => unapplied}/server/0513-Limit-recipe-packets.patch (100%) rename patches/{ => unapplied}/server/0514-Fix-CraftSound-backwards-compatibility.patch (100%) rename patches/{ => unapplied}/server/0515-Player-Chunk-Load-Unload-Events.patch (100%) rename patches/{ => unapplied}/server/0516-Optimize-Dynamic-get-Missing-Keys.patch (100%) rename patches/{ => unapplied}/server/0517-Expose-LivingEntity-hurt-direction.patch (100%) rename patches/{ => unapplied}/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch (100%) rename patches/{ => unapplied}/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch (100%) rename patches/{ => unapplied}/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch (100%) rename patches/{ => unapplied}/server/0521-Implement-TargetHitEvent.patch (100%) rename patches/{ => unapplied}/server/0522-MC-4-Fix-item-position-desync.patch (100%) rename patches/{ => unapplied}/server/0523-Additional-Block-Material-API-s.patch (100%) rename patches/{ => unapplied}/server/0524-Fix-harming-potion-dupe.patch (100%) rename patches/{ => unapplied}/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch (100%) rename patches/{ => unapplied}/server/0526-Cache-burn-durations.patch (100%) rename patches/{ => unapplied}/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch (100%) rename patches/{ => unapplied}/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch (100%) rename patches/{ => unapplied}/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch (100%) rename patches/{ => unapplied}/server/0530-Fix-interact-event-not-being-called-in-adventure.patch (100%) rename patches/{ => unapplied}/server/0531-Zombie-API-breaking-doors.patch (100%) rename patches/{ => unapplied}/server/0532-Fix-nerfed-slime-when-splitting.patch (100%) rename patches/{ => unapplied}/server/0533-Add-EntityLoadCrossbowEvent.patch (100%) rename patches/{ => unapplied}/server/0534-Added-WorldGameRuleChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0535-Added-ServerResourcesReloadedEvent.patch (100%) rename patches/{ => unapplied}/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch (100%) rename patches/{ => unapplied}/server/0537-Implemented-BlockFailedDispenseEvent.patch (100%) rename patches/{ => unapplied}/server/0538-Added-PlayerLecternPageChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0539-Added-PlayerLoomPatternSelectEvent.patch (100%) rename patches/{ => unapplied}/server/0540-Configurable-door-breaking-difficulty.patch (100%) rename patches/{ => unapplied}/server/0541-Empty-commands-shall-not-be-dispatched.patch (100%) rename patches/{ => unapplied}/server/0542-Implement-API-to-expose-exact-interaction-point.patch (100%) rename patches/{ => unapplied}/server/0543-Remove-stale-POIs.patch (100%) rename patches/{ => unapplied}/server/0544-Fix-villager-boat-exploit.patch (100%) rename patches/{ => unapplied}/server/0545-Add-sendOpLevel-API.patch (100%) rename patches/{ => unapplied}/server/0546-TODO-Registry-Modification-API.patch (100%) rename patches/{ => unapplied}/server/0547-Add-StructuresLocateEvent.patch (100%) rename patches/{ => unapplied}/server/0548-Collision-option-for-requiring-a-player-participant.patch (100%) rename patches/{ => unapplied}/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch (100%) rename patches/{ => unapplied}/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch (100%) rename patches/{ => unapplied}/server/0551-Make-schedule-command-per-world.patch (100%) rename patches/{ => unapplied}/server/0552-Configurable-max-leash-distance.patch (100%) rename patches/{ => unapplied}/server/0553-Implement-BlockPreDispenseEvent.patch (100%) rename patches/{ => unapplied}/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch (100%) rename patches/{ => unapplied}/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch (100%) rename patches/{ => unapplied}/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch (100%) rename patches/{ => unapplied}/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch (100%) rename patches/{ => unapplied}/server/0558-Reset-shield-blocking-on-dimension-change.patch (100%) rename patches/{ => unapplied}/server/0559-add-DragonEggFormEvent.patch (100%) rename patches/{ => unapplied}/server/0560-EntityMoveEvent.patch (100%) rename patches/{ => unapplied}/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch (100%) rename patches/{ => unapplied}/server/0562-Inline-shift-direction-fields.patch (100%) rename patches/{ => unapplied}/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch (100%) rename patches/{ => unapplied}/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch (100%) rename patches/{ => unapplied}/server/0565-living-entity-allow-attribute-registration.patch (100%) rename patches/{ => unapplied}/server/0566-fix-dead-slime-setSize-invincibility.patch (100%) rename patches/{ => unapplied}/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch (100%) rename patches/{ => unapplied}/server/0568-Add-support-for-hex-color-codes-in-console.patch (100%) rename patches/{ => unapplied}/server/0569-Expose-Tracked-Players.patch (100%) rename patches/{ => unapplied}/server/0570-Remove-streams-from-SensorNearest.patch (100%) rename patches/{ => unapplied}/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch (100%) rename patches/{ => unapplied}/server/0572-Improve-ServerGUI.patch (100%) rename patches/{ => unapplied}/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch (100%) rename patches/{ => unapplied}/server/0574-fix-converting-txt-to-json-file.patch (100%) rename patches/{ => unapplied}/server/0575-Add-worldborder-events.patch (100%) rename patches/{ => unapplied}/server/0576-added-PlayerNameEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0577-Prevent-grindstones-from-overstacking-items.patch (100%) rename patches/{ => unapplied}/server/0578-Add-recipe-to-cook-events.patch (100%) rename patches/{ => unapplied}/server/0579-Add-Block-isValidTool.patch (100%) rename patches/{ => unapplied}/server/0580-Allow-using-signs-inside-spawn-protection.patch (100%) rename patches/{ => unapplied}/server/0581-Expand-world-key-API.patch (100%) rename patches/{ => unapplied}/server/0582-Add-fast-alternative-constructor-for-Rotations.patch (100%) rename patches/{ => unapplied}/server/0583-Item-Rarity-API.patch (100%) rename patches/{ => unapplied}/server/0584-copy-TESign-isEditable-from-snapshots.patch (100%) rename patches/{ => unapplied}/server/0585-Drop-carried-item-when-player-has-disconnected.patch (100%) rename patches/{ => unapplied}/server/0586-forced-whitelist-use-configurable-kick-message.patch (100%) rename patches/{ => unapplied}/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch (100%) rename patches/{ => unapplied}/server/0588-Entity-load-save-limit-per-chunk.patch (100%) rename patches/{ => unapplied}/server/0589-Expose-protocol-version.patch (100%) rename patches/{ => unapplied}/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch (100%) rename patches/{ => unapplied}/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch (100%) rename patches/{ => unapplied}/server/0592-Add-bypass-host-check.patch (100%) rename patches/{ => unapplied}/server/0593-Set-area-affect-cloud-rotation.patch (100%) rename patches/{ => unapplied}/server/0594-add-isDeeplySleeping-to-HumanEntity.patch (100%) rename patches/{ => unapplied}/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch (100%) rename patches/{ => unapplied}/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch (100%) rename patches/{ => unapplied}/server/0597-fix-PigZombieAngerEvent-cancellation.patch (100%) rename patches/{ => unapplied}/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch (100%) rename patches/{ => unapplied}/server/0599-Added-PlayerDeepSleepEvent.patch (100%) rename patches/{ => unapplied}/server/0600-More-World-API.patch (100%) rename patches/{ => unapplied}/server/0601-Added-PlayerBedFailEnterEvent.patch (100%) rename patches/{ => unapplied}/server/0602-Implement-methods-to-convert-between-Component-and-B.patch (100%) rename patches/{ => unapplied}/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch (100%) rename patches/{ => unapplied}/server/0604-Introduce-beacon-activation-deactivation-events.patch (100%) rename patches/{ => unapplied}/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch (100%) rename patches/{ => unapplied}/server/0606-Add-Channel-initialization-listeners.patch (100%) rename patches/{ => unapplied}/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch (100%) rename patches/{ => unapplied}/server/0608-Add-more-WanderingTrader-API.patch (100%) rename patches/{ => unapplied}/server/0609-Add-EntityBlockStorage-clearEntities.patch (100%) rename patches/{ => unapplied}/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch (100%) rename patches/{ => unapplied}/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch (100%) rename patches/{ => unapplied}/server/0612-Inventory-close.patch (100%) rename patches/{ => unapplied}/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch (100%) rename patches/{ => unapplied}/server/0614-Fix-CraftPotionBrewer-cache.patch (100%) rename patches/{ => unapplied}/server/0615-Add-basic-Datapack-API.patch (100%) rename patches/{ => unapplied}/server/0616-Add-environment-variable-to-disable-server-gui.patch (100%) rename patches/{ => unapplied}/server/0617-additions-to-PlayerGameModeChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0618-ItemStack-repair-check-API.patch (100%) rename patches/{ => unapplied}/server/0619-More-Enchantment-API.patch (100%) rename patches/{ => unapplied}/server/0620-Move-range-check-for-block-placing-up.patch (100%) rename patches/{ => unapplied}/server/0621-Fix-and-optimise-world-force-upgrading.patch (100%) rename patches/{ => unapplied}/server/0622-Add-Mob-lookAt-API.patch (100%) rename patches/{ => unapplied}/server/0623-Add-Unix-domain-socket-support.patch (100%) rename patches/{ => unapplied}/server/0624-Add-EntityInsideBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0625-Attributes-API-for-item-defaults.patch (100%) rename patches/{ => unapplied}/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch (100%) rename patches/{ => unapplied}/server/0627-More-Lidded-Block-API.patch (100%) rename patches/{ => unapplied}/server/0628-Limit-item-frame-cursors-on-maps.patch (100%) rename patches/{ => unapplied}/server/0629-Add-PlayerKickEvent-causes.patch (100%) rename patches/{ => unapplied}/server/0630-Add-PufferFishStateChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch (100%) rename patches/{ => unapplied}/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch (100%) rename patches/{ => unapplied}/server/0633-Add-option-to-fix-items-merging-through-walls.patch (100%) rename patches/{ => unapplied}/server/0634-Add-BellRevealRaiderEvent.patch (100%) rename patches/{ => unapplied}/server/0635-Fix-invulnerable-end-crystals.patch (100%) rename patches/{ => unapplied}/server/0636-Add-ElderGuardianAppearanceEvent.patch (100%) rename patches/{ => unapplied}/server/0637-Fix-dangerous-end-portal-logic.patch (100%) rename patches/{ => unapplied}/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch (100%) rename patches/{ => unapplied}/server/0639-Make-item-validations-configurable.patch (100%) rename patches/{ => unapplied}/server/0640-Line-Of-Sight-Changes.patch (100%) rename patches/{ => unapplied}/server/0641-add-per-world-spawn-limits.patch (100%) rename patches/{ => unapplied}/server/0642-Fix-potions-splash-events.patch (100%) rename patches/{ => unapplied}/server/0643-Add-more-LimitedRegion-API.patch (100%) rename patches/{ => unapplied}/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch (100%) rename patches/{ => unapplied}/server/0645-Missing-Entity-Behavior-API.patch (100%) rename patches/{ => unapplied}/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch (100%) rename patches/{ => unapplied}/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch (100%) rename patches/{ => unapplied}/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch (100%) rename patches/{ => unapplied}/server/0649-Fix-commands-from-signs-not-firing-command-events.patch (100%) rename patches/{ => unapplied}/server/0650-Adds-PlayerArmSwingEvent.patch (100%) rename patches/{ => unapplied}/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch (100%) rename patches/{ => unapplied}/server/0652-Add-config-for-mobs-immune-to-default-effects.patch (100%) rename patches/{ => unapplied}/server/0653-Fix-incorrect-message-for-outdated-client.patch (100%) rename patches/{ => unapplied}/server/0654-Don-t-apply-cramming-damage-to-players.patch (100%) rename patches/{ => unapplied}/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch (100%) rename patches/{ => unapplied}/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch (100%) rename patches/{ => unapplied}/server/0657-Stinger-API.patch (100%) rename patches/{ => unapplied}/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch (100%) rename patches/{ => unapplied}/server/0659-Add-System.out-err-catcher.patch (100%) rename patches/{ => unapplied}/server/0660-Fix-test-not-bootstrapping.patch (100%) rename patches/{ => unapplied}/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch (100%) rename patches/{ => unapplied}/server/0662-Improve-boat-collision-performance.patch (100%) rename patches/{ => unapplied}/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch (100%) rename patches/{ => unapplied}/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch (100%) rename patches/{ => unapplied}/server/0665-Add-PlayerSetSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch (100%) rename patches/{ => unapplied}/server/0667-Optimize-entity-tracker-passenger-checks.patch (100%) rename patches/{ => unapplied}/server/0668-Config-option-for-Piglins-guarding-chests.patch (100%) rename patches/{ => unapplied}/server/0669-Added-EntityDamageItemEvent.patch (100%) rename patches/{ => unapplied}/server/0670-Optimize-indirect-passenger-iteration.patch (100%) rename patches/{ => unapplied}/server/0671-Configurable-item-frame-map-cursor-update-interval.patch (100%) rename patches/{ => unapplied}/server/0672-Make-EntityUnleashEvent-cancellable.patch (100%) rename patches/{ => unapplied}/server/0673-Clear-bucket-NBT-after-dispense.patch (100%) rename patches/{ => unapplied}/server/0674-Change-EnderEye-target-without-changing-other-things.patch (100%) rename patches/{ => unapplied}/server/0675-Add-BlockBreakBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch (100%) rename patches/{ => unapplied}/server/0677-More-CommandBlock-API.patch (100%) rename patches/{ => unapplied}/server/0678-Add-missing-team-sidebar-display-slots.patch (100%) rename patches/{ => unapplied}/server/0679-Add-back-EntityPortalExitEvent.patch (100%) rename patches/{ => unapplied}/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch (100%) rename patches/{ => unapplied}/server/0681-Get-entity-default-attributes.patch (100%) rename patches/{ => unapplied}/server/0682-Left-handed-API.patch (100%) rename patches/{ => unapplied}/server/0683-Add-more-advancement-API.patch (100%) rename patches/{ => unapplied}/server/0684-Add-ItemFactory-getSpawnEgg-API.patch (100%) rename patches/{ => unapplied}/server/0685-Add-critical-damage-API.patch (100%) rename patches/{ => unapplied}/server/0686-Fix-issues-with-mob-conversion.patch (100%) rename patches/{ => unapplied}/server/0687-Add-isCollidable-methods-to-various-places.patch (100%) rename patches/{ => unapplied}/server/0688-Goat-ram-API.patch (100%) rename patches/{ => unapplied}/server/0689-Add-API-for-resetting-a-single-score.patch (100%) rename patches/{ => unapplied}/server/0690-Add-Raw-Byte-Entity-Serialization.patch (100%) rename patches/{ => unapplied}/server/0691-Vanilla-command-permission-fixes.patch (100%) rename patches/{ => unapplied}/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch (100%) rename patches/{ => unapplied}/server/0693-Fix-GameProfileCache-concurrency.patch (100%) rename patches/{ => unapplied}/server/0694-Improve-and-expand-AsyncCatcher.patch (100%) rename patches/{ => unapplied}/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch (100%) rename patches/{ => unapplied}/server/0696-Sanitize-ResourceLocation-error-logging.patch (100%) rename patches/{ => unapplied}/server/0697-Allow-controlled-flushing-for-network-manager.patch (100%) rename patches/{ => unapplied}/server/0698-Optimise-general-POI-access.patch (100%) rename patches/{ => unapplied}/server/0699-Optimise-chunk-tick-iteration.patch (100%) rename patches/{ => unapplied}/server/0700-Execute-chunk-tasks-mid-tick.patch (100%) rename patches/{ => unapplied}/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch (100%) rename patches/{ => unapplied}/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch (100%) rename patches/{ => unapplied}/server/0703-Detail-more-information-in-watchdog-dumps.patch (100%) rename patches/{ => unapplied}/server/0704-Manually-inline-methods-in-BlockPosition.patch (100%) rename patches/{ => unapplied}/server/0705-Distance-manager-tick-timings.patch (100%) rename patches/{ => unapplied}/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch (100%) rename patches/{ => unapplied}/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch (100%) rename patches/{ => unapplied}/server/0708-Add-packet-limiter-config.patch (100%) rename patches/{ => unapplied}/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch (100%) rename patches/{ => unapplied}/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch (100%) rename patches/{ => unapplied}/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch (100%) rename patches/{ => unapplied}/server/0712-Time-scoreboard-search.patch (100%) rename patches/{ => unapplied}/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch (100%) rename patches/{ => unapplied}/server/0714-Do-not-run-raytrace-logic-for-AIR.patch (100%) rename patches/{ => unapplied}/server/0715-Oprimise-map-impl-for-tracked-players.patch (100%) rename patches/{ => unapplied}/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch (100%) rename patches/{ => unapplied}/server/0717-Optimise-random-block-ticking.patch (100%) rename patches/{ => unapplied}/server/0718-Optimise-non-flush-packet-sending.patch (100%) rename patches/{ => unapplied}/server/0719-Optimise-nearby-player-lookups.patch (100%) rename patches/{ => unapplied}/server/0720-Remove-streams-for-villager-AI.patch (100%) rename patches/{ => unapplied}/server/0721-Use-Velocity-compression-and-cipher-natives.patch (100%) rename patches/{ => unapplied}/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch (100%) rename patches/{ => unapplied}/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch (100%) rename patches/{ => unapplied}/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch (100%) rename patches/{ => unapplied}/server/0725-Check-requirement-before-suggesting-root-nodes.patch (100%) rename patches/{ => unapplied}/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch (100%) rename patches/{ => unapplied}/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch (100%) rename patches/{ => unapplied}/server/0728-Ensure-valid-vehicle-status.patch (100%) rename patches/{ => unapplied}/server/0729-Prevent-softlocked-end-exit-portal-generation.patch (100%) rename patches/{ => unapplied}/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch (100%) rename patches/{ => unapplied}/server/0731-Don-t-log-debug-logging-being-disabled.patch (100%) rename patches/{ => unapplied}/server/0732-fix-various-menus-with-empty-level-accesses.patch (100%) rename patches/{ => unapplied}/server/0733-Preserve-overstacked-loot.patch (100%) rename patches/{ => unapplied}/server/0734-Update-head-rotation-in-missing-places.patch (100%) rename patches/{ => unapplied}/server/0735-prevent-unintended-light-block-manipulation.patch (100%) rename patches/{ => unapplied}/server/0736-Fix-CraftCriteria-defaults-map.patch (100%) rename patches/{ => unapplied}/server/0737-Fix-upstreams-block-state-factories.patch (100%) rename patches/{ => unapplied}/server/0738-Add-config-option-for-logging-player-ip-addresses.patch (100%) rename patches/{ => unapplied}/server/0739-Configurable-feature-seeds.patch (100%) rename patches/{ => unapplied}/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch (100%) rename patches/{ => unapplied}/server/0741-Add-root-admin-user-detection.patch (100%) rename patches/{ => unapplied}/server/0742-Always-allow-item-changing-in-Fireball.patch (100%) rename patches/{ => unapplied}/server/0743-don-t-attempt-to-teleport-dead-entities.patch (100%) rename patches/{ => unapplied}/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch (100%) rename patches/{ => unapplied}/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch (100%) rename patches/{ => unapplied}/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch (100%) rename patches/{ => unapplied}/server/0747-Fix-removing-recipes-from-RecipeIterator.patch (100%) rename patches/{ => unapplied}/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch (100%) rename patches/{ => unapplied}/server/0749-Hide-unnecessary-itemmeta-from-clients.patch (100%) rename patches/{ => unapplied}/server/0750-Fix-Spigot-growth-modifiers.patch (100%) rename patches/{ => unapplied}/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch (100%) rename patches/{ => unapplied}/server/0752-Add-PlayerItemFrameChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0753-Add-player-health-update-API.patch (100%) rename patches/{ => unapplied}/server/0754-Optimize-HashMapPalette.patch (100%) rename patches/{ => unapplied}/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch (100%) rename patches/{ => unapplied}/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch (100%) rename patches/{ => unapplied}/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch (100%) rename patches/{ => unapplied}/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch (100%) rename patches/{ => unapplied}/server/0759-Add-more-Campfire-API.patch (100%) rename patches/{ => unapplied}/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch (100%) rename patches/{ => unapplied}/server/0761-Fix-tripwire-state-inconsistency.patch (100%) rename patches/{ => unapplied}/server/0762-Forward-CraftEntity-in-teleport-command.patch (100%) rename patches/{ => unapplied}/server/0763-Improve-scoreboard-entries.patch (100%) rename patches/{ => unapplied}/server/0764-Entity-powdered-snow-API.patch (100%) rename patches/{ => unapplied}/server/0765-Add-API-for-item-entity-health.patch (100%) rename patches/{ => unapplied}/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch (100%) rename patches/{ => unapplied}/server/0767-Configurable-max-block-light-for-monster-spawning.patch (100%) rename patches/{ => unapplied}/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch (100%) rename patches/{ => unapplied}/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch (100%) rename patches/{ => unapplied}/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch (100%) rename patches/{ => unapplied}/server/0771-Fix-bees-aging-inside-hives.patch (100%) rename patches/{ => unapplied}/server/0772-Bucketable-API.patch (100%) rename patches/{ => unapplied}/server/0773-Validate-usernames.patch (100%) rename patches/{ => unapplied}/server/0774-Make-water-animal-spawn-height-configurable.patch (100%) rename patches/{ => unapplied}/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch (100%) rename patches/{ => unapplied}/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch (100%) rename patches/{ => unapplied}/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch (100%) rename patches/{ => unapplied}/server/0778-Multiple-Entries-with-Scoreboards.patch (100%) rename patches/{ => unapplied}/server/0779-Reset-placed-block-on-exception.patch (100%) rename patches/{ => unapplied}/server/0780-Add-configurable-height-for-slime-spawn.patch (100%) rename patches/{ => unapplied}/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch (100%) rename patches/{ => unapplied}/server/0782-Fix-xp-reward-for-baby-zombies.patch (100%) rename patches/{ => unapplied}/server/0783-Kick-on-main-for-illegal-chat.patch (100%) rename patches/{ => unapplied}/server/0784-Multi-Block-Change-API-Implementation.patch (100%) rename patches/{ => unapplied}/server/0785-Fix-NotePlayEvent.patch (100%) rename patches/{ => unapplied}/server/0786-Freeze-Tick-Lock-API.patch (100%) rename patches/{ => unapplied}/server/0787-Dolphin-API.patch (100%) rename patches/{ => unapplied}/server/0788-More-PotionEffectType-API.patch (100%) rename patches/{ => unapplied}/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch (100%) rename patches/{ => unapplied}/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch (100%) rename patches/{ => unapplied}/server/0791-Add-missing-structure-set-seed-configs.patch (100%) rename patches/{ => unapplied}/server/0792-Implement-regenerateChunk.patch (100%) rename patches/{ => unapplied}/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch (100%) rename patches/{ => unapplied}/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch (100%) rename patches/{ => unapplied}/server/0795-Add-GameEvent-tags.patch (100%) rename patches/{ => unapplied}/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch (100%) rename patches/{ => unapplied}/server/0797-Furnace-RecipesUsed-API.patch (100%) rename patches/{ => unapplied}/server/0798-Configurable-sculk-sensor-listener-range.patch (100%) rename patches/{ => unapplied}/server/0799-Add-missing-block-data-mins-and-maxes.patch (100%) rename patches/{ => unapplied}/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch (100%) rename patches/{ => unapplied}/server/0801-Put-world-into-worldlist-before-initing-the-world.patch (100%) rename patches/{ => unapplied}/server/0802-Fix-Entity-Position-Desync.patch (100%) rename patches/{ => unapplied}/server/0803-Custom-Potion-Mixes.patch (100%) rename patches/{ => unapplied}/server/0804-Force-close-world-loading-screen.patch (100%) rename patches/{ => unapplied}/server/0805-Fix-falling-block-spawn-methods.patch (100%) rename patches/{ => unapplied}/server/0806-Expose-furnace-minecart-push-values.patch (100%) rename patches/{ => unapplied}/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch (100%) rename patches/{ => unapplied}/server/0808-More-Projectile-API.patch (100%) rename patches/{ => unapplied}/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch (100%) rename patches/{ => unapplied}/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch (100%) rename patches/{ => unapplied}/server/0811-Implement-getComputedBiome-API.patch (100%) rename patches/{ => unapplied}/server/0812-Make-some-itemstacks-nonnull.patch (100%) rename patches/{ => unapplied}/server/0813-Implement-enchantWithLevels-API.patch (100%) rename patches/{ => unapplied}/server/0814-Fix-saving-in-unloadWorld.patch (100%) rename patches/{ => unapplied}/server/0815-Buffer-OOB-setBlock-calls.patch (100%) rename patches/{ => unapplied}/server/0816-Add-TameableDeathMessageEvent.patch (100%) rename patches/{ => unapplied}/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch (100%) rename patches/{ => unapplied}/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch (100%) rename patches/{ => unapplied}/server/0820-Guard-against-invalid-entity-positions.patch (100%) rename patches/{ => unapplied}/server/0821-cache-resource-keys.patch (100%) rename patches/{ => unapplied}/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch (100%) rename patches/{ => unapplied}/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch (100%) rename patches/{ => unapplied}/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch (100%) rename patches/{ => unapplied}/server/0825-Prevent-tile-entity-copies-loading-chunks.patch (100%) rename patches/{ => unapplied}/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch (100%) rename patches/{ => unapplied}/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch (100%) rename patches/{ => unapplied}/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch (100%) rename patches/{ => unapplied}/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch (100%) rename patches/{ => unapplied}/server/0830-WorldCreator-keepSpawnLoaded.patch (100%) rename patches/{ => unapplied}/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch (100%) rename patches/{ => unapplied}/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch (100%) rename patches/{ => unapplied}/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch (100%) rename patches/{ => unapplied}/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch (100%) rename patches/{ => unapplied}/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch (100%) rename patches/{ => unapplied}/server/0836-Add-PlayerStopUsingItemEvent.patch (100%) rename patches/{ => unapplied}/server/0837-FallingBlock-auto-expire-setting.patch (100%) rename patches/{ => unapplied}/server/0838-Don-t-tick-markers.patch (100%) rename patches/{ => unapplied}/server/0839-Do-not-accept-invalid-client-settings.patch (100%) rename patches/{ => unapplied}/server/0840-Add-support-for-Proxy-Protocol.patch (100%) rename patches/{ => unapplied}/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch (100%) rename patches/{ => unapplied}/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch (100%) rename patches/{ => unapplied}/server/0843-Sanitize-Sent-BlockEntity-NBT.patch (100%) rename patches/{ => unapplied}/server/0844-Disable-component-selector-resolving-in-books-by-def.patch (100%) rename patches/{ => unapplied}/server/0845-Prevent-entity-loading-causing-async-lookups.patch (100%) rename patches/{ => unapplied}/server/0846-Throw-exception-on-world-create-while-being-ticked.patch (100%) rename patches/{ => unapplied}/server/0847-Add-Alternate-Current-redstone-implementation.patch (100%) rename patches/{ => unapplied}/server/0848-Dont-resent-entity-on-art-update.patch (100%) rename patches/{ => unapplied}/server/0849-Add-WardenAngerChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0850-Add-option-for-strict-advancement-dimension-checks.patch (100%) rename patches/{ => unapplied}/server/0851-Add-missing-important-BlockStateListPopulator-method.patch (100%) rename patches/{ => unapplied}/server/0852-Nameable-Banner-API.patch (100%) rename patches/{ => unapplied}/server/0853-Don-t-broadcast-messages-to-command-blocks.patch (100%) rename patches/{ => unapplied}/server/0854-Prevent-empty-items-from-being-added-to-world.patch (100%) rename patches/{ => unapplied}/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch (100%) rename patches/{ => unapplied}/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch (100%) rename patches/{ => unapplied}/server/0857-Add-Player-getFishHook.patch (100%) rename patches/{ => unapplied}/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch (100%) rename patches/{ => unapplied}/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch (100%) rename patches/{ => unapplied}/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch (100%) rename patches/{ => unapplied}/server/0861-Fix-Bee-flower-NPE.patch (100%) rename patches/{ => unapplied}/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch (100%) rename patches/{ => unapplied}/server/0863-More-Teleport-API.patch (100%) rename patches/{ => unapplied}/server/0864-Add-EntityPortalReadyEvent.patch (100%) rename patches/{ => unapplied}/server/0865-Don-t-use-level-random-in-entity-constructors.patch (100%) rename patches/{ => unapplied}/server/0866-Send-block-entities-after-destroy-prediction.patch (100%) rename patches/{ => unapplied}/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch (100%) rename patches/{ => unapplied}/server/0868-Custom-Chat-Completion-Suggestions-API.patch (100%) rename patches/{ => unapplied}/server/0869-Add-missing-BlockFadeEvents.patch (100%) rename patches/{ => unapplied}/server/0870-Collision-API.patch (100%) rename patches/{ => unapplied}/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch (100%) rename patches/{ => unapplied}/server/0872-Remove-invalid-signature-login-stacktrace.patch (100%) rename patches/{ => unapplied}/server/0873-Block-Ticking-API.patch (100%) rename patches/{ => unapplied}/server/0874-Add-Velocity-IP-Forwarding-Support.patch (100%) rename patches/{ => unapplied}/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch (100%) rename patches/{ => unapplied}/server/0876-Add-NamespacedKey-biome-methods.patch (100%) rename patches/{ => unapplied}/server/0877-Fix-plugin-loggers-on-server-shutdown.patch (100%) rename patches/{ => unapplied}/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch (100%) rename patches/{ => unapplied}/server/0879-Stop-large-look-changes-from-crashing-the-server.patch (100%) rename patches/{ => unapplied}/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch (100%) rename patches/{ => unapplied}/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch (100%) rename patches/{ => unapplied}/server/0882-Missing-eating-regain-reason.patch (100%) rename patches/{ => unapplied}/server/0883-Missing-effect-cause.patch (100%) rename patches/{ => unapplied}/server/0884-Added-byte-array-serialization-deserialization-for-P.patch (100%) rename patches/{ => unapplied}/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch (100%) rename patches/{ => unapplied}/server/0886-Call-BlockPhysicsEvent-more-often.patch (100%) rename patches/{ => unapplied}/server/0887-Configurable-chat-thread-limit.patch (100%) rename patches/{ => unapplied}/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch (100%) rename patches/{ => unapplied}/server/0889-Set-position-before-player-sending-on-dimension-chan.patch (100%) rename patches/{ => unapplied}/server/0890-fix-Jigsaw-block-kicking-user.patch (100%) rename patches/{ => unapplied}/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch (100%) rename patches/{ => unapplied}/server/0892-Add-getDrops-to-BlockState.patch (100%) rename patches/{ => unapplied}/server/0893-Fix-a-bunch-of-vanilla-bugs.patch (100%) rename patches/{ => unapplied}/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch (100%) rename patches/{ => unapplied}/server/0895-Fix-custom-piglin-loved-items.patch (100%) rename patches/{ => unapplied}/server/0896-EntityPickupItemEvent-fixes.patch (100%) rename patches/{ => unapplied}/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch (100%) rename patches/{ => unapplied}/server/0898-Add-PlayerInventorySlotChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0899-Elder-Guardian-appearance-API.patch (100%) rename patches/{ => unapplied}/server/0900-Allow-changing-bed-s-occupied-property.patch (100%) rename patches/{ => unapplied}/server/0901-Add-entity-knockback-API.patch (100%) rename patches/{ => unapplied}/server/0902-Detect-headless-JREs.patch (100%) rename patches/{ => unapplied}/server/0903-fixed-entity-vehicle-collision-event-not-called.patch (100%) rename patches/{ => unapplied}/server/0904-optimized-dirt-and-snow-spreading.patch (100%) rename patches/{ => unapplied}/server/0905-Added-EntityToggleSitEvent.patch (100%) rename patches/{ => unapplied}/server/0906-Add-fire-tick-delay-option.patch (100%) rename patches/{ => unapplied}/server/0907-Add-Moving-Piston-API.patch (100%) rename patches/{ => unapplied}/server/0908-Ignore-impossible-spawn-tick.patch (100%) rename patches/{ => unapplied}/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch (100%) rename patches/{ => unapplied}/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch (100%) rename patches/{ => unapplied}/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch (100%) rename patches/{ => unapplied}/server/0912-Prevent-compass-from-loading-chunks.patch (100%) rename patches/{ => unapplied}/server/0913-Add-PrePlayerAttackEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0914-ensure-reset-EnderDragon-boss-event-name.patch (100%) rename patches/{ => unapplied}/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch (100%) rename patches/{ => unapplied}/server/0916-Add-Player-Warden-Warning-API.patch (100%) rename patches/{ => unapplied}/server/0917-More-vanilla-friendly-methods-to-update-trades.patch (100%) rename patches/{ => unapplied}/server/0918-Add-paper-dumplisteners-command.patch (100%) rename patches/{ => unapplied}/server/0919-check-global-player-list-where-appropriate.patch (100%) rename patches/{ => unapplied}/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch (100%) rename patches/{ => unapplied}/server/0921-ItemStack-damage-API.patch (100%) rename patches/{ => unapplied}/server/0922-Friction-API.patch (100%) rename patches/{ => unapplied}/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch (100%) rename patches/{ => unapplied}/server/0924-Fix-player-kick-on-shutdown.patch (100%) rename patches/{ => unapplied}/server/0925-Sync-offhand-slot-in-menus.patch (100%) rename patches/{ => unapplied}/server/0926-Player-Entity-Tracking-Events.patch (100%) rename patches/{ => unapplied}/server/0927-Limit-pet-look-distance.patch (100%) rename patches/{ => unapplied}/server/0928-Properly-resend-entities.patch (100%) rename patches/{ => unapplied}/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch (100%) rename patches/{ => unapplied}/server/0930-fix-Instruments.patch (100%) rename patches/{ => unapplied}/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch (100%) rename patches/{ => unapplied}/server/0932-Fix-MapLike-Codec-missing-key-selector.patch (100%) rename patches/{ => unapplied}/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch (100%) rename patches/{ => unapplied}/server/0934-Improve-logging-and-errors.patch (100%) rename patches/{ => unapplied}/server/0935-Add-BlockLockCheckEvent.patch (100%) rename patches/{ => unapplied}/server/0936-Add-Sneaking-API-for-Entities.patch (100%) rename patches/{ => unapplied}/server/0937-Improve-PortalEvents.patch (100%) rename patches/{ => unapplied}/server/0938-Add-config-option-for-spider-worldborder-climbing.patch (100%) rename patches/{ => unapplied}/server/0939-Add-missing-SpigotConfig-logCommands-check.patch (100%) rename patches/{ => unapplied}/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch (100%) rename patches/{ => unapplied}/server/0941-Flying-Fall-Damage.patch (100%) rename patches/{ => unapplied}/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch (100%) rename patches/{ => unapplied}/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch (100%) rename patches/{ => unapplied}/server/0944-config-for-disabling-entity-tag-tags.patch (100%) rename patches/{ => unapplied}/server/0945-Use-single-player-info-update-packet-on-join.patch (100%) rename patches/{ => unapplied}/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch (100%) rename patches/{ => unapplied}/server/0947-Win-Screen-API.patch (100%) rename patches/{ => unapplied}/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch (100%) rename patches/{ => unapplied}/server/0949-Fix-force-opening-enchantment-tables.patch (100%) rename patches/{ => unapplied}/server/0950-Add-Entity-Body-Yaw-API.patch (100%) rename patches/{ => unapplied}/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch (100%) rename patches/{ => unapplied}/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch (100%) rename patches/{ => unapplied}/server/0953-Add-EntityFertilizeEggEvent.patch (100%) rename patches/{ => unapplied}/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch (100%) rename patches/{ => unapplied}/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch (100%) rename patches/{ => unapplied}/server/0956-Correctly-handle-ArmorStand-invisibility.patch (100%) rename patches/{ => unapplied}/server/0957-Fix-advancement-triggers-for-entity-damage.patch (100%) rename patches/{ => unapplied}/server/0958-Fix-text-display-error-on-spawn.patch (100%) rename patches/{ => unapplied}/server/0959-Fix-certain-inventories-returning-null-Locations.patch (100%) rename patches/{ => unapplied}/server/0960-Add-Shearable-API.patch (100%) rename patches/{ => unapplied}/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch (100%) rename patches/{ => unapplied}/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch (100%) rename patches/{ => unapplied}/server/0963-Optimize-Hoppers.patch (100%) rename patches/{ => unapplied}/server/0964-Fix-beehives-generating-from-using-bonemeal.patch (100%) rename patches/{ => unapplied}/server/0965-Fix-api-checking-banned-ips.patch (100%) rename patches/{ => unapplied}/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch (100%) rename patches/{ => unapplied}/server/0967-Treat-sequence-violations-like-they-should-be.patch (100%) rename patches/{ => unapplied}/server/0968-remove-duplicate-animate-packet-for-records.patch (100%) rename patches/{ => unapplied}/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch (100%) rename patches/{ => unapplied}/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch (100%) rename patches/{ => unapplied}/server/0971-Use-array-for-gamerule-storage.patch (100%) rename patches/{ => unapplied}/server/0972-Fix-block-place-logic.patch (100%) rename patches/{ => unapplied}/server/0973-Fix-a-couple-of-upstream-bed-issues.patch (100%) rename patches/{ => unapplied}/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch (100%) rename patches/{ => unapplied}/server/0975-Disable-allowListing-before-received-from-client.patch (100%) rename patches/{ => unapplied}/server/0976-Add-Mob-Experience-reward-API.patch (100%) rename patches/{ => unapplied}/server/0977-Break-redstone-on-top-of-trap-doors-early.patch (100%) rename patches/{ => unapplied}/server/0978-Fix-DamageCause-for-Falling-Blocks.patch (100%) rename patches/{ => unapplied}/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch (100%) rename patches/{ => unapplied}/server/0980-More-accurate-isInOpenWater-impl.patch (100%) rename patches/{ => unapplied}/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch (100%) rename patches/{ => unapplied}/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch (100%) rename patches/{ => unapplied}/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch (100%) rename patches/{ => unapplied}/server/0984-Expand-PlayerItemMendEvent.patch (100%) rename patches/{ => unapplied}/server/0985-Refresh-ProjectileSource-for-projectiles.patch (100%) rename patches/{ => unapplied}/server/0986-Add-transient-modifier-API.patch (100%) diff --git a/README.md b/README.md index 72bb670b09..95d0d66253 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.19.4-R0.1-SNAPSHOT + 1.20-R0.1-SNAPSHOT provided ``` @@ -54,7 +54,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT") } java { diff --git a/build.gradle.kts b/build.gradle.kts index e0911816b7..d5566aac1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -61,7 +61,7 @@ repositories { } dependencies { - paramMappings("net.fabricmc:yarn:1.19.4+build.1:mergedv2") + paramMappings("net.fabricmc:yarn:1.20+build.1:mergedv2") remapper("net.fabricmc:tiny-remapper:0.8.6:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.6") @@ -133,7 +133,7 @@ allprojects { tasks.collectAtsFromPatches { // Uncomment while updating for a new Minecraft version - // extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) + extraPatchDir.set(layout.projectDirectory.dir("patches/unapplied/server")) } tasks.register("printMinecraftVersion") { diff --git a/gradle.properties b/gradle.properties index 080537633e..5fb6c52862 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ group=io.papermc.paper -version=1.19.4-R0.1-SNAPSHOT -mcVersion=1.19.4 +version=1.20-R0.1-SNAPSHOT +mcVersion=1.20 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch index 3596bd55af..8bd1e3da6d 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -27,10 +27,10 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943 +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d9bf41f10 +index 0000000000000000000000000000000000000000..8686d850f41753923e375bd8ed9fec45e6171e05 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,83 @@ +@@ -0,0 +1,85 @@ +plugins { + `java-library` + `maven-publish` @@ -41,6 +41,8 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d + withJavadocJar() +} + ++val annotationsVersion = "24.0.1" ++ +dependencies { + // api dependencies are listed transitively to API consumers + api("com.google.guava:guava:31.1-jre") @@ -49,11 +51,11 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d + api("org.yaml:snakeyaml:1.33") + api("org.joml:joml:1.10.5") + -+ compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") -+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") ++ compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") ++ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") ++ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + -+ val annotations = "org.jetbrains:annotations-java5:23.0.0" ++ val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" + compileOnly(annotations) + testCompileOnly(annotations) + @@ -98,7 +100,7 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d + options.links( + "https://guava.dev/releases/31.1-jre/api/docs/", + "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", -+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", ++ "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", + "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + ) + options.tags("apiNote:a:API Note:") @@ -116,7 +118,7 @@ index 0000000000000000000000000000000000000000..4b7f005519d8856fc35a94401636ae8d +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..0000000000000000000000000000000000000000 +index 2ac982a8bc43604298a0788bf03b5e6314f5ab9b..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,270 +0,0 @@ @@ -127,7 +129,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.19.4-R0.1-SNAPSHOT +- 1.20-R0.1-SNAPSHOT - jar - - Spigot-API @@ -184,33 +186,33 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000 - - org.yaml - snakeyaml -- 1.33 +- 2.0 - compile - - - - org.apache.maven - maven-resolver-provider -- 3.8.5 +- 3.9.2 - provided - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.3 +- 1.9.10 - provided - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.3 +- 1.9.10 - provided - - - - org.jetbrains - annotations-java5 -- 23.0.0 +- 24.0.1 - provided - - @@ -229,7 +231,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000 - - org.ow2.asm - asm-tree -- 9.4 +- 9.5 - test - - @@ -317,7 +319,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000 - - https://guava.dev/releases/31.1-jre/api/docs/ - https://javadoc.io/doc/org.yaml/snakeyaml/1.33/ -- https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/ +- https://javadoc.io/doc/org.jetbrains/annotations-java5/24.0.1/ - https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/ - - @@ -343,7 +345,7 @@ index e324c7b4a615d74c5c5c66ce539a28c21eab9f1e..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-checkstyle-plugin -- 3.2.1 +- 3.3.0 - - - process-classes diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch index f852024983..4c535298ff 100644 --- a/patches/api/0002-Build-system-changes.patch +++ b/patches/api/0002-Build-system-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index 4b7f005519d8856fc35a94401636ae8d9bf41f10..bb6e3afe8e8bc1a3b598b085286ffcdaf3574072 100644 +index 8686d850f41753923e375bd8ed9fec45e6171e05..d72a4e039e77a0dc9a2eacb6d2e07260c206c678 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -15,15 +15,27 @@ dependencies { +@@ -17,15 +17,27 @@ dependencies { api("net.md-5:bungeecord-chat:1.16-R0.4") api("org.yaml:snakeyaml:1.33") api("org.joml:joml:1.10.5") @@ -18,13 +18,13 @@ index 4b7f005519d8856fc35a94401636ae8d9bf41f10..bb6e3afe8e8bc1a3b598b085286ffcda + } + // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper -- val annotations = "org.jetbrains:annotations-java5:23.0.0" -+ val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations... +- val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" ++ val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... compileOnly(annotations) testCompileOnly(annotations) @@ -37,16 +37,16 @@ index 4b7f005519d8856fc35a94401636ae8d9bf41f10..bb6e3afe8e8bc1a3b598b085286ffcda testImplementation("org.apache.commons:commons-lang3:3.12.0") testImplementation("junit:junit:4.13.2") testImplementation("org.hamcrest:hamcrest-library:1.3") -@@ -65,7 +77,7 @@ tasks.withType { +@@ -67,7 +79,7 @@ tasks.withType { options.links( "https://guava.dev/releases/31.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", -- "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/", -+ "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations +- "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/", ++ "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", ) options.tags("apiNote:a:API Note:") -@@ -81,3 +93,14 @@ tasks.withType { +@@ -83,3 +95,14 @@ tasks.withType { } } } diff --git a/patches/api/0003-Test-changes.patch b/patches/api/0003-Test-changes.patch index 9c96414a6b..6a8879dfb7 100644 --- a/patches/api/0003-Test-changes.patch +++ b/patches/api/0003-Test-changes.patch @@ -12,10 +12,10 @@ Co-authored-by: Riley Park Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 82444d3b95881702910369ec5694dd9f327ad81a..c06eda648d8626c86afb2140d6a583ddf82f295c 100644 +index d72a4e039e77a0dc9a2eacb6d2e07260c206c678..cf022f431c1a9c5b40d6b71411df2dfab98cde13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -35,6 +35,7 @@ dependencies { +@@ -37,6 +37,7 @@ dependencies { compileOnlyApi(checkerQual) testCompileOnly(checkerQual) // Paper end diff --git a/patches/api/0004-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch index a3b6bc3d59..0d38b90e72 100644 --- a/patches/api/0004-Add-FastUtil-to-Bukkit.patch +++ b/patches/api/0004-Add-FastUtil-to-Bukkit.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/build.gradle.kts b/build.gradle.kts -index c06eda648d8626c86afb2140d6a583ddf82f295c..464a209dbf52ebdfa287a553778a37c382a5405c 100644 +index cf022f431c1a9c5b40d6b71411df2dfab98cde13..77078078c16671b65a604afe17eaf66042afcae2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -19,6 +19,7 @@ dependencies { +@@ -21,6 +21,7 @@ dependencies { api("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false // includes junit } + api("it.unimi.dsi:fastutil:8.5.6") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") diff --git a/patches/api/0005-Adventure.patch b/patches/api/0005-Adventure.patch index 82d43764d4..d018e951a6 100644 --- a/patches/api/0005-Adventure.patch +++ b/patches/api/0005-Adventure.patch @@ -7,10 +7,10 @@ Co-authored-by: zml Co-authored-by: Jake Potrebic diff --git a/build.gradle.kts b/build.gradle.kts -index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650feecd33f12 100644 +index 77078078c16671b65a604afe17eaf66042afcae2..a346f0d360bacf245a8905e3ff3c4f370960e051 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -8,11 +8,24 @@ java { +@@ -8,13 +8,26 @@ java { withJavadocJar() } @@ -27,6 +27,8 @@ index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650fe + extendsFrom(apiAndDocs) +} + + val annotationsVersion = "24.0.1" + dependencies { // api dependencies are listed transitively to API consumers api("com.google.guava:guava:31.1-jre") @@ -36,7 +38,7 @@ index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650fe api("org.yaml:snakeyaml:1.33") api("org.joml:joml:1.10.5") // Paper start -@@ -20,6 +33,13 @@ dependencies { +@@ -22,6 +35,13 @@ dependencies { isTransitive = false // includes junit } api("it.unimi.dsi:fastutil:8.5.6") @@ -49,11 +51,11 @@ index 5fccd83117c2c153951d102756acfd4862b8c51b..acf12dfbecb9360c0921f70ed31650fe + apiAndDocs("net.kyori:adventure-text-logger-slf4j") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -@@ -80,10 +100,25 @@ tasks.withType { + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") +@@ -82,10 +102,25 @@ tasks.withType { "https://guava.dev/releases/31.1-jre/api/docs/", "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/", - "https://javadoc.io/doc/org.jetbrains/annotations/23.0.0/", // Paper - we don't want Java 5 annotations + "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations - "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", + // Paper start + //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat @@ -1366,10 +1368,10 @@ index 6f97c680535fabf88509a49ec21704eb527b2add..b516021b6772d8266ed72b73170510ca throw new UnsupportedOperationException("Not supported yet."); } diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java -index 4dda5091739ece442a66d983670ad432b6042867..762b0d9ba22a1012ebe5ea77b6aef909fddc0403 100644 +index 4cbc963f268753316327e38b6e1e42cffb486b54..6e8d2b35d8f33827396dbcfa817cd9c2f8ad83a6 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java -@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; +@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; * guarantee values will not be removed from this Enum. As such, you should not * depend on the ordinal values of this class. */ @@ -1378,7 +1380,7 @@ index 4dda5091739ece442a66d983670ad432b6042867..762b0d9ba22a1012ebe5ea77b6aef909 AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"), AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"), -@@ -1640,4 +1640,11 @@ public enum Sound implements Keyed { +@@ -1498,4 +1498,11 @@ public enum Sound implements Keyed { public NamespacedKey getKey() { return key; } @@ -1530,10 +1532,10 @@ index 372c0bd5a4d7800a11c24c95e39fe376a96232bf..9c88be68b4f403d0500cb607394b3a16 + // Paper end } diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java -index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff9befad85 100644 +index 80f6b718dba4a48130449388f147b4f12510d9f9..abefc7a96528c52434bd7d4eef3be63c5e31e770 100644 --- a/src/main/java/org/bukkit/block/Sign.java +++ b/src/main/java/org/bukkit/block/Sign.java -@@ -11,6 +11,42 @@ import org.jetbrains.annotations.NotNull; +@@ -10,12 +10,50 @@ import org.jetbrains.annotations.NotNull; * Represents a captured state of either a SignPost or a WallSign. */ public interface Sign extends TileState, Colorable { @@ -1542,7 +1544,7 @@ index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff + * Gets all the lines of text currently on the {@link Side#FRONT} of this sign. + * + * @return List of components containing each line of text -+ * @see #getSide(Side) ++ * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}. + */ + @NotNull + public java.util.List lines(); @@ -1555,9 +1557,10 @@ index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff + * @param index Line number to get the text from, starting at 0 + * @throws IndexOutOfBoundsException Thrown when the line does not exist + * @return Text on the given line -+ * @see #getSide(Side) ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}. + */ + @NotNull ++ @Deprecated + public net.kyori.adventure.text.Component line(int index) throws IndexOutOfBoundsException; + + /** @@ -1569,49 +1572,46 @@ index 1844b7136ddcc1aa267b8fb2159244d04900da36..9a9f4af69fc8adbd0a05e2e7574f83ff + * @param index Line number to set the text at, starting from 0 + * @param line New text to set at the specified index + * @throws IndexOutOfBoundsException If the index is out of the range 0..3 -+ * @see #getSide(Side) ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}. + */ ++ @Deprecated + public void line(int index, net.kyori.adventure.text.@NotNull Component line) throws IndexOutOfBoundsException; + // Paper end /** * Gets all the lines of text currently on the {@link Side#FRONT} of this sign. -@@ -19,6 +55,7 @@ public interface Sign extends TileState, Colorable { - * @see #getSide(Side) + * + * @return Array of Strings containing each line of text +- * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#getLines()}. ++ * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}. */ + @Deprecated @NotNull -+ @Deprecated // Paper - public String[] getLines(); - - /** -@@ -30,8 +67,10 @@ public interface Sign extends TileState, Colorable { +@@ -29,7 +67,7 @@ public interface Sign extends TileState, Colorable { + * @param index Line number to get the text from, starting at 0 * @return Text on the given line * @throws IndexOutOfBoundsException Thrown when the line does not exist - * @see #getSide(Side) -+ * @deprecated in favour of {@link #line(int)} +- * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#getLine(int)}. ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}. */ + @Deprecated @NotNull -+ @Deprecated // Paper - public String getLine(int index) throws IndexOutOfBoundsException; - - /** -@@ -44,7 +83,9 @@ public interface Sign extends TileState, Colorable { +@@ -44,7 +82,7 @@ public interface Sign extends TileState, Colorable { + * @param index Line number to set the text at, starting from 0 * @param line New text to set at the specified index * @throws IndexOutOfBoundsException If the index is out of the range 0..3 - * @see #getSide(Side) -+ * @deprecated in favour of {@link #line(int, net.kyori.adventure.text.Component)} +- * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#setLine(int, String)}. ++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}. */ -+ @Deprecated // Paper + @Deprecated public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException; - - /** diff --git a/src/main/java/org/bukkit/block/sign/SignSide.java b/src/main/java/org/bukkit/block/sign/SignSide.java -index 85be6cfa9ed074073656cd0678600780eb03b47b..e6b9a1b0dbf7cdffafe4a9bb5dd1c3e8afb846e5 100644 +index 0f4ae7bd2ad379b5edb40f49f93de9e18c38f415..22bfe971920b526bd1bd52cb58d6acbf0a7ef5be 100644 --- a/src/main/java/org/bukkit/block/sign/SignSide.java +++ b/src/main/java/org/bukkit/block/sign/SignSide.java -@@ -9,6 +9,39 @@ import org.jetbrains.annotations.NotNull; +@@ -7,6 +7,39 @@ import org.jetbrains.annotations.NotNull; + * Represents a side of a sign. */ - @Experimental public interface SignSide extends Colorable { + // Paper start + /** @@ -2043,7 +2043,7 @@ index f3afe67f0832cb828d25be3654518ff73a80b0e1..598abaa82c634178043a29f6caa6ac52 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827cc5590e3b 100644 +index ee60f96ab70f5c650b05673ad193dd912f543dec..44be86a9315d45dcbaabbbfcf2c7451ea4967173 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -42,7 +42,28 @@ import org.jetbrains.annotations.Nullable; @@ -2221,7 +2221,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c /** * Says a message (or runs a command). * -@@ -609,6 +695,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -632,6 +718,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map items); @@ -2312,7 +2312,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c /** * Send a sign change. This fakes a sign change packet for a user at * a certain location. This will not actually change the world in any way. -@@ -623,7 +793,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -646,7 +816,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param lines the new text on the sign or null to clear it * @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if lines is non-null and has a length less than 4 @@ -2322,7 +2322,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; /** -@@ -642,7 +814,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -665,7 +837,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if dyeColor is null * @throws IllegalArgumentException if lines is non-null and has a length less than 4 @@ -2332,7 +2332,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; /** -@@ -662,7 +836,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -685,7 +859,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException if location is null * @throws IllegalArgumentException if dyeColor is null * @throws IllegalArgumentException if lines is non-null and has a length less than 4 @@ -2342,7 +2342,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException; /** -@@ -1156,6 +1332,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1179,6 +1355,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2350,7 +2350,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c * @param url The URL from which the client will download the resource * pack. The string must contain only US-ASCII characters and should * be encoded as per RFC 1738. -@@ -1212,8 +1389,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1235,8 +1412,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2361,7 +2361,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c /** * Request that the player's client download and switch resource packs. *

-@@ -1249,6 +1428,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1272,6 +1451,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param hash The sha1 hash sum of the resource pack file which is used * to apply a cached version of the pack directly without downloading * if it is available. Hast to be 20 bytes long! @@ -2416,7 +2416,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c * @param force If true, the client will be disconnected from the server * when it declines to use the resource pack. * @throws IllegalArgumentException Thrown if the URL is null. -@@ -1303,8 +1530,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1326,8 +1553,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2474,7 +2474,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c /** * Gets the Scoreboard displayed to this player * -@@ -1420,7 +1696,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1443,7 +1719,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param title Title text * @param subtitle Subtitle text @@ -2483,7 +2483,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c */ @Deprecated public void sendTitle(@Nullable String title, @Nullable String subtitle); -@@ -1439,7 +1715,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1462,7 +1738,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param fadeIn time in ticks for titles to fade in. Defaults to 10. * @param stay time in ticks for titles to stay. Defaults to 70. * @param fadeOut time in ticks for titles to fade out. Defaults to 20. @@ -2493,7 +2493,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut); /** -@@ -1666,6 +1944,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1689,6 +1967,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public int getClientViewDistance(); @@ -2508,7 +2508,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c /** * Gets the player's estimated ping in milliseconds. * -@@ -1691,8 +1977,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1714,8 +2000,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * they wish. * * @return the player's locale @@ -2519,7 +2519,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public String getLocale(); /** -@@ -1744,6 +2032,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1767,6 +2055,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public boolean isAllowingServerListings(); @@ -2534,7 +2534,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c // Spigot start public class Spigot extends Entity.Spigot { -@@ -1798,11 +2094,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1821,11 +2117,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM throw new UnsupportedOperationException("Not supported yet."); } @@ -2548,7 +2548,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c @Override public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); -@@ -1813,7 +2111,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1836,7 +2134,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param component the components to send @@ -2558,7 +2558,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1823,7 +2123,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1846,7 +2146,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param components the components to send @@ -2568,7 +2568,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1834,7 +2136,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1857,7 +2159,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param position the screen position * @param sender the sender of the message * @param component the components to send @@ -2578,7 +2578,7 @@ index 7fffb5cdac7a0fe9baeb7ef09a4615221dca8322..4190d5b3b3d3eb9525ed342179cb827c public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1845,7 +2149,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1868,7 +2172,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param position the screen position * @param sender the sender of the message * @param components the components to send diff --git a/patches/api/0007-Use-ASM-for-event-executors.patch b/patches/api/0007-Use-ASM-for-event-executors.patch index 378b866fb7..2c5a9ad94f 100644 --- a/patches/api/0007-Use-ASM-for-event-executors.patch +++ b/patches/api/0007-Use-ASM-for-event-executors.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index 23b1e7600d2507be60cb8543773b91f4851afb4f..d95b3d504ddc9ed76fc86cd45fa922d68e597827 100644 +index a346f0d360bacf245a8905e3ff3c4f370960e051..57e5d0bf373067138a53067563b82e9aa8e100c4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -40,6 +40,9 @@ dependencies { +@@ -42,6 +42,9 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") @@ -18,7 +18,7 @@ index 23b1e7600d2507be60cb8543773b91f4851afb4f..d95b3d504ddc9ed76fc86cd45fa922d6 + implementation("org.ow2.asm:asm-commons:9.4") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 index 0000000000000000000000000000000000000000..5b28e9b1daba7834af67dbc193dd656bedd9a994 diff --git a/patches/api/0008-Paper-Plugins.patch b/patches/api/0008-Paper-Plugins.patch index 42a3f68bc8..35f5a2bbf0 100644 --- a/patches/api/0008-Paper-Plugins.patch +++ b/patches/api/0008-Paper-Plugins.patch @@ -5,17 +5,17 @@ Subject: [PATCH] Paper Plugins diff --git a/build.gradle.kts b/build.gradle.kts -index cff3eb363b17c2a8245b3b2ceb02cbdc1efe3896..03b2fc4c6dd9cbc9f28add7da9420c816f8faa2b 100644 +index 57e5d0bf373067138a53067563b82e9aa8e100c4..6c42827db10fb2fb4dede44cba84e7989c1a6fdc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -45,7 +45,7 @@ dependencies { +@@ -47,7 +47,7 @@ dependencies { implementation("org.ow2.asm:asm-commons:9.4") // Paper end -- compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") -+ api("org.apache.maven:maven-resolver-provider:3.8.5") // Paper, expose - compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") - compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") +- compileOnly("org.apache.maven:maven-resolver-provider:3.9.2") ++ api("org.apache.maven:maven-resolver-provider:3.9.2") + compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") + compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper diff --git a/src/main/java/io/papermc/paper/plugin/PermissionManager.java b/src/main/java/io/papermc/paper/plugin/PermissionManager.java new file mode 100644 diff --git a/patches/api/0010-Timings-v2.patch b/patches/api/0010-Timings-v2.patch index fb445b2dc7..68a96e0957 100644 --- a/patches/api/0010-Timings-v2.patch +++ b/patches/api/0010-Timings-v2.patch @@ -3455,10 +3455,10 @@ index 516d7fc7812aac343782861d0d567f54aa578c2a..00000000000000000000000000000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4190d5b3b3d3eb9525ed342179cb827cc5590e3b..3fffe6844d5f113f13ae3e2636efd7a8f43940dd 100644 +index 44be86a9315d45dcbaabbbfcf2c7451ea4967173..02e09dc027409b3be9e960be6f2e4c10a06819b6 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2154,7 +2154,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2177,7 +2177,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @Nullable java.util.UUID sender, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); diff --git a/patches/api/0012-Player-affects-spawning-API.patch b/patches/api/0012-Player-affects-spawning-API.patch index 7038ebf984..254e55960f 100644 --- a/patches/api/0012-Player-affects-spawning-API.patch +++ b/patches/api/0012-Player-affects-spawning-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3fffe6844d5f113f13ae3e2636efd7a8f43940dd..aaca12b0fd009f605ce8120f0cbe0a1049771cf5 100644 +index 02e09dc027409b3be9e960be6f2e4c10a06819b6..94d9882520a6a87d936e5f7823b910a630ec5f34 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1983,6 +1983,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2006,6 +2006,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public String getLocale(); diff --git a/patches/api/0017-Add-view-distance-API.patch b/patches/api/0017-Add-view-distance-API.patch index fece2adf68..39b6ed510e 100644 --- a/patches/api/0017-Add-view-distance-API.patch +++ b/patches/api/0017-Add-view-distance-API.patch @@ -75,10 +75,10 @@ index 5357291ff0f2f20bd87ab9f6e57f6a4f6ff65226..887aa6217583d224d66f6d238ac269c2 public class Spigot { diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index aaca12b0fd009f605ce8120f0cbe0a1049771cf5..e543a0cc1bd7e4d87038c06cad0f5bde7c64f1b9 100644 +index 94d9882520a6a87d936e5f7823b910a630ec5f34..c8569243fdbb6673d7808a9cae12d08e4d81a947 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1997,6 +1997,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2020,6 +2020,78 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param affects Whether the player can affect mob spawning */ public void setAffectsSpawning(boolean affects); diff --git a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 251ca1f13a..f6e53262da 100644 --- a/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/patches/api/0021-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -76,10 +76,10 @@ index b6ff3a80fcb5c0e843caa1cfdb165cf2cadb8bd2..f24bb5b22975bcbdce1bf1e80cf7a1b3 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e543a0cc1bd7e4d87038c06cad0f5bde7c64f1b9..9caacc128a53d13b049a03f78d9dea16f8ff025e 100644 +index c8569243fdbb6673d7808a9cae12d08e4d81a947..a08f7f055e450b5f4d79e62bdd6d076f38703e95 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -849,6 +849,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -872,6 +872,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); diff --git a/patches/api/0022-Add-exception-reporting-event.patch b/patches/api/0022-Add-exception-reporting-event.patch index ed0a0f8620..f4d1eb65f8 100644 --- a/patches/api/0022-Add-exception-reporting-event.patch +++ b/patches/api/0022-Add-exception-reporting-event.patch @@ -493,7 +493,7 @@ index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86 } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 3fcb73a0fc2daaeb76dd4c6757afce52c5b3118b..2b8308989fce7f8a16907f8711b362e671fdbfb6 100644 +index 974ff7116b294473ec450757e8a9341540f43dcd..fc2dae69165776d08274e34a69962cc70445f411 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -515,7 +515,8 @@ public final class SimplePluginManager implements PluginManager { diff --git a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch index d5b8c545e4..b2bd7f7ba3 100644 --- a/patches/api/0025-Player-Tab-List-and-Title-APIs.patch +++ b/patches/api/0025-Player-Tab-List-and-Title-APIs.patch @@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..9e90c3df567a65b48a0b9341f784eb90 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9caacc128a53d13b049a03f78d9dea16f8ff025e..c7d9185e2f16b77f78779403d075f31dabbc117b 100644 +index a08f7f055e450b5f4d79e62bdd6d076f38703e95..6e40bc2a4e768d49d57998146e2d2cd8f0a32a95 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -883,6 +883,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -906,6 +906,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } diff --git a/patches/api/0027-Complete-resource-pack-API.patch b/patches/api/0027-Complete-resource-pack-API.patch index 8c8028a9b9..8f932688d6 100644 --- a/patches/api/0027-Complete-resource-pack-API.patch +++ b/patches/api/0027-Complete-resource-pack-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c7d9185e2f16b77f78779403d075f31dabbc117b..29b1cceff7100cbcde7ddca0d1acbb717f3b6b1c 100644 +index 6e40bc2a4e768d49d57998146e2d2cd8f0a32a95..2bac5662dc227e89ca74f8504bc30dc757618da5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1461,7 +1461,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1484,7 +1484,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index c7d9185e2f16b77f78779403d075f31dabbc117b..29b1cceff7100cbcde7ddca0d1acbb71 public void setResourcePack(@NotNull String url); /** -@@ -2287,6 +2289,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2310,6 +2312,124 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM default net.kyori.adventure.text.event.HoverEvent asHoverEvent(final @NotNull java.util.function.UnaryOperator op) { return net.kyori.adventure.text.event.HoverEvent.showEntity(op.apply(net.kyori.adventure.text.event.HoverEvent.ShowEntity.of(this.getType().getKey(), this.getUniqueId(), this.displayName()))); } diff --git a/patches/api/0046-Add-String-based-Action-Bar-API.patch b/patches/api/0046-Add-String-based-Action-Bar-API.patch index a7440bd6b1..649256226c 100644 --- a/patches/api/0046-Add-String-based-Action-Bar-API.patch +++ b/patches/api/0046-Add-String-based-Action-Bar-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 29b1cceff7100cbcde7ddca0d1acbb717f3b6b1c..d85ce38bcae05a643479e7f687431dced1834b93 100644 +index 2bac5662dc227e89ca74f8504bc30dc757618da5..a30692c9128eca4d7a317e5fcc1c830e9cc239a7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -850,6 +850,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -873,6 +873,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start @@ -48,7 +48,7 @@ index 29b1cceff7100cbcde7ddca0d1acbb717f3b6b1c..d85ce38bcae05a643479e7f687431dce /** * Sends the component to the player * -@@ -877,9 +910,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -900,9 +933,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Sends an array of components as a single message to the specified screen position of this player * diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch index 03794df239..d4e66873e4 100644 --- a/patches/api/0055-Fix-upstream-javadocs.patch +++ b/patches/api/0055-Fix-upstream-javadocs.patch @@ -414,7 +414,7 @@ index ae9eaaa8e38e1d9dfc459926c7fc51ddb89de84a..b2ec535bb1b0ce0c114ddd7638b90218 @Override public int getConversionTime(); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c4802469cb6 100644 +index a30692c9128eca4d7a317e5fcc1c830e9cc239a7..530315d757f330b22cf6fd41e3609608cb242b6e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -313,15 +313,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -446,7 +446,7 @@ index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c48 * @param loc the location to play the effect at * @param effect the {@link Effect} * @param data a data bit needed for some effects -@@ -867,7 +867,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -890,7 +890,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * Use supplied alternative character to the section symbol to represent legacy color codes. * @@ -455,7 +455,7 @@ index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c48 * @param message The message to send * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)} */ -@@ -1331,7 +1331,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1354,7 +1354,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see a player that was previously hidden. If @@ -464,7 +464,7 @@ index d85ce38bcae05a643479e7f687431dced1834b93..bb12eb007aeb932c2d89c6e6c4081c48 * remain hidden until the other plugin calls this method too. * * @param plugin Plugin that wants to show the player -@@ -1360,7 +1360,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1383,7 +1383,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see an entity that was previously hidden. If @@ -978,18 +978,18 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..c69904f3ee7f3a41d6cebcd401abf838 /** * Sets the entities armor to the provided array of ItemStacks diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java -index 0a1c39a2a007342f02459b3f5515dbec012b2a61..69a66073bcaa10967b8736cbf35182b912c17d11 100644 +index 42fcc31147934fd4ed6484b0729e938e7ae2f8e2..4e637420b9a39b822be19367a16da93f236549b3 100644 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java -@@ -38,7 +38,7 @@ public enum ItemFlag { +@@ -35,7 +35,7 @@ public enum ItemFlag { */ HIDE_DYE, /** - * Setting to show/hide armor trim from leather armor. + * Setting to show/hide armor trim from armor. */ - @MinecraftExperimental - @ApiStatus.Experimental + HIDE_ARMOR_TRIM; + } diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5fe1e3825 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java diff --git a/patches/api/0066-ensureServerConversions-API.patch b/patches/api/0066-ensureServerConversions-API.patch index cd92d4f5a2..2b0cf31e73 100644 --- a/patches/api/0066-ensureServerConversions-API.patch +++ b/patches/api/0066-ensureServerConversions-API.patch @@ -29,7 +29,7 @@ index 159e5a908b35b84b7fabc36581e093d9aa4c4b67..349da0065ddf000cacdc259fab0f2c75 // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 87f7942082ad943a97058f58c09ea2fe9caf5bfe..9d32283ee612a50b8a2bfe5151f42c9f181ede4c 100644 +index 09a36df6edce2a283df80c67d5ef62da7ff73555..a8faa4c1881bae4d47d901388a78b991d138b518 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -537,7 +537,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat diff --git a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch index f9beb9f108..ff6aa81254 100644 --- a/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0069-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index 9d6e604c7667985dc8107a5df9d36c53e8006326..1de2f8f345a287d93aad106dd13472a7837ec805 100644 +index 6c42827db10fb2fb4dede44cba84e7989c1a6fdc..7d6239855a84502de4eb3328b0dcf12ac671dce4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -40,6 +40,8 @@ dependencies { +@@ -42,6 +42,8 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") diff --git a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch index 8f748c0ed1..323b157741 100644 --- a/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/patches/api/0074-API-to-get-a-BlockState-without-a-snapshot.patch @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index f8e12868f2e629cdf4784f0157fdb2f8e7b01f99..61ce341daec63392f040b70cd12662379b2f1ebd 100644 +index 870ad6cd930653e6248abcc0fce94ffafbe9ebde..9f4d383ea3d6b26d16b8b77ca4c29d2d839ad6dd 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -272,6 +272,16 @@ public interface Block extends Metadatable, Translatable { diff --git a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch index 079c74bbd2..c2a2be9b39 100644 --- a/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/api/0076-Expose-client-protocol-version-and-virtual-host.patch @@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bb12eb007aeb932c2d89c6e6c4081c4802469cb6..c7c23873a09c9eb0d86a6984e3dfe3413f88d5e1 100644 +index 530315d757f330b22cf6fd41e3609608cb242b6e..47cf629a4d75f9c8b8502ff9f7898eebcf4e6762 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch index acb4f5a0bd..e8ea0ae716 100644 --- a/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/api/0080-Ability-to-apply-mending-to-XP-API.patch @@ -10,10 +10,10 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c7c23873a09c9eb0d86a6984e3dfe3413f88d5e1..e4e254c26adb15be4f60a59a0cf8a41816b9250a 100644 +index 47cf629a4d75f9c8b8502ff9f7898eebcf4e6762..1323badb5073735155e38751d954a51448f8e47e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1174,6 +1174,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1197,6 +1197,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void resetPlayerWeather(); @@ -29,7 +29,7 @@ index c7c23873a09c9eb0d86a6984e3dfe3413f88d5e1..e4e254c26adb15be4f60a59a0cf8a418 /** * Gets the player's cooldown between picking up experience orbs. * -@@ -1199,8 +1208,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1222,8 +1231,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Gives the player the amount of experience specified. * * @param amount Exp amount to give diff --git a/patches/api/0081-PreCreatureSpawnEvent.patch b/patches/api/0081-PreCreatureSpawnEvent.patch index 8ae0d7d159..3213ed0ab2 100644 --- a/patches/api/0081-PreCreatureSpawnEvent.patch +++ b/patches/api/0081-PreCreatureSpawnEvent.patch @@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..02e421b0bb4ce3529ef1c4d34ec8a0c0345cce57 +index 0000000000000000000000000000000000000000..8b48759bf6f4fcef0847d9a2461993e3f2fdc9aa --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java @@ -0,0 +1,105 @@ diff --git a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch index 2e21f259dc..62d576949f 100644 --- a/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch +++ b/patches/api/0083-Add-setPlayerProfile-API-for-Skulls.patch @@ -7,10 +7,10 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java -index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba229043d4e2132 100644 +index b39128bb0ca2d4fe7a254193236c60fb5bfaa7da..5135b8e6028e6926e2711e2dd6ce68b76f468fd7 100644 --- a/src/main/java/org/bukkit/block/Skull.java +++ b/src/main/java/org/bukkit/block/Skull.java -@@ -65,6 +65,20 @@ public interface Skull extends TileState { +@@ -63,6 +63,20 @@ public interface Skull extends TileState { */ public void setOwningPlayer(@NotNull OfflinePlayer player); @@ -31,7 +31,7 @@ index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba22904 /** * Gets the profile of the player who owns the skull. This player profile * may appear as the texture depending on skull type. -@@ -72,6 +86,7 @@ public interface Skull extends TileState { +@@ -70,6 +84,7 @@ public interface Skull extends TileState { * @return the profile of the owning player */ @Nullable @@ -39,7 +39,7 @@ index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba22904 PlayerProfile getOwnerProfile(); /** -@@ -86,6 +101,7 @@ public interface Skull extends TileState { +@@ -84,6 +99,7 @@ public interface Skull extends TileState { * @throws IllegalArgumentException if the profile does not contain the * necessary information */ @@ -48,10 +48,10 @@ index fab2ca9f6c7738795cfedbb6d0d2206f13e9da8a..33ae32155d12ecd58a2a6434dba22904 /** diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -index 461cdecc3e8f45b63f17963031b16943309909e2..1808e1315c72f983817426420eb22434c6a65024 100644 +index 5a18a66a0b7877ec0c1859f78cce659db4b8541a..862640b4611458dfbcd3be797eacd120fc8d1f9f 100644 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -@@ -40,6 +40,20 @@ public interface SkullMeta extends ItemMeta { +@@ -38,6 +38,20 @@ public interface SkullMeta extends ItemMeta { @Deprecated boolean setOwner(@Nullable String owner); @@ -72,7 +72,7 @@ index 461cdecc3e8f45b63f17963031b16943309909e2..1808e1315c72f983817426420eb22434 /** * Gets the owner of the skull. * -@@ -66,6 +80,7 @@ public interface SkullMeta extends ItemMeta { +@@ -64,6 +78,7 @@ public interface SkullMeta extends ItemMeta { * @return the profile of the owning player */ @Nullable @@ -80,7 +80,7 @@ index 461cdecc3e8f45b63f17963031b16943309909e2..1808e1315c72f983817426420eb22434 PlayerProfile getOwnerProfile(); /** -@@ -80,6 +95,7 @@ public interface SkullMeta extends ItemMeta { +@@ -78,6 +93,7 @@ public interface SkullMeta extends ItemMeta { * @throws IllegalArgumentException if the profile does not contain the * necessary information */ diff --git a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch b/patches/api/0090-Add-extended-PaperServerListPingEvent.patch index e64aa2ecd2..6fd11cfebc 100644 --- a/patches/api/0090-Add-extended-PaperServerListPingEvent.patch +++ b/patches/api/0090-Add-extended-PaperServerListPingEvent.patch @@ -366,7 +366,7 @@ index 0000000000000000000000000000000000000000..517d15238ed117f38bbd39f570874014 + +} diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 612958a331575d1da2715531ebdf6b1168f2e860..bb4f7702ced0baf0670a7a21d48ad528b7249361 100644 +index 9a7768d41270714d4a1c89b4dcb436cc66f57545..b74b21a1ac7798e847b6d34ff45026e1c9cfed14 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -18,4 +18,9 @@ public interface CachedServerIcon { diff --git a/patches/api/0091-Player.setPlayerProfile-API.patch b/patches/api/0091-Player.setPlayerProfile-API.patch index fc42539b43..f6f0951664 100644 --- a/patches/api/0091-Player.setPlayerProfile-API.patch +++ b/patches/api/0091-Player.setPlayerProfile-API.patch @@ -93,10 +93,10 @@ index 7f6400c58530d4827c197f3d1fbabfa34554010f..e4c85e67713c5ed4b8b1fcc3c4231327 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e4e254c26adb15be4f60a59a0cf8a41816b9250a..93129241f182e217478e61df37d6f7789954fc62 100644 +index 1323badb5073735155e38751d954a51448f8e47e..bcd059b4e52443431e6445d70b9f6a13761d96ad 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2463,6 +2463,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2486,6 +2486,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED} */ boolean hasResourcePack(); diff --git a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch index d22bf25564..1e11a6b092 100644 --- a/patches/api/0094-Add-openSign-method-to-HumanEntity.patch +++ b/patches/api/0094-Add-openSign-method-to-HumanEntity.patch @@ -24,10 +24,10 @@ index abdca9fe5acc90f167219eb769ece66c35682bb1..9715a9d36187e2eecfeab1a05087d27c /** * Make the entity drop the item in their hand. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 93129241f182e217478e61df37d6f7789954fc62..26f9b1b5773f39aad3d8fe02a53d040c4042e81d 100644 +index bcd059b4e52443431e6445d70b9f6a13761d96ad..7509c7654df9f020686ee4a3d84d3380a540f9e2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2308,7 +2308,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2331,7 +2331,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Open a Sign for editing by the Player. * diff --git a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch index b59fe35c9d..aae828e542 100644 --- a/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch +++ b/patches/api/0095-Add-Ban-Methods-to-Player-Objects.patch @@ -74,10 +74,10 @@ index b1ded556a1ce4e1d3c873ab9d7f799b6edcc5118..6ab8f05be11f8101202d56bfebc7ec23 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 26f9b1b5773f39aad3d8fe02a53d040c4042e81d..675e1fed283a90c49380f51e4e50e0e7dde9c3e4 100644 +index 7509c7654df9f020686ee4a3d84d3380a540f9e2..f14212bbdc6a44509469cf985d3105041b6aafaa 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -850,6 +850,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -873,6 +873,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start diff --git a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch index c3beab3c51..e4b3fc128b 100644 --- a/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/api/0100-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -500,10 +500,10 @@ index 0000000000000000000000000000000000000000..f45b8cfd1611345e8d81ecb8297a586f + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 7336edb91e7095cce381318220496b51962afbe9..0125890a258ee58a43990285b341f8a62a5c281b 100644 +index 73b782c3975ad13159b6236976783fcfabd20493..819506712e9874c0142fc9e7d959bd7be97fc649 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -170,6 +170,17 @@ public enum Particle { +@@ -162,6 +162,17 @@ public enum Particle { return dataType; } diff --git a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch index 13fc1407e6..18991e040f 100644 --- a/patches/api/0107-ItemStack-getMaxItemUseDuration.patch +++ b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 9d32283ee612a50b8a2bfe5151f42c9f181ede4c..53d99d214652ae1636f28a179a5b66edc0f8f229 100644 +index a8faa4c1881bae4d47d901388a78b991d138b518..b85eb71ff5d198d6270cbe07da0de3ed27fa72d5 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -646,5 +646,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat diff --git a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch index 1bf900f07a..0e4f6385f6 100644 --- a/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 53d99d214652ae1636f28a179a5b66edc0f8f229..1907b8cfb4a78415fba8d5445ba98a6208516fd9 100644 +index b85eb71ff5d198d6270cbe07da0de3ed27fa72d5..83a0631a80db156ace1d977df71d5fc653b70bb6 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -3,6 +3,7 @@ package org.bukkit.inventory; diff --git a/patches/api/0117-RangedEntity-API.patch b/patches/api/0117-RangedEntity-API.patch index f2ed002e60..ee7e081646 100644 --- a/patches/api/0117-RangedEntity-API.patch +++ b/patches/api/0117-RangedEntity-API.patch @@ -169,7 +169,7 @@ index 0ebd54df0bb072df25a6ebcf137a39829cf71bf9..6618f2129e108c0a6cd15f6d0e864260 /** * Gets whether the witch is drinking a potion diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 225c65a20a3e33dfb14e108a36f2f4bc60f7920c..b86f0196e6eb8070830f63a94f732522c2a6c2f1 100644 +index b3a5d7a91e483b9fd569dd3c8cec989498a50104..87a814f63c3f35be35bfa210c9248ad211c0dd8f 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index b0bfc7075c..8c532bba78 100644 --- a/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/patches/api/0133-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index dc1a328e2202b755266b2564656f5bb60dd260cd..2f6142b6bfaa3b523478eccd6ad13ce922e81da9 100644 +index 766d643f0fe79660942fdad25e39e488e9379419..4418c41f75e9a190dd77abdd6048b0a4fb2a57ed 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -122,7 +122,30 @@ public interface Chunk extends PersistentDataHolder { diff --git a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch index 27430272ef..c6c2d720f3 100644 --- a/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/api/0144-Expose-attack-cooldown-methods-for-Player.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 675e1fed283a90c49380f51e4e50e0e7dde9c3e4..44aa4ad14818e26993c912460bd91015ded09754 100644 +index f14212bbdc6a44509469cf985d3105041b6aafaa..71cd103ba699a6f7af5bdbbd2079991e4a2b4655 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2633,6 +2633,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2656,6 +2656,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param profile The new profile to use */ void setPlayerProfile(@NotNull com.destroystokyo.paper.profile.PlayerProfile profile); diff --git a/patches/api/0145-Improve-death-events.patch b/patches/api/0145-Improve-death-events.patch index 1251da62c5..8ee8acb362 100644 --- a/patches/api/0145-Improve-death-events.patch +++ b/patches/api/0145-Improve-death-events.patch @@ -179,7 +179,7 @@ index a5984ab06cce95d30e70511e125f69339b574c04..130cf9e5981f701dff4fa72e71e0b5dc + // Paper end } diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 1f1df82c9bcf18bad1187e3f24ede1901d91c06f..3b43954b428f2e5e9a718bf6d34116f25c90269f 100644 +index a803bfea5400b3578bb4cf3261874e873b6467d9..27909044c0c136acde18d64f14e84de932ba1045 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -63,6 +63,17 @@ public class PlayerDeathEvent extends EntityDeathEvent { diff --git a/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 6c29c03705..6fcf17ae03 100644 --- a/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/patches/api/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -226,7 +226,7 @@ index a42f1d53340e4073038d46b7fabf5d44248d5b32..dbc22807a33606f8fe326cc2f5f755fe return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 64114b1a9e201df369fc794fbee984d496385420..35009498aafd1bd36c493085127135fc8a5c36ec 100644 +index f78714c2a6d9da162c9802552984cbfad76ff728..55e9dc5d1d87fbc9d0dabbb7bd59584fe2c5f379 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -444,4 +444,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste diff --git a/patches/api/0152-Material-API-additions.patch b/patches/api/0152-Material-API-additions.patch index 7a452665da..6b7874324c 100644 --- a/patches/api/0152-Material-API-additions.patch +++ b/patches/api/0152-Material-API-additions.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 0d04591db6e2e0b08b06904c16ef41b59decd952..fb23fce97a1930b968b76fa9ff4fbbb452768096 100644 +index f52c0e25e75e890046339d605c0abf79d82864f2..64d01ce77966e895ec494719a4398577be1097a1 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -116,6 +116,7 @@ import org.jetbrains.annotations.Nullable; +@@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index 0d04591db6e2e0b08b06904c16ef41b59decd952..fb23fce97a1930b968b76fa9ff4fbbb4 public enum Material implements Keyed, Translatable { // AIR(9648, 0), -@@ -4548,6 +4549,22 @@ public enum Material implements Keyed, Translatable { +@@ -4435,6 +4436,22 @@ public enum Material implements Keyed, Translatable { } } diff --git a/patches/api/0153-Add-Material-Tags.patch b/patches/api/0153-Add-Material-Tags.patch index d0b8b83dcc..5fd3e2b0a4 100644 --- a/patches/api/0153-Add-Material-Tags.patch +++ b/patches/api/0153-Add-Material-Tags.patch @@ -1119,10 +1119,10 @@ index 0000000000000000000000000000000000000000..d7eb49a05c3f0cacf285f8995433c5d5 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 2d25228016fc9a9a1ba87f58865ec8ee65115461..28e5691e265b94eb9855f87d05f84e8ff963c566 100644 +index 1504dca4ec3e8d21189b7534bb009521799ffdf7..82d34e9aae42dfafd900dc0e610bf1dc82a5a6f3 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -12,6 +12,10 @@ import org.jetbrains.annotations.NotNull; +@@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull; * Note that whilst all tags defined within this interface must be present in * implementations, their existence is not guaranteed across future versions. * diff --git a/patches/api/0170-Add-PlayerPostRespawnEvent.patch b/patches/api/0170-Add-PlayerPostRespawnEvent.patch index 004d74e96d..01106b663b 100644 --- a/patches/api/0170-Add-PlayerPostRespawnEvent.patch +++ b/patches/api/0170-Add-PlayerPostRespawnEvent.patch @@ -63,7 +63,7 @@ index 0000000000000000000000000000000000000000..31f34b54801f6699ce43355fa2a0a51f + } +} diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java -index 7c2cec60cbaf199416496292f2264fa3864b499c..f5bdb5244c8d993c624f938c8fb7ccff74655d75 100644 +index c3d9d95be50eacb212108a01b612756f772956aa..03225d2b4c91caa58c2995d9cf0e7fb4663749ab 100644 --- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java @@ -8,6 +8,9 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch index a345b5ad36..322b3af1c2 100644 --- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch @@ -90,10 +90,10 @@ index 20978b269a7757a561d6b872cc77898b44bbd272..2b9a117804a8ca54b47e51e23359bd6e if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 2126636b646068312a49242917808f5d91bce614..96e44836b3634a53d8a9f0785d4cdcec872b95f7 100644 +index 64d01ce77966e895ec494719a4398577be1097a1..7705fece7f58bd66f7d68da85f8f34e43b4bae12 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4578,11 +4578,11 @@ public enum Material implements Keyed, Translatable { +@@ -4465,11 +4465,11 @@ public enum Material implements Keyed, Translatable { } /** @@ -107,7 +107,7 @@ index 2126636b646068312a49242917808f5d91bce614..96e44836b3634a53d8a9f0785d4cdcec public boolean isLegacy() { return legacy; } -@@ -4653,8 +4653,10 @@ public enum Material implements Keyed, Translatable { +@@ -4540,8 +4540,10 @@ public enum Material implements Keyed, Translatable { * Gets the MaterialData class associated with this Material * * @return MaterialData associated with this Material @@ -156,10 +156,10 @@ index f43209cf7b752c26718c303ca8c3e1c7d9912ad3..f0094e6fb05e526736629ad3181c8d2c /** diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index bb333b90e103e49923808b1ee0e1cd2787086cea..1976ed42f255825d1eaf2ee2c9465d22e81abdb3 100644 +index 6e5e5fecdd7b76dde2e1524fe7b5faa837f491fb..5a09d288c980eefbd69471d83aabac627b0ac0b3 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -248,8 +248,11 @@ public interface Registry extends Iterable { +@@ -246,8 +246,11 @@ public interface Registry extends Iterable { * * @param input non-null input * @return registered object or null if does not exist diff --git a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch index 613dd778e6..999842766c 100644 --- a/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch +++ b/patches/api/0174-PlayerDeathEvent-getItemsToKeep.patch @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 3b43954b428f2e5e9a718bf6d34116f25c90269f..bfd3654c02e8ad906c620a86165a38c65a31b62b 100644 +index 27909044c0c136acde18d64f14e84de932ba1045..ed7ede83507c052e05afffea78600b16439590dd 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -36,7 +36,6 @@ public class PlayerDeathEvent extends EntityDeathEvent { diff --git a/patches/api/0177-Add-BlockSoundGroup-interface.patch b/patches/api/0177-Add-BlockSoundGroup-interface.patch index d7e1a7c6c0..993c769c62 100644 --- a/patches/api/0177-Add-BlockSoundGroup-interface.patch +++ b/patches/api/0177-Add-BlockSoundGroup-interface.patch @@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..ec36942128cbacae171584c89480b4aa + Sound getFallSound(); +} diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 0be73b2f45c9aab6e73bcb7a76136ec6e2428163..3107abe94bb94b03b2e285c75ab0b7fdc7c0bc87 100644 +index 78f6cc1a8a8de05aec6f551f8a5f425944f0ffa3..b0b148918eeaf10d60734def6ac84b678c0d74c7 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -607,4 +607,25 @@ public interface Block extends Metadatable, Translatable { diff --git a/patches/api/0181-Improve-Block-breakNaturally-API.patch b/patches/api/0181-Improve-Block-breakNaturally-API.patch index 01e9249c42..b96cf1505a 100644 --- a/patches/api/0181-Improve-Block-breakNaturally-API.patch +++ b/patches/api/0181-Improve-Block-breakNaturally-API.patch @@ -10,7 +10,7 @@ Adds bool param to trigger exp drops for blocks Co-authored-by: William Blake Galbreath diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 3107abe94bb94b03b2e285c75ab0b7fdc7c0bc87..06ef9e133125d80127e1dbd6ae0eda89fa08a1d7 100644 +index b0b148918eeaf10d60734def6ac84b678c0d74c7..232662f3130ca49156ed8b71acf4495aea33c212 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -481,6 +481,52 @@ public interface Block extends Metadatable, Translatable { diff --git a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch index 71a39f4f71..47dc1d2141 100644 --- a/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch +++ b/patches/api/0182-PlayerDeathEvent-shouldDropExperience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index bfd3654c02e8ad906c620a86165a38c65a31b62b..d5eeb37d331e205826aa6199bd481cb0db40d721 100644 +index ed7ede83507c052e05afffea78600b16439590dd..c7138d79a572a525c70b51b7c79d2c5dfb18f25c 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -1,6 +1,8 @@ diff --git a/patches/api/0189-Add-Player-Client-Options-API.patch b/patches/api/0189-Add-Player-Client-Options-API.patch index 11a43b629e..8c3102617d 100644 --- a/patches/api/0189-Add-Player-Client-Options-API.patch +++ b/patches/api/0189-Add-Player-Client-Options-API.patch @@ -229,10 +229,10 @@ index 0000000000000000000000000000000000000000..cf67dc7d465223710adbf2b798109f52 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 44aa4ad14818e26993c912460bd91015ded09754..a2dd30628458a60922a1326c88e2cbc158a28e89 100644 +index 71cd103ba699a6f7af5bdbbd2079991e4a2b4655..8a011236b128fa52a0453b492eeb809f2fa77def 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2653,6 +2653,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2676,6 +2676,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Reset the cooldown counter to 0, effectively starting the cooldown period. */ void resetCooldown(); diff --git a/patches/api/0192-Add-item-slot-convenience-methods.patch b/patches/api/0192-Add-item-slot-convenience-methods.patch index d456638d28..abad4883ed 100644 --- a/patches/api/0192-Add-item-slot-convenience-methods.patch +++ b/patches/api/0192-Add-item-slot-convenience-methods.patch @@ -178,10 +178,10 @@ index 4a0c43acc2714e095973eb78536041bb1a179ddc..acf2244f77133df53eb5f862c8e713c8 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/SmithingInventory.java b/src/main/java/org/bukkit/inventory/SmithingInventory.java -index 8f7749d10b68b6fe3c29f2e38dd1f7b9a6b45d8c..7808d30ae194d5ec043e630c277916a66d452a69 100644 +index 96d526b7b153e56c9a97de42ce3270b6638510e4..a41ca6bd2672db2810dd70c4925b84a4f081af05 100644 --- a/src/main/java/org/bukkit/inventory/SmithingInventory.java +++ b/src/main/java/org/bukkit/inventory/SmithingInventory.java -@@ -35,4 +35,44 @@ public interface SmithingInventory extends Inventory { +@@ -30,4 +30,44 @@ public interface SmithingInventory extends Inventory { */ @Nullable Recipe getRecipe(); diff --git a/patches/api/0193-Villager-Restocks-API.patch b/patches/api/0193-Villager-Restocks-API.patch index b456e877c6..5b3898429d 100644 --- a/patches/api/0193-Villager-Restocks-API.patch +++ b/patches/api/0193-Villager-Restocks-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..d8cf5e5921357ce9645f5dcb5a3bffcf3c10af7e 100644 +index a91400cd8bb4c72d1f3200a17f6de025540fe09d..4128b848ec739308694d54d9e859c28185f42a63 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -78,6 +78,20 @@ public interface Villager extends AbstractVillager { diff --git a/patches/api/0196-Add-villager-reputation-API.patch b/patches/api/0196-Add-villager-reputation-API.patch index 0bf00d9130..4a2093aab9 100644 --- a/patches/api/0196-Add-villager-reputation-API.patch +++ b/patches/api/0196-Add-villager-reputation-API.patch @@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..5600fcdc9795a9f49091db48d73bbd49 + TRADING, +} diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java -index d8cf5e5921357ce9645f5dcb5a3bffcf3c10af7e..c799ac46dbe257d470d3b236cf55b41240f5fda8 100644 +index 4128b848ec739308694d54d9e859c28185f42a63..d841d94d46462e0ceb7c6b04cc8fc36792bd9201 100644 --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java @@ -1,6 +1,8 @@ diff --git a/patches/api/0197-Spawn-Reason-API.patch b/patches/api/0197-Spawn-Reason-API.patch index 60d33effef..dbde82e3ba 100644 --- a/patches/api/0197-Spawn-Reason-API.patch +++ b/patches/api/0197-Spawn-Reason-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Spawn Reason API diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index a89fff5c164881be0286ec2240e94dd5883ecc40..e55f6e2baf35dbd91c433ab9e62713eaac85435b 100644 +index 05c29cbd2ae1ca0434a90f8389479bd608ca2ac1..66bc6da2a482bb207ec50beb22fd62aeda90cc34 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java @@ -10,6 +10,7 @@ import org.bukkit.block.data.BlockData; diff --git a/patches/api/0202-Support-components-in-ItemMeta.patch b/patches/api/0202-Support-components-in-ItemMeta.patch index a4e6b27bd0..83aa6e9ada 100644 --- a/patches/api/0202-Support-components-in-ItemMeta.patch +++ b/patches/api/0202-Support-components-in-ItemMeta.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 1beedb446a9dd554d05d1d94dba8598e4b69eba6..c6b0fd783675cd019048e445d8e959637d90be7a 100644 +index 5c1ca0e47f0ac1525c3d37b55f52874878f44c28..e33ec3eaa1cd520db8224250e886e6240fefe76f 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -5,6 +5,7 @@ import java.util.Collection; diff --git a/patches/api/0206-Brand-support.patch b/patches/api/0206-Brand-support.patch index b32abad272..7e3d714402 100644 --- a/patches/api/0206-Brand-support.patch +++ b/patches/api/0206-Brand-support.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Brand support diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a2dd30628458a60922a1326c88e2cbc158a28e89..2606c3edf89ca1f435aa3809d4609fe104211523 100644 +index 8a011236b128fa52a0453b492eeb809f2fa77def..712d391f4ce3ac5fd6293629ecd4e74e0d049b3a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2785,6 +2785,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2808,6 +2808,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end } diff --git a/patches/api/0212-Add-methods-to-get-translation-keys.patch b/patches/api/0212-Add-methods-to-get-translation-keys.patch index d99ff81d4d..96b7bbb309 100644 --- a/patches/api/0212-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0212-Add-methods-to-get-translation-keys.patch @@ -144,10 +144,10 @@ index 753bfcec441533071120d925c83789ef53afa176..c6bc84a8755b2fe5d7d8d3ec857700ec + // Paper end } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 96e44836b3634a53d8a9f0785d4cdcec872b95f7..fb4d98c8538e21936b256a7cbc8242e7a3b3b26c 100644 +index 7705fece7f58bd66f7d68da85f8f34e43b4bae12..6a89eab53f21bc4420e616cc299864fb564e1045 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -117,7 +117,7 @@ import org.jetbrains.annotations.Nullable; +@@ -119,7 +119,7 @@ import org.jetbrains.annotations.Nullable; * An enum of all material IDs accepted by the official server and client */ @SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper @@ -156,7 +156,7 @@ index 96e44836b3634a53d8a9f0785d4cdcec872b95f7..fb4d98c8538e21936b256a7cbc8242e7 // AIR(9648, 0), STONE(22948), -@@ -4563,6 +4563,15 @@ public enum Material implements Keyed, Translatable { +@@ -4450,6 +4450,15 @@ public enum Material implements Keyed, Translatable { } return false; } @@ -172,7 +172,7 @@ index 96e44836b3634a53d8a9f0785d4cdcec872b95f7..fb4d98c8538e21936b256a7cbc8242e7 // Paper end /** -@@ -11046,9 +11055,11 @@ public enum Material implements Keyed, Translatable { +@@ -10949,9 +10958,11 @@ public enum Material implements Keyed, Translatable { * material * @see #getBlockTranslationKey() * @see #getItemTranslationKey() @@ -232,10 +232,10 @@ index 13eac9ad2c1672051635d1c35cc49239252e7a61..107e36ef02a9481954bd770ce9a55a0b + // Paper end } diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java -index a5908d0a03801757d1f6184d73c3c89981afa107..d268498c779d6b2ec07812d4d1c0b168fab63c07 100644 +index d3087d60378822cdd7cea25fd63d3f496e3cd2fb..5d8fa5b39a5d50cca48ba63af3a84b80f279b649 100644 --- a/src/main/java/org/bukkit/block/Biome.java +++ b/src/main/java/org/bukkit/block/Biome.java -@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; +@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; /** * Holds all accepted Biomes in the default server */ @@ -244,7 +244,7 @@ index a5908d0a03801757d1f6184d73c3c89981afa107..d268498c779d6b2ec07812d4d1c0b168 OCEAN, PLAINS, DESERT, -@@ -93,4 +93,11 @@ public enum Biome implements Keyed { +@@ -89,4 +89,11 @@ public enum Biome implements Keyed { public NamespacedKey getKey() { return key; } @@ -311,10 +311,10 @@ index 4d5f0837bd0e02a30c943d8969fb6b13452322e0..a39f9c078f42451bd122f3e3729d10ca // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 16f1ed5bdad79928806b4509af03581bdbf002c5..bf3aa78cb901301571aa3fad5bd0bcebee8e6e1b 100644 +index bb9ae81870a340c00d7480aff5106dc2c44dab8a..6c40a989eff1163c19106c1e6b4c8fc01ace7280 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Contract; +@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -323,7 +323,7 @@ index 16f1ed5bdad79928806b4509af03581bdbf002c5..bf3aa78cb901301571aa3fad5bd0bceb // These strings MUST match the strings in nms.EntityTypes and are case sensitive. /** -@@ -441,10 +441,22 @@ public enum EntityType implements Keyed, Translatable { +@@ -435,10 +435,22 @@ public enum EntityType implements Keyed, Translatable { @Override @NotNull diff --git a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch index e2c5562130..49e64dc27d 100644 --- a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch +++ b/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Create HoverEvent from ItemStack Entity diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 50fe28b48d885c782278bdb53a0bbae303f4a32d..af36ee37290f04a629c1d6471f2a99a8bf437132 100644 +index abf95d917eca248ff3f5a5caa008c1c87fa1e029..11e59068b8a8ef1128e3c75283d161c39e2a3a99 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -204,5 +204,64 @@ public interface ItemFactory { diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0218-Player-elytra-boost-API.patch index 571a3da396..4a519deb98 100644 --- a/patches/api/0218-Player-elytra-boost-API.patch +++ b/patches/api/0218-Player-elytra-boost-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player elytra boost API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2606c3edf89ca1f435aa3809d4609fe104211523..8caa318f71c8fd765a583c18af72705e3864f23a 100644 +index 712d391f4ce3ac5fd6293629ecd4e74e0d049b3a..6d95bc0e7409e47b17f74eef9c0e0861a8834e51 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2659,6 +2659,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2682,6 +2682,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @NotNull T getClientOption(@NotNull com.destroystokyo.paper.ClientOption option); diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0224-Add-Destroy-Speed-API.patch index bdf9933289..6e2512b8b7 100644 --- a/patches/api/0224-Add-Destroy-Speed-API.patch +++ b/patches/api/0224-Add-Destroy-Speed-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API Co-authored-by: Jake Potrebic diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 35ed58bce2589bb097dd0f6bf2a6ebd76dc31fcd..ded1daaef53882a80e618f4ed97b50fd0ee4786c 100644 +index 5ae85ddc2cff3145dcba877a7bf55abd818f6881..546c6709383edb0007b9a8a560af0b64f498dadd 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -680,5 +680,29 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0234-Additional-Block-Material-API-s.patch b/patches/api/0234-Additional-Block-Material-API-s.patch index 5d7efccc1f..91196a2442 100644 --- a/patches/api/0234-Additional-Block-Material-API-s.patch +++ b/patches/api/0234-Additional-Block-Material-API-s.patch @@ -9,7 +9,7 @@ process to do this in the Bukkit API Adds API for buildable, replaceable, burnable too. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index ded1daaef53882a80e618f4ed97b50fd0ee4786c..4abd16a4e99ae0380b67c86b9744d71423053b5e 100644 +index 546c6709383edb0007b9a8a560af0b64f498dadd..6c0249863601e8f0fc06828574315a9f0af66e5b 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -439,6 +439,42 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch index 96e3e59f8e..d297dd5c24 100644 --- a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch +++ b/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add API to get Material from Boats and Minecarts diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java -index 08e54aac52322aac2d033083ab4f589160386627..8715e53e6b85ebaf3d07297c838432b9e6f28c2a 100644 +index 88852215d01f3fc4866449f7b826f6603b0ed9d8..f7548098bcdd033d9c530fdc584fc5538c635ca1 100644 --- a/src/main/java/org/bukkit/entity/Boat.java +++ b/src/main/java/org/bukkit/entity/Boat.java -@@ -181,4 +181,14 @@ public interface Boat extends Vehicle { +@@ -175,4 +175,14 @@ public interface Boat extends Vehicle { ON_LAND, IN_AIR; } diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0245-Add-sendOpLevel-API.patch index 4eed894093..09029d2d76 100644 --- a/patches/api/0245-Add-sendOpLevel-API.patch +++ b/patches/api/0245-Add-sendOpLevel-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add sendOpLevel API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8caa318f71c8fd765a583c18af72705e3864f23a..f874f4342fbd1095ea4996da5d29f25ba7135e9a 100644 +index 6d95bc0e7409e47b17f74eef9c0e0861a8834e51..f04ce165d18726aff8948fade18addae707fa747 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2672,6 +2672,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2695,6 +2695,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ @Nullable Firework boostElytra(@NotNull ItemStack firework); diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0247-Add-StructuresLocateEvent.patch index 439c86c610..3acf0a7aaf 100644 --- a/patches/api/0247-Add-StructuresLocateEvent.patch +++ b/patches/api/0247-Add-StructuresLocateEvent.patch @@ -505,10 +505,10 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f + } +} diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 1976ed42f255825d1eaf2ee2c9465d22e81abdb3..e22233eed3eb9b6aaf835d682d13450d1ba5e8af 100644 +index 5a09d288c980eefbd69471d83aabac627b0ac0b3..6e839812b6b523ddfac06d7d3921043b972c5b7f 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -230,6 +230,15 @@ public interface Registry extends Iterable { +@@ -228,6 +228,15 @@ public interface Registry extends Iterable { return GameEvent.getByKey(key); } }; diff --git a/patches/api/0249-Added-missing-vanilla-tags.patch b/patches/api/0249-Added-missing-vanilla-tags.patch index 80a493bbea..0b81d3e855 100644 --- a/patches/api/0249-Added-missing-vanilla-tags.patch +++ b/patches/api/0249-Added-missing-vanilla-tags.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added missing vanilla tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 28e5691e265b94eb9855f87d05f84e8ff963c566..a28d38408ff2dc9b835d737aff25196a94878a77 100644 +index 82d34e9aae42dfafd900dc0e610bf1dc82a5a6f3..3e9f1ee242b8087759c98b54ebb3cc3b8f5fcbd5 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -735,6 +735,12 @@ public interface Tag extends Keyed { +@@ -759,6 +759,12 @@ public interface Tag extends Keyed { * Vanilla item tag representing all chest boat items. */ Tag ITEMS_CHEST_BOATS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("chest_boats"), Material.class); diff --git a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch b/patches/api/0260-Cache-the-result-of-Material-isBlock.patch index 094e9ab4d0..49dab657f2 100644 --- a/patches/api/0260-Cache-the-result-of-Material-isBlock.patch +++ b/patches/api/0260-Cache-the-result-of-Material-isBlock.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Cache the result of Material#isBlock diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8a0c80bd2 100644 +index 6a89eab53f21bc4420e616cc299864fb564e1045..37898f36f859eda945471fa9b00fcabbc3d211df 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4507,6 +4507,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4394,6 +4394,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla public final Class data; private final boolean legacy; private final NamespacedKey key; @@ -16,7 +16,7 @@ index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8 private Material(final int id) { this(id, 64); -@@ -4705,6 +4706,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4592,6 +4593,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * @return true if this material is a block */ public boolean isBlock() { @@ -28,7 +28,7 @@ index 3da281e454f1f242c57e0174917084557f9c85df..6ec19c038ce3c551b5207028355594f8 switch (this) { // case ACACIA_BUTTON: -@@ -5886,6 +5892,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -5778,6 +5784,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla static { for (Material material : values()) { BY_NAME.put(material.name(), material); diff --git a/patches/api/0266-Item-Rarity-API.patch b/patches/api/0266-Item-Rarity-API.patch index d80cad6604..5c25c66d65 100644 --- a/patches/api/0266-Item-Rarity-API.patch +++ b/patches/api/0266-Item-Rarity-API.patch @@ -39,10 +39,10 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202 + } +} diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index ac9395474e17c3a03c611c777b04a5bd18948be6..0b3b623455337c6500b9ce518ad8e6a7e5e9a17f 100644 +index 37898f36f859eda945471fa9b00fcabbc3d211df..85d19b0c659c75472aa91d18fdf17f25bd6a2e04 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4573,6 +4573,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4460,6 +4460,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla return Bukkit.getUnsafe().getBlockTranslationKey(this); } } diff --git a/patches/api/0290-Attributes-API-for-item-defaults.patch b/patches/api/0290-Attributes-API-for-item-defaults.patch index 4c9512433c..abd3dd1e69 100644 --- a/patches/api/0290-Attributes-API-for-item-defaults.patch +++ b/patches/api/0290-Attributes-API-for-item-defaults.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 0b3b623455337c6500b9ce518ad8e6a7e5e9a17f..220db091ce8b79688f82a099b5c227c86dd2c803 100644 +index 85d19b0c659c75472aa91d18fdf17f25bd6a2e04..5fe8207fd9b76564b0547eec5e3db2b7abed0150 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4584,6 +4584,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4471,6 +4471,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla public io.papermc.paper.inventory.ItemRarity getItemRarity() { return Bukkit.getUnsafe().getItemRarity(this); } diff --git a/patches/api/0293-Add-PlayerKickEvent-causes.patch b/patches/api/0293-Add-PlayerKickEvent-causes.patch index 13269984a8..19e92f5795 100644 --- a/patches/api/0293-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0293-Add-PlayerKickEvent-causes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f874f4342fbd1095ea4996da5d29f25ba7135e9a..44665d304b4245da3e5fe63e9d58649755259647 100644 +index f04ce165d18726aff8948fade18addae707fa747..69cac7bcf53c968c00bffae7ae2a04600c9d5d18 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -252,6 +252,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0300-Missing-Entity-Behavior-API.patch b/patches/api/0300-Missing-Entity-Behavior-API.patch index 2f15b08736..5bcf3a9146 100644 --- a/patches/api/0300-Missing-Entity-Behavior-API.patch +++ b/patches/api/0300-Missing-Entity-Behavior-API.patch @@ -10,7 +10,7 @@ Co-authored-by: SoSeDiK Co-authored-by: booky10 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java -index 9dc131ac6f6990d2a9997609c1d8f104dbfb2aef..e67eac34839c7a471b85ccd09cab741a3cdae024 100644 +index c9837c7c47314b5bdf6c7973e6bc962d390dc13d..b7a2cecb334ce39fa09d8ab949a29eedbdc44c36 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -24,7 +24,7 @@ public interface VanillaGoal extends Goal { diff --git a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch index 38bbf0f145..f8c58e9869 100644 --- a/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch +++ b/patches/api/0316-Add-methods-to-find-targets-for-lightning-strikes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index ecf900140d0007b4e69ab8ab0e439828ee718a6b..0baf878c80ae42d7e77e3f1a57c5f3e715b163ba 100644 +index 0fa6f8e99059b26861bc5bb3505ac544587e51bc..8d5b73b92b78676467c24a73332a2a8c14cd0506 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -716,6 +716,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0317-Get-entity-default-attributes.patch b/patches/api/0317-Get-entity-default-attributes.patch index 62d210c5a5..32c28f3adf 100644 --- a/patches/api/0317-Get-entity-default-attributes.patch +++ b/patches/api/0317-Get-entity-default-attributes.patch @@ -32,10 +32,10 @@ index a9e7c64e1f98ff73c1804466d7c79eaf343dde7c..c2b042ced0f32b0dafc13a2933c2bd9b // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index bf3aa78cb901301571aa3fad5bd0bcebee8e6e1b..22cb13b3d63e06476581e3d92e2b7c245944cb38 100644 +index 6c40a989eff1163c19106c1e6b4c8fc01ace7280..6cf14afd2c1b8018c67c6cac302ae28bb12ab5a5 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -455,6 +455,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans +@@ -449,6 +449,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys"); return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this); } diff --git a/patches/api/0323-Add-isCollidable-methods-to-various-places.patch b/patches/api/0323-Add-isCollidable-methods-to-various-places.patch index 08f7932d08..62fba2ca0e 100644 --- a/patches/api/0323-Add-isCollidable-methods-to-various-places.patch +++ b/patches/api/0323-Add-isCollidable-methods-to-various-places.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 220db091ce8b79688f82a099b5c227c86dd2c803..48a2fbe33a8b0522d53bd79bdd253eaed6b6357f 100644 +index 5fe8207fd9b76564b0547eec5e3db2b7abed0150..03b47012447430a350e152920f754d993d4023db 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4599,6 +4599,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4486,6 +4486,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla public Multimap getItemAttributes(@NotNull EquipmentSlot equipmentSlot) { return Bukkit.getUnsafe().getItemAttributes(this, equipmentSlot); } diff --git a/patches/api/0328-Add-player-health-update-API.patch b/patches/api/0328-Add-player-health-update-API.patch index 7e84f09ec9..8316e6ed25 100644 --- a/patches/api/0328-Add-player-health-update-API.patch +++ b/patches/api/0328-Add-player-health-update-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add player health update API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 44665d304b4245da3e5fe63e9d58649755259647..195acdc1d1805caf4ef865e53280f4e8c360eb66 100644 +index 69cac7bcf53c968c00bffae7ae2a04600c9d5d18..388af21e1dedbd08cb87aedb4fa9fffbbddedfaa 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2050,6 +2050,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2073,6 +2073,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public double getHealthScale(); diff --git a/patches/api/0343-Multi-Block-Change-API.patch b/patches/api/0343-Multi-Block-Change-API.patch index 392912e02c..52f4ffdece 100644 --- a/patches/api/0343-Multi-Block-Change-API.patch +++ b/patches/api/0343-Multi-Block-Change-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Multi Block Change API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 195acdc1d1805caf4ef865e53280f4e8c360eb66..a4eb5ca72061ccc593ec8f03b663aebe9b2ccb02 100644 +index 388af21e1dedbd08cb87aedb4fa9fffbbddedfaa..5b2d4d394f14a1952e4da349cd091a98561cf280 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -649,6 +649,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -672,6 +672,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendBlockDamage(@NotNull Location loc, float progress); diff --git a/patches/api/0347-More-PotionEffectType-API.patch b/patches/api/0347-More-PotionEffectType-API.patch index 52c7f2634e..87659c1aa4 100644 --- a/patches/api/0347-More-PotionEffectType-API.patch +++ b/patches/api/0347-More-PotionEffectType-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] More PotionEffectType API diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 39c13a459dede4992f5a3fa7309733820cfa44c5..fbd5a8fae7e72f3fb1098742c9680aeea1297fe7 100644 +index 6e839812b6b523ddfac06d7d3921043b972c5b7f..3d55f1a6c71a8f9281906f034fb8af087005c8f0 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -238,6 +238,26 @@ public interface Registry extends Iterable { +@@ -236,6 +236,26 @@ public interface Registry extends Iterable { */ @Deprecated(forRemoval = true) Registry CONFIGURED_STRUCTURE = Bukkit.getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class); diff --git a/patches/api/0349-Implement-regenerateChunk.patch b/patches/api/0349-Implement-regenerateChunk.patch index 11280a1baf..ee4594616d 100644 --- a/patches/api/0349-Implement-regenerateChunk.patch +++ b/patches/api/0349-Implement-regenerateChunk.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 0baf878c80ae42d7e77e3f1a57c5f3e715b163ba..c1827f97e9255e72c082548c8b2782e39f1ebb8c 100644 +index 8d5b73b92b78676467c24a73332a2a8c14cd0506..72f1576b8ce5b55b50f053f346ce42c52db4b568 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -465,8 +465,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0350-Add-GameEvent-tags.patch b/patches/api/0350-Add-GameEvent-tags.patch index c4ed6aaaeb..1aabdd065a 100644 --- a/patches/api/0350-Add-GameEvent-tags.patch +++ b/patches/api/0350-Add-GameEvent-tags.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add GameEvent tags diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index a28d38408ff2dc9b835d737aff25196a94878a77..e8206aa4cb574ee629f375a85acf597ae164a1c3 100644 +index 3e9f1ee242b8087759c98b54ebb3cc3b8f5fcbd5..9257a5530264195260becedf73d291488c29d176 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -942,6 +942,24 @@ public interface Tag extends Keyed { +@@ -960,6 +960,24 @@ public interface Tag extends Keyed { * Vanilla tag representing entities which are dismounted when underwater. */ Tag ENTITY_TYPES_DISMOUNTS_UNDERWATER = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("dismounts_underwater"), EntityType.class); diff --git a/patches/api/0357-Add-getComputedBiome-API.patch b/patches/api/0357-Add-getComputedBiome-API.patch index 5de8fdeb0d..a1ec54fe08 100644 --- a/patches/api/0357-Add-getComputedBiome-API.patch +++ b/patches/api/0357-Add-getComputedBiome-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add getComputedBiome API diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java -index 3c38abfbe0391bf748702b1599d359a1180838af..96291baf8bd06ff5f7fb2fccdbb2a172f01ba8db 100644 +index cd83348de3f82b3fddcf2d4bb9187ec8173b0e40..8f50eb9b902236f5e039f5d26f3ca9a044b01a75 100644 --- a/src/main/java/org/bukkit/RegionAccessor.java +++ b/src/main/java/org/bukkit/RegionAccessor.java @@ -26,6 +26,7 @@ public interface RegionAccessor extends Keyed { // Paper diff --git a/patches/api/0371-More-Teleport-API.patch b/patches/api/0371-More-Teleport-API.patch index 2af9ab7301..e57ec2eaec 100644 --- a/patches/api/0371-More-Teleport-API.patch +++ b/patches/api/0371-More-Teleport-API.patch @@ -165,10 +165,10 @@ index ab0ceaba9ddcbe20a8b8a1fc3ed19cb3c64ecd3d..97f0bc6573c8ba09de77061b6312b91c * Teleports this entity to the given location. If this entity is riding a * vehicle, it will be dismounted prior to teleportation. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a4eb5ca72061ccc593ec8f03b663aebe9b2ccb02..c100a2815a1ee7bd59ecbd8c12a907d8aabb0290 100644 +index 5b2d4d394f14a1952e4da349cd091a98561cf280..17c2136e2b58c5f8bd45005688239f74dd474b60 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2873,6 +2873,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2896,6 +2896,49 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM String getClientBrandName(); // Paper end diff --git a/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch index d7165e4edb..adc3071594 100644 --- a/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/api/0373-Custom-Chat-Completion-Suggestions-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Custom Chat Completion Suggestions API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c100a2815a1ee7bd59ecbd8c12a907d8aabb0290..b886e9a59272ef6c8afa65f31a42bfc47f48b43a 100644 +index 17c2136e2b58c5f8bd45005688239f74dd474b60..dbd27bbb4fb6ac1b7054808159338054ff1b9a05 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2737,6 +2737,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2760,6 +2760,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException If the level is negative or greater than {@code 4} (i.e. not within {@code [0, 4]}). */ void sendOpLevel(byte level); diff --git a/patches/api/0383-Elder-Guardian-appearance-API.patch b/patches/api/0383-Elder-Guardian-appearance-API.patch index 14d8e806a9..cc6ca0b4b4 100644 --- a/patches/api/0383-Elder-Guardian-appearance-API.patch +++ b/patches/api/0383-Elder-Guardian-appearance-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Elder Guardian appearance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b886e9a59272ef6c8afa65f31a42bfc47f48b43a..a7dca9f902cd9916afd7a453288d669ab06c626c 100644 +index dbd27bbb4fb6ac1b7054808159338054ff1b9a05..9f196a6cec6c03f05e06b2e148cc5417a02ec98d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2935,6 +2935,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2958,6 +2958,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor); // Paper end - Teleport API diff --git a/patches/api/0391-Add-Player-Warden-Warning-API.patch b/patches/api/0391-Add-Player-Warden-Warning-API.patch index 664bc6ed45..a136ed4dae 100644 --- a/patches/api/0391-Add-Player-Warden-Warning-API.patch +++ b/patches/api/0391-Add-Player-Warden-Warning-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player Warden Warning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a7dca9f902cd9916afd7a453288d669ab06c626c..bdb63e445c1bc2e08bfa840d61cdeb2d8576bde7 100644 +index 9f196a6cec6c03f05e06b2e148cc5417a02ec98d..cb601a1558189e015a0447e1265bd8261cdf1d3f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2951,6 +2951,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2974,6 +2974,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param silent whether sound should be silenced */ void showElderGuardian(boolean silent); diff --git a/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch b/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch index 09ec1116c0..52afe262ab 100644 --- a/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch +++ b/patches/api/0399-Actually-mark-mc-experimental-API-as-such.patch @@ -7,10 +7,10 @@ upstream has inconsistent and incomplete minecraft experimental annotations diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105328c24a5 100644 +index 03b47012447430a350e152920f754d993d4023db..9b489cc0a7426ce80e4be27df99552354f770d04 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -471,6 +471,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -459,6 +459,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Orientable} */ @@ -19,7 +19,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 STRIPPED_BAMBOO_BLOCK(14799, Orientable.class), /** * BlockData: {@link Orientable} -@@ -893,6 +895,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -865,6 +867,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Fence} */ @@ -28,7 +28,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_FENCE(17207, Fence.class), /** * BlockData: {@link Fence} -@@ -1932,6 +1936,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -1904,6 +1908,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Switch} */ @@ -37,7 +37,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_BUTTON(21810, Switch.class), /** * BlockData: {@link Switch} -@@ -1994,6 +2000,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -1964,6 +1970,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Powerable} */ @@ -46,7 +46,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_PRESSURE_PLATE(26740, Powerable.class), /** * BlockData: {@link Powerable} -@@ -2044,6 +2052,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2012,6 +2020,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Door} */ @@ -55,7 +55,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_DOOR(19971, Door.class), /** * BlockData: {@link Door} -@@ -2094,6 +2104,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2060,6 +2070,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link TrapDoor} */ @@ -64,7 +64,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_TRAPDOOR(9174, TrapDoor.class), /** * BlockData: {@link TrapDoor} -@@ -2140,6 +2152,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2104,6 +2116,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Gate} */ @@ -73,7 +73,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_FENCE_GATE(14290, Gate.class), /** * BlockData: {@link Gate} -@@ -2194,7 +2208,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2154,7 +2168,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla DARK_OAK_CHEST_BOAT(8733, 1), MANGROVE_BOAT(20792, 1), MANGROVE_CHEST_BOAT(18572, 1), @@ -85,7 +85,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_CHEST_RAFT(20056, 1), /** * BlockData: {@link StructureBlock} -@@ -2334,6 +2352,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2292,6 +2310,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link Sign} */ @@ -94,7 +94,7 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 BAMBOO_SIGN(26139, 16, Sign.class), /** * BlockData: {@link Sign} -@@ -3151,6 +3171,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -3064,6 +3084,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla /** * BlockData: {@link WallSign} */ @@ -104,10 +104,10 @@ index 7ce5ac66e6d598c9ecffc52e5c75d80f644e8895..adb2416887cc3b544ec36c552bdf7105 /** * BlockData: {@link WallHangingSign} diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java -index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c197150601850a3f28b 100644 +index 6e8d2b35d8f33827396dbcfa817cd9c2f8ad83a6..13a53a91626d0e73a0b600ce8479304c5fbec01a 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java -@@ -77,13 +77,29 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -77,25 +77,55 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa BLOCK_BAMBOO_SAPLING_HIT("block.bamboo_sapling.hit"), BLOCK_BAMBOO_SAPLING_PLACE("block.bamboo_sapling.place"), BLOCK_BAMBOO_STEP("block.bamboo.step"), @@ -135,11 +135,10 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018 + @MinecraftExperimental // Paper + @ApiStatus.Experimental // Paper BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN("block.bamboo_wood_fence_gate.open"), - @MinecraftExperimental - @ApiStatus.Experimental -@@ -100,12 +116,26 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - @MinecraftExperimental - @ApiStatus.Experimental + BLOCK_BAMBOO_WOOD_HANGING_SIGN_BREAK("block.bamboo_wood_hanging_sign.break"), + BLOCK_BAMBOO_WOOD_HANGING_SIGN_FALL("block.bamboo_wood_hanging_sign.fall"), + BLOCK_BAMBOO_WOOD_HANGING_SIGN_HIT("block.bamboo_wood_hanging_sign.hit"), + BLOCK_BAMBOO_WOOD_HANGING_SIGN_PLACE("block.bamboo_wood_hanging_sign.place"), BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP("block.bamboo_wood_hanging_sign.step"), + @MinecraftExperimental // Paper + @ApiStatus.Experimental // Paper @@ -164,7 +163,7 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018 BLOCK_BAMBOO_WOOD_TRAPDOOR_OPEN("block.bamboo_wood_trapdoor.open"), BLOCK_BARREL_CLOSE("block.barrel.close"), BLOCK_BARREL_OPEN("block.barrel.open"), -@@ -412,10 +442,20 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -312,10 +342,20 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa BLOCK_HANGING_ROOTS_HIT("block.hanging_roots.hit"), BLOCK_HANGING_ROOTS_PLACE("block.hanging_roots.place"), BLOCK_HANGING_ROOTS_STEP("block.hanging_roots.step"), @@ -185,7 +184,7 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018 BLOCK_HANGING_SIGN_STEP("block.hanging_sign.step"), BLOCK_HONEY_BLOCK_BREAK("block.honey_block.break"), BLOCK_HONEY_BLOCK_FALL("block.honey_block.fall"), -@@ -551,11 +591,23 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -451,11 +491,23 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa BLOCK_NOTE_BLOCK_GUITAR("block.note_block.guitar"), BLOCK_NOTE_BLOCK_HARP("block.note_block.harp"), BLOCK_NOTE_BLOCK_HAT("block.note_block.hat"), @@ -209,49 +208,11 @@ index 762b0d9ba22a1012ebe5ea77b6aef909fddc0403..55b8d67af1f75207cac36c1971506018 BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE("block.note_block.imitate.zombie"), BLOCK_NOTE_BLOCK_IRON_XYLOPHONE("block.note_block.iron_xylophone"), BLOCK_NOTE_BLOCK_PLING("block.note_block.pling"), -@@ -830,26 +882,37 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"), - ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_DASH("entity.camel.dash"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_DASH_READY("entity.camel.dash_ready"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_DEATH("entity.camel.death"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_EAT("entity.camel.eat"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_HURT("entity.camel.hurt"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_SADDLE("entity.camel.saddle"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_SIT("entity.camel.sit"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_STAND("entity.camel.stand"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_STEP("entity.camel.step"), - @MinecraftExperimental -+ @ApiStatus.Experimental // Paper - ENTITY_CAMEL_STEP_SAND("entity.camel.step_sand"), - ENTITY_CAT_AMBIENT("entity.cat.ambient"), - ENTITY_CAT_BEG_FOR_FOOD("entity.cat.beg_for_food"), diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index e8206aa4cb574ee629f375a85acf597ae164a1c3..30f9e5e28edd5c267cc1ddef4aa5eac1bdc14a36 100644 +index 9257a5530264195260becedf73d291488c29d176..1024aff5bc31372256903f4f982805a95c3cb2a1 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -149,6 +149,8 @@ public interface Tag extends Keyed { +@@ -150,6 +150,8 @@ public interface Tag extends Keyed { /** * Vanilla block tag representing all bamboo blocks. */ @@ -260,7 +221,7 @@ index e8206aa4cb574ee629f375a85acf597ae164a1c3..30f9e5e28edd5c267cc1ddef4aa5eac1 Tag BAMBOO_BLOCKS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("bamboo_blocks"), Material.class); /** * Vanilla block tag representing all banner blocks. -@@ -768,6 +770,8 @@ public interface Tag extends Keyed { +@@ -792,6 +794,8 @@ public interface Tag extends Keyed { /** * Vanilla item tag representing all books that may be placed on bookshelves. */ @@ -269,7 +230,7 @@ index e8206aa4cb574ee629f375a85acf597ae164a1c3..30f9e5e28edd5c267cc1ddef4aa5eac1 Tag ITEMS_BOOKSHELF_BOOKS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("bookshelf_books"), Material.class); /** * Vanilla item tag representing all items that may be placed in beacons. -@@ -788,6 +792,8 @@ public interface Tag extends Keyed { +@@ -812,6 +816,8 @@ public interface Tag extends Keyed { /** * Vanilla item tag representing all hanging signs. */ diff --git a/patches/api/0400-fix-Instruments.patch b/patches/api/0400-fix-Instruments.patch index 79a34a6fe1..6c1d815b5b 100644 --- a/patches/api/0400-fix-Instruments.patch +++ b/patches/api/0400-fix-Instruments.patch @@ -7,10 +7,10 @@ Add missing instrument enums fix some wrong javadocs diff --git a/src/main/java/org/bukkit/Instrument.java b/src/main/java/org/bukkit/Instrument.java -index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f418cdd3a5 100644 +index de976be7132d05506fde7a839cac3954b0dd8da4..642feb8b4578e6dbd2bf78d859283d20f877051f 100644 --- a/src/main/java/org/bukkit/Instrument.java +++ b/src/main/java/org/bukkit/Instrument.java -@@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; +@@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; public enum Instrument { /** @@ -19,7 +19,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4 */ PIANO(0x0), /** -@@ -22,7 +22,7 @@ public enum Instrument { +@@ -21,7 +21,7 @@ public enum Instrument { */ SNARE_DRUM(0x2), /** @@ -28,52 +28,40 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4 * block. */ STICKS(0x3), -@@ -81,50 +81,48 @@ public enum Instrument { +@@ -78,38 +78,36 @@ public enum Instrument { + /** + * Zombie is normally played when a Zombie Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - ZOMBIE, + ZOMBIE(0x10), // Paper /** * Skeleton is normally played when a Skeleton Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - SKELETON, + SKELETON(0x11), // Paper /** * Creeper is normally played when a Creeper Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - CREEPER, + CREEPER(0x12), // Paper /** * Dragon is normally played when a Dragon Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - DRAGON, + DRAGON(0x13), // Paper /** * Wither Skeleton is normally played when a Wither Skeleton Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - WITHER_SKELETON, + WITHER_SKELETON(0x14), // Paper /** * Piglin is normally played when a Piglin Head is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - PIGLIN, + PIGLIN(0x15), // Paper /** * Custom Sound is normally played when a Player Head with the required data is on top of the note block. */ - @MinecraftExperimental - @ApiStatus.Experimental - CUSTOM_HEAD; + CUSTOM_HEAD(0x16); // Paper @@ -87,7 +75,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4 private Instrument(final int type) { this.type = (byte) type; -@@ -132,9 +130,8 @@ public enum Instrument { +@@ -117,9 +115,8 @@ public enum Instrument { /** * @return The type ID of this instrument. @@ -98,7 +86,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4 public byte getType() { return this.type; } -@@ -144,9 +141,8 @@ public enum Instrument { +@@ -129,9 +126,8 @@ public enum Instrument { * * @param type The type ID * @return The instrument @@ -110,7 +98,7 @@ index 8f70d86a1d39351424335842c38625d42cfbdfb8..271fb4d41909654b87519edba1c1d4f4 public static Instrument getByType(final byte type) { return BY_DATA.get(type); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bdb63e445c1bc2e08bfa840d61cdeb2d8576bde7..fabe9a415c88d3669c7b09e4d7c2453c0f2edeff 100644 +index cb601a1558189e015a0447e1265bd8261cdf1d3f..d29df91c63ea83ee2e26bf1ba7639927eda19318 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -393,9 +393,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0402-Add-Sneaking-API-for-Entities.patch b/patches/api/0402-Add-Sneaking-API-for-Entities.patch index 057cb23cad..ce44f889a6 100644 --- a/patches/api/0402-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0402-Add-Sneaking-API-for-Entities.patch @@ -35,7 +35,7 @@ index 3f3ea5bb6b3ea6f55b5cd699f1c01ac159619add..a2a423d4e4c2702ba5967223cab0432d * Get the category of spawn to which this entity belongs. * diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index fabe9a415c88d3669c7b09e4d7c2453c0f2edeff..7627cc0c25fc37cf914befda49ce83eeda9bfbef 100644 +index d29df91c63ea83ee2e26bf1ba7639927eda19318..63558eb98a970c4a59ae78daba9d6c9a61965797 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -296,6 +296,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0405-Flying-Fall-Damage-API.patch b/patches/api/0405-Flying-Fall-Damage-API.patch index c779db5b39..dfbeb96208 100644 --- a/patches/api/0405-Flying-Fall-Damage-API.patch +++ b/patches/api/0405-Flying-Fall-Damage-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7627cc0c25fc37cf914befda49ce83eeda9bfbef..1c79a556c2267b5d87d5469123818e270840a684 100644 +index 63558eb98a970c4a59ae78daba9d6c9a61965797..b0f863b34ba169a09df2a80beef6583b0bebe1e9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1509,6 +1509,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1532,6 +1532,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void setAllowFlight(boolean flight); diff --git a/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch index e56e16ce94..3936bb4a92 100644 --- a/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch +++ b/patches/api/0407-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Replace ItemFlag.HIDE_POTION_EFFECTS diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/org/bukkit/inventory/ItemFlag.java -index 69a66073bcaa10967b8736cbf35182b912c17d11..0d8d4154a156edd1092a7f5318d28336bbc57a9b 100644 +index 4e637420b9a39b822be19367a16da93f236549b3..3df1044fd791ae19576dbfd008cfcbb4e5651b05 100644 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java -@@ -31,7 +31,9 @@ public enum ItemFlag { +@@ -28,7 +28,9 @@ public enum ItemFlag { /** * Setting to show/hide potion effects, book and firework information, map * tooltips, patterns of banners, and enchantments of enchanted books. @@ -18,9 +18,9 @@ index 69a66073bcaa10967b8736cbf35182b912c17d11..0d8d4154a156edd1092a7f5318d28336 HIDE_POTION_EFFECTS, /** * Setting to show/hide dyes from colored leather armor. -@@ -43,4 +45,25 @@ public enum ItemFlag { - @MinecraftExperimental - @ApiStatus.Experimental +@@ -38,4 +40,25 @@ public enum ItemFlag { + * Setting to show/hide armor trim from armor. + */ HIDE_ARMOR_TRIM; + // Paper start + /** diff --git a/patches/api/0408-Win-Screen-API.patch b/patches/api/0408-Win-Screen-API.patch index f558002195..d6db6a7502 100644 --- a/patches/api/0408-Win-Screen-API.patch +++ b/patches/api/0408-Win-Screen-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 1c79a556c2267b5d87d5469123818e270840a684..88c4885569d2b8b22fce55601d50608ac8e9388c 100644 +index b0f863b34ba169a09df2a80beef6583b0bebe1e9..def31cdbe5765f5d05386753868e51c424cbfe9e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -878,6 +878,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -901,6 +901,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 0b7fd954c1..ec77b27ddd 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,7 +28,7 @@ index 3df8c60ab5cd1454660980883f80668d535b742b..37c3a00659ce21623be07317f4f6a45b +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..c207fd9b001dccaa71ba1615ffcdc093dd2b581c +index 0000000000000000000000000000000000000000..b663ef66dfe3f19a58f265de866d002d19517324 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,137 @@ @@ -48,12 +48,12 @@ index 0000000000000000000000000000000000000000..c207fd9b001dccaa71ba1615ffcdc093 + } + implementation("org.ow2.asm:asm:9.4") + implementation("commons-lang:commons-lang:2.6") -+ runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") -+ runtimeOnly("com.mysql:mysql-connector-j:8.0.32") ++ runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") ++ runtimeOnly("com.mysql:mysql-connector-j:8.0.33") + -+ 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") ++ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.2") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.10") ++ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.10") + + testImplementation("junit:junit:4.13.2") + testImplementation("org.hamcrest:hamcrest-library:1.3") @@ -171,7 +171,7 @@ index 0000000000000000000000000000000000000000..c207fd9b001dccaa71ba1615ffcdc093 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index d3490073bebae5918fe97895ead320c06c8358c7..0000000000000000000000000000000000000000 +index e1dfaf1e4cbe0ad18ba41c5eb5e465de0529090a..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,587 +0,0 @@ @@ -181,7 +181,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - org.spigotmc - spigot - jar -- 1.19.4-R0.1-SNAPSHOT +- 1.20-R0.1-SNAPSHOT - Spigot - https://www.spigotmc.org/ - @@ -197,7 +197,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - UTF-8 - unknown - git -- 1_19_R3 +- 1_20_R1 - 17 - 17 - @@ -251,19 +251,19 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - - com.mojang - authlib -- 3.17.30 +- 4.0.43 - compile - - - com.mojang - brigadier -- 1.0.18 +- 1.1.8 - compile - - - com.mojang - datafixerupper -- 6.0.6 +- 6.0.8 - compile - - @@ -405,39 +405,39 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - - org.xerial - sqlite-jdbc -- 3.41.2.2 +- 3.42.0.0 - runtime - - - com.mysql - mysql-connector-j -- 8.0.32 +- 8.0.33 - runtime - - - - org.apache.maven - maven-resolver-provider -- 3.8.5 +- 3.9.2 - runtime - - - org.apache.maven.resolver - maven-resolver-connector-basic -- 1.7.3 +- 1.9.10 - runtime - - - org.apache.maven.resolver - maven-resolver-transport-http -- 1.7.3 +- 1.9.10 - runtime - - - - org.jetbrains - annotations-java5 -- 23.0.0 +- 24.0.1 - provided - - @@ -578,7 +578,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - - net.md-5 - specialsource-maven-plugin -- 1.2.4 +- 1.2.5 - - - package @@ -623,7 +623,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-assembly-plugin -- 3.5.0 +- 3.6.0 - - - package @@ -668,7 +668,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-surefire-plugin -- 3.0.0 +- 3.1.0 - - ${basedir}/target/test-server - @@ -697,7 +697,7 @@ index d3490073bebae5918fe97895ead320c06c8358c7..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-checkstyle-plugin -- 3.2.1 +- 3.3.0 - - - test-compile diff --git a/patches/server/0002-Remap-fixes.patch b/patches/server/0002-Remap-fixes.patch index 4fe34ad62d..22510b7636 100644 --- a/patches/server/0002-Remap-fixes.patch +++ b/patches/server/0002-Remap-fixes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Remap fixes diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222a0d8f2af 100644 +index ad3035da44c6af2fa7cc53926f33526a43740313..e89fa618fa20e3e843d8de81629e6dc551777823 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java -@@ -265,9 +265,11 @@ public class BlockPos extends Vec3i { +@@ -278,9 +278,11 @@ public class BlockPos extends Vec3i { public static Iterable withinManhattan(BlockPos center, int rangeX, int rangeY, int rangeZ) { int i = rangeX + rangeY + rangeZ; @@ -23,7 +23,7 @@ index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222 return () -> { return new AbstractIterator() { private final BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos(); -@@ -282,7 +284,7 @@ public class BlockPos extends Vec3i { +@@ -295,7 +297,7 @@ public class BlockPos extends Vec3i { protected BlockPos computeNext() { if (this.zMirror) { this.zMirror = false; @@ -32,7 +32,7 @@ index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222 return this.cursor; } else { BlockPos blockPos; -@@ -308,7 +310,7 @@ public class BlockPos extends Vec3i { +@@ -321,7 +323,7 @@ public class BlockPos extends Vec3i { int k = this.currentDepth - Math.abs(i) - Math.abs(j); if (k <= rangeZ) { this.zMirror = k != 0; @@ -42,13 +42,13 @@ index 0612eef6d9a9cda81a8d761be2b5e9b094388270..77bf6865c6df829c5b5455d440cb2222 } diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java -index 1206ca32cadb98573938328f611b67162c700d84..d81f7eecb8204a974da14a75d1a7a23a6c071112 100644 +index 3ba785845a63e46a44fc48264d08c96bfc34ab8b..92bd58010e8c89e361e28aec59447349edbbc028 100644 --- a/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java +++ b/src/main/java/net/minecraft/world/entity/ai/behavior/BehaviorUtils.java @@ -173,11 +173,11 @@ public class BehaviorUtils { return optional.map((uuid) -> { - return ((ServerLevel) entity.level).getEntity(uuid); + return ((ServerLevel) entity.level()).getEntity(uuid); - }).map((entity) -> { + }).map((entity1) -> { // Paper - remap fix LivingEntity entityliving1; diff --git a/patches/server/0003-Build-system-changes.patch b/patches/server/0003-Build-system-changes.patch index d7d9430cdd..b1b50fe88d 100644 --- a/patches/server/0003-Build-system-changes.patch +++ b/patches/server/0003-Build-system-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes diff --git a/build.gradle.kts b/build.gradle.kts -index c207fd9b001dccaa71ba1615ffcdc093dd2b581c..ac679b0a66ce9676937a9971bf3ee2a935dd9acb 100644 +index b663ef66dfe3f19a58f265de866d002d19517324..2b67d93dd4d18235b28388dab3ee9bd57d2b816c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,10 +9,9 @@ plugins { @@ -19,8 +19,8 @@ index c207fd9b001dccaa71ba1615ffcdc093dd2b581c..ac679b0a66ce9676937a9971bf3ee2a9 implementation("org.ow2.asm:asm:9.4") + implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") - runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") @@ -23,6 +22,8 @@ dependencies { testImplementation("junit:junit:4.13.2") @@ -67,7 +67,7 @@ index c207fd9b001dccaa71ba1615ffcdc093dd2b581c..ac679b0a66ce9676937a9971bf3ee2a9 exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 23e88fde465853629c4371d1e1a44d1af493ca3e..5a39201392fefe8da495244fdbc380e882ec938f 100644 +index 58a237d85b05def8e52ca737869ee80c300d050c..f3412dbbb0f37d5625ab05cfd502189ab4a343c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -209,7 +209,7 @@ public class Main { @@ -78,7 +78,7 @@ index 23e88fde465853629c4371d1e1a44d1af493ca3e..5a39201392fefe8da495244fdbc380e8 + Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -21); + deadline.add(Calendar.DAY_OF_YEAR, -3); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 93046379d0cefd5d3236fc59e698809acdc18f80..774556a62eb240da42e84db4502e2ed43495be17 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/patches/server/0004-Test-changes.patch b/patches/server/0004-Test-changes.patch index eef7d22999..f084ccd6c1 100644 --- a/patches/server/0004-Test-changes.patch +++ b/patches/server/0004-Test-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Test changes diff --git a/build.gradle.kts b/build.gradle.kts -index ac679b0a66ce9676937a9971bf3ee2a935dd9acb..e0724559c70b5967123010e898e66e757b2b1b58 100644 +index 2b67d93dd4d18235b28388dab3ee9bd57d2b816c..69753539208112385e5057be560dc57071259b33 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,6 +12,7 @@ dependencies { @@ -14,11 +14,11 @@ index ac679b0a66ce9676937a9971bf3ee2a935dd9acb..e0724559c70b5967123010e898e66e75 implementation("org.ow2.asm:asm-commons:9.4") // Paper - ASM event executor generation + testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") - runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") diff --git a/src/test/java/io/papermc/paper/testing/DummyServer.java b/src/test/java/io/papermc/paper/testing/DummyServer.java new file mode 100644 -index 0000000000000000000000000000000000000000..c6503ff76f56bab5f383f0ca17d137155e9be447 +index 0000000000000000000000000000000000000000..e944e9dca13883c57e93e480ae5adfe51c342532 --- /dev/null +++ b/src/test/java/io/papermc/paper/testing/DummyServer.java @@ -0,0 +1,67 @@ @@ -74,7 +74,7 @@ index 0000000000000000000000000000000000000000..c6503ff76f56bab5f383f0ca17d13715 + + when(dummyServer.getLootTable(any(NamespacedKey.class))).thenAnswer(invocation -> { + final NamespacedKey key = invocation.getArgument(0, NamespacedKey.class); -+ return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key))); ++ return new org.bukkit.craftbukkit.CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key))); + }); + + when(dummyServer.getRegistry(any())).thenAnswer(invocation -> { @@ -119,7 +119,7 @@ index 0000000000000000000000000000000000000000..8dd0df8c2cc25d37a2590a0787268223 + } +} diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java -index a85d3606c09717906798f0e1716755d1dae0d760..eab3834dca7cf70468390584156b9a770bfb2a32 100644 +index 1b875fc4dc5550ffab21d11e0c2451a2b22250f9..c440dcf3cc2ddb8fd9094fe8495e820ae7797f5c 100644 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java @@ -53,6 +53,7 @@ public abstract class AbstractTestingBase { @@ -140,7 +140,7 @@ index a85d3606c09717906798f0e1716755d1dae0d760..eab3834dca7cf70468390584156b9a77 ImmutableList.Builder builder = ImmutableList.builder(); diff --git a/src/test/java/org/bukkit/support/DummyServer.java b/src/test/java/org/bukkit/support/DummyServer.java deleted file mode 100644 -index 946497353a64421592d2bae012c9a3cb874dd5b8..0000000000000000000000000000000000000000 +index e3197ea88b68de8f893f3fa986507b95b789645d..0000000000000000000000000000000000000000 --- a/src/test/java/org/bukkit/support/DummyServer.java +++ /dev/null @@ -1,127 +0,0 @@ @@ -240,7 +240,7 @@ index 946497353a64421592d2bae012c9a3cb874dd5b8..00000000000000000000000000000000 - @Override - public Object handle(DummyServer server, Object[] args) { - NamespacedKey key = (NamespacedKey) args[0]; -- return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootTables().get(CraftNamespacedKey.toMinecraft(key))); +- return new CraftLootTable(key, AbstractTestingBase.DATA_PACK.getLootData().getLootTable(CraftNamespacedKey.toMinecraft(key))); - } - } - ); diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch index d24f8ea89f..832c8f6a94 100644 --- a/patches/server/0005-Paper-config-files.patch +++ b/patches/server/0005-Paper-config-files.patch @@ -14,7 +14,7 @@ public org.spigotmc.SpigotWorldConfig getString(Ljava/lang/String;Ljava/lang/Str public net.minecraft.world.level.NaturalSpawner SPAWNING_CATEGORIES diff --git a/build.gradle.kts b/build.gradle.kts -index e0724559c70b5967123010e898e66e757b2b1b58..b0facb2b0b86fafbfd5776eba2e5bdb69cc1cbed 100644 +index 69753539208112385e5057be560dc57071259b33..bdd78d14723211bfec493126d603b99611cdf748 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,7 @@ dependencies { @@ -23,8 +23,8 @@ index e0724559c70b5967123010e898e66e757b2b1b58..b0facb2b0b86fafbfd5776eba2e5bdb6 testImplementation("org.mockito:mockito-core:4.9.0") // Paper - switch to mockito + implementation("org.spongepowered:configurate-yaml:4.1.2") // Paper - config files implementation("commons-lang:commons-lang:2.6") - runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.2") - runtimeOnly("com.mysql:mysql-connector-j:8.0.32") + runtimeOnly("org.xerial:sqlite-jdbc:3.42.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.0.33") diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..ef41cf3a7d1e6f2bfe81e0fb865d2f969bbc77c1 @@ -4421,7 +4421,7 @@ index 0000000000000000000000000000000000000000..70cc7b45e7355f6c8476a74a070f1266 + } +} diff --git a/src/main/java/net/minecraft/server/Main.java b/src/main/java/net/minecraft/server/Main.java -index 9b93b953f0747078d25289f129f82755089f94c9..aa054369cef3da4f90ce17788dcb9ca80dc98010 100644 +index e7240acad17dc9c0d93f2792cc0d90c1855ac436..35e7f8e7b19c217fa5f3f55abb0f8b9cd6b16f18 100644 --- a/src/main/java/net/minecraft/server/Main.java +++ b/src/main/java/net/minecraft/server/Main.java @@ -131,6 +131,10 @@ public class Main { @@ -4445,7 +4445,7 @@ index 9b93b953f0747078d25289f129f82755089f94c9..aa054369cef3da4f90ce17788dcb9ca8 String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName); LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath()); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3e1460b8331652c2f2e174ee41e3c728b2dbc753..2ed954f1fab3235a1d3fff2dd0d24c3b398b4d67 100644 +index 49eaa50c5e83e47022a1d126c62f6984f2d16f46..8eb949b43e8b403f3d98e36066cabd7cb9ab0e63 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -295,6 +295,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop> { +@@ -114,6 +114,7 @@ public abstract class Settings> { try { // CraftBukkit start - Don't attempt writing to file if it's read only if (path.toFile().exists() && !path.toFile().canWrite()) { @@ -4530,10 +4530,10 @@ index a02be624f7203d9465a8d62ccb734b436781f18c..5ac04182d32922dab00b81bc7f2ee132 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 37b2696e69719e44490116e4c4f6ab86c38043ed..ad011c4f328129e2e5eb6b1b1f5e1d282d1ec04a 100644 +index d40998a5330be64849a5bc2b49781b70ef149a0e..82435da47f0f7db73556310f84dc538a7c5f0809 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -230,7 +230,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -234,7 +234,7 @@ public class ServerLevel extends Level implements WorldGenLevel { // Holder holder = worlddimension.type(); // CraftBukkit - decompile error // Objects.requireNonNull(minecraftserver); // CraftBukkit - decompile error @@ -4543,10 +4543,10 @@ index 37b2696e69719e44490116e4c4f6ab86c38043ed..ad011c4f328129e2e5eb6b1b1f5e1d28 this.convertable = convertable_conversionsession; this.uuid = WorldUUID.getUUID(convertable_conversionsession.levelDirectory.path().toFile()); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 9a86fedb7ea4932590b86ef96785141489b03528..40deaa2463876659c0579b5273b5249760e8f8c0 100644 +index cda55e481ddbcc1de5478125c5db20ebba168e7d..bacd4d875642cd93c3185f788745dd73a3cfde8a 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java -@@ -156,6 +156,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -155,6 +155,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public final it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap ticksPerSpawnCategory = new it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap<>(); public boolean populating; public final org.spigotmc.SpigotWorldConfig spigotConfig; // Spigot @@ -4559,7 +4559,7 @@ index 9a86fedb7ea4932590b86ef96785141489b03528..40deaa2463876659c0579b5273b52497 public final SpigotTimings.WorldTimingsHandler timings; // Spigot public static BlockPos lastPhysicsProblem; // Spigot -@@ -173,8 +179,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -172,8 +178,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable { public abstract ResourceKey getTypeKey(); @@ -4571,7 +4571,7 @@ index 9a86fedb7ea4932590b86ef96785141489b03528..40deaa2463876659c0579b5273b52497 this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0ae7df422a58df7acb8e57e21d5e8ded592192ee..6e2a1ca2a1d6cb457c1eb70ce5c25f8287f5ccb9 100644 +index c1c575593b2470aeaf73ce6f9f45f4f7f9b16c04..9c82e4d2f5676808bb57c5e7dd19d0e7615ca884 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -903,6 +903,7 @@ public final class CraftServer implements Server { @@ -4583,7 +4583,7 @@ index 0ae7df422a58df7acb8e57e21d5e8ded592192ee..6e2a1ca2a1d6cb457c1eb70ce5c25f82 world.serverLevelData.setDifficulty(config.difficulty); world.setSpawnSettings(config.spawnMonsters, config.spawnAnimals); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 5a39201392fefe8da495244fdbc380e882ec938f..e8fb9e3454282ad328e6bc0d078142285d9cfa76 100644 +index f3412dbbb0f37d5625ab05cfd502189ab4a343c2..60ca15373b489941555315bf6fb311326670e7de 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -141,6 +141,19 @@ public class Main { @@ -4667,7 +4667,7 @@ index 0000000000000000000000000000000000000000..0396589795da1f83ddf62426236dde9a + } +} diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java -index eab3834dca7cf70468390584156b9a770bfb2a32..a616624a7beb35239be0fc2bb7fe60db1c673c2d 100644 +index c440dcf3cc2ddb8fd9094fe8495e820ae7797f5c..d1fd4cf65c31bc00d0bffa3123fc2223f1498a34 100644 --- a/src/test/java/org/bukkit/support/AbstractTestingBase.java +++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java @@ -62,6 +62,7 @@ public abstract class AbstractTestingBase { diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/server/0006-MC-Dev-fixes.patch index d8edf09358..a420971c5d 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/server/0006-MC-Dev-fixes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] MC Dev fixes diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index c400121d4956014a376760360180e5141013d702..b3e0495e0f242c96d4348438c0257c2045b801e5 100644 +index 2b7e2b7ecda6ac2b019c361163079fd747033719..90edfea7151f2ad259288545d512af7cd1b82f19 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java -@@ -357,7 +357,7 @@ public class Util { +@@ -358,7 +358,7 @@ public class Util { } public static Hash.Strategy identityStrategy() { @@ -18,10 +18,10 @@ index c400121d4956014a376760360180e5141013d702..b3e0495e0f242c96d4348438c0257c20 public static CompletableFuture> sequence(List> futures) { diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 77bf6865c6df829c5b5455d440cb2222a0d8f2af..819562d2c938fa05b8e8a00d1ae1f7c1fc9b00d5 100644 +index e89fa618fa20e3e843d8de81629e6dc551777823..2bb5e51f71cbf66819d198505aa4a5ecffd246c6 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java -@@ -370,12 +370,12 @@ public class BlockPos extends Vec3i { +@@ -383,12 +383,12 @@ public class BlockPos extends Vec3i { if (this.index == l) { return this.endOfData(); } else { @@ -40,10 +40,10 @@ index 77bf6865c6df829c5b5455d440cb2222a0d8f2af..819562d2c938fa05b8e8a00d1ae1f7c1 } }; diff --git a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -index 396d065805853318b0fed98b64b2e1ab0a022e51..a969cd46694ce3094b4a65cf188677d38ae72198 100644 +index fe671ee23a5d364e20571dede6fc6bca7d83e98c..baa88201c4d08fb4f32f1198e187d7ca138b0f0e 100644 --- a/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java +++ b/src/main/java/net/minecraft/core/registries/BuiltInRegistries.java -@@ -307,7 +307,7 @@ public class BuiltInRegistries { +@@ -314,7 +314,7 @@ public class BuiltInRegistries { LOADERS.put(resourceLocation, () -> { return initializer.run(registry); }); @@ -94,7 +94,7 @@ index 41d6569c00db3d467f6e90d33ebd261529b89f4c..5f051cb22ae77f4d8994b07ac5b963bd }; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2ed954f1fab3235a1d3fff2dd0d24c3b398b4d67..41a6756144a3b826d32ecb85a71d26761e25ec11 100644 +index 8eb949b43e8b403f3d98e36066cabd7cb9ab0e63..a9e30b7b3a666d83b3c595a7975693ccfcf3e8f9 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1775,7 +1775,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop SortedArraySet create(Comparator comparator) { diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 37a01cd6f616cac741d50066aaba21911a1ed3bb..36222d2140aa1151c30e095afc557ea7db91911f 100644 +index d6e25c7f5dc6c219e2590aa8b1ffd51a2120d50e..5e3c750b2ce30b4c89143c5dfbb7a90e861f169f 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -@@ -150,7 +150,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider +@@ -151,7 +151,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider @Override protected void customServerAiStep() { - this.level.getProfiler().push("camelBrain"); + this.level().getProfiler().push("camelBrain"); - Brain brain = this.getBrain(); + Brain brain = (Brain) this.getBrain(); // Paper - decompile fix - brain.tick((ServerLevel)this.level, this); - this.level.getProfiler().pop(); - this.level.getProfiler().push("camelActivityUpdate"); + brain.tick((ServerLevel)this.level(), this); + this.level().getProfiler().pop(); + this.level().getProfiler().push("camelActivityUpdate"); 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 872243700e982c97c8ef491684a447afc7a24bdf..c12b8831deb54deb191908ba8a769d4c78825d5b 100644 +index e8da5e51449d908de492b55dfa21e8d1108514fa..22eb0a8fc35baa04b34265b62aa29a71f3cc7343 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 -@@ -104,7 +104,7 @@ public class Frog extends Animal implements VariantHolder { +@@ -99,7 +99,7 @@ public class Frog extends Animal implements VariantHolder { @Override public Brain getBrain() { @@ -159,7 +159,7 @@ index 872243700e982c97c8ef491684a447afc7a24bdf..c12b8831deb54deb191908ba8a769d4c @Override diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java -index 64314cf4dc53a1a0a5f676fa00503858e0120dfa..45741410a13cffe3419e34b5607b048bbcf1c3ff 100644 +index 555b52e2d9a6d4db7a527cda46ba6acf711da697..98c41e87b644f79ebfd45af2e0d7b887a3f5d00b 100644 --- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java +++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java @@ -123,7 +123,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase { diff --git a/patches/server/0008-CB-fixes.patch b/patches/server/0008-CB-fixes.patch index d212022ee8..b00266aec5 100644 --- a/patches/server/0008-CB-fixes.patch +++ b/patches/server/0008-CB-fixes.patch @@ -17,10 +17,10 @@ Subject: [PATCH] CB fixes Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index ad011c4f328129e2e5eb6b1b1f5e1d282d1ec04a..3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9 100644 +index 82435da47f0f7db73556310f84dc538a7c5f0809..ebae711991a3ae35e35c2cffa8d928677c205492 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -294,7 +294,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -298,7 +298,7 @@ public class ServerLevel extends Level implements WorldGenLevel { long l = minecraftserver.getWorldData().worldGenOptions().seed(); @@ -30,7 +30,7 @@ index ad011c4f328129e2e5eb6b1b1f5e1d282d1ec04a..3bcbdf37ad9d76ec97ad3f20e7a683e2 if ((this.dimension() == Level.END && this.dimensionTypeRegistration().is(BuiltinDimensionTypes.END)) || env == org.bukkit.World.Environment.THE_END) { // CraftBukkit - Allow to create EnderDragonBattle in default and custom END this.dragonFight = new EndDragonFight(this, this.serverLevelData.worldGenOptions().seed(), this.serverLevelData.endDragonFightData()); // CraftBukkit diff --git a/src/main/java/net/minecraft/world/entity/Marker.java b/src/main/java/net/minecraft/world/entity/Marker.java -index 15ec0d085d09d9a70eb6cdd47f9e4587dd1402b5..9cd0f0628a3f533229d25d9ccd0d381364f4957c 100644 +index 299d0755b782a26af6c6acc00e3d8ab0269348a9..70791a052c1ec8f41d7f1e65c33eee4f0b1b53b2 100644 --- a/src/main/java/net/minecraft/world/entity/Marker.java +++ b/src/main/java/net/minecraft/world/entity/Marker.java @@ -49,8 +49,8 @@ public class Marker extends Entity { @@ -45,16 +45,16 @@ index 15ec0d085d09d9a70eb6cdd47f9e4587dd1402b5..9cd0f0628a3f533229d25d9ccd0d3813 @Override diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -index 36222d2140aa1151c30e095afc557ea7db91911f..9d4a3041ecae2adda40134710eb1edb8571228aa 100644 +index 5e3c750b2ce30b4c89143c5dfbb7a90e861f169f..1769045a053f7f4576099fb21686d84b682194f5 100644 --- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java +++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java -@@ -441,9 +441,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider +@@ -446,9 +446,9 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Rider } @Override - protected void actuallyHurt(DamageSource source, float amount) { + protected boolean damageEntity0(DamageSource source, float amount) { // Paper - fix CB method rename issue - this.standUpPanic(); + this.standUpInstantly(); - super.actuallyHurt(source, amount); + return super.damageEntity0(source, amount); // Paper - fix CB method rename issue } @@ -83,20 +83,20 @@ index 161ad6ab1443b2ce33a2d7d91d189c855db0453b..15a9736a870055d639d03063c7cf67fd this.registryAccess = registryManager; this.structureTemplateManager = structureTemplateManager; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 6e2a1ca2a1d6cb457c1eb70ce5c25f8287f5ccb9..1177d64793be0d82c99dcd9e037c3e4cef2f74d3 100644 +index 9c82e4d2f5676808bb57c5e7dd19d0e7615ca884..9874d0d3ae16e79f2598d9c1f93a9b7cc40f56b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -2326,7 +2326,13 @@ public final class CraftServer implements Server { +@@ -2324,7 +2324,13 @@ public final class CraftServer implements Server { Validate.notNull(key, "NamespacedKey cannot be null"); - LootTables registry = this.getServer().getLootTables(); -- return new CraftLootTable(key, registry.get(CraftNamespacedKey.toMinecraft(key))); + LootDataManager registry = this.getServer().getLootData(); +- return new CraftLootTable(key, registry.getLootTable(CraftNamespacedKey.toMinecraft(key))); + // Paper start - honor method contract + final ResourceLocation lootTableKey = CraftNamespacedKey.toMinecraft(key); -+ if (!registry.getIds().contains(lootTableKey)) { ++ if (registry.getLootTable(lootTableKey) == net.minecraft.world.level.storage.loot.LootTable.EMPTY) { + return null; + } -+ return new CraftLootTable(key, registry.get(lootTableKey)); ++ return new CraftLootTable(key, registry.getLootTable(lootTableKey)); + // Paper end } diff --git a/patches/server/0009-MC-Utils.patch b/patches/server/0009-MC-Utils.patch index 63e12ee0a8..a7da87ebce 100644 --- a/patches/server/0009-MC-Utils.patch +++ b/patches/server/0009-MC-Utils.patch @@ -5434,10 +5434,10 @@ index 0000000000000000000000000000000000000000..808d1449ac44ae86a650932365081fba + } +} diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index b3e0495e0f242c96d4348438c0257c2045b801e5..c5fb6adb353538360ef420faee41565626eea1dc 100644 +index 90edfea7151f2ad259288545d512af7cd1b82f19..01eb418bde1dadbbfa30954f81281199b2fec778 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java -@@ -116,7 +116,7 @@ public class Util { +@@ -117,7 +117,7 @@ public class Util { } public static long getNanos() { @@ -5447,10 +5447,10 @@ index b3e0495e0f242c96d4348438c0257c2045b801e5..c5fb6adb353538360ef420faee415656 public static long getEpochMillis() { diff --git a/src/main/java/net/minecraft/core/BlockPos.java b/src/main/java/net/minecraft/core/BlockPos.java -index 819562d2c938fa05b8e8a00d1ae1f7c1fc9b00d5..4dffce4dc3434ef6adef7dc3cfac867ad89d9a5d 100644 +index 2bb5e51f71cbf66819d198505aa4a5ecffd246c6..1834f3efb05fd70c8c1c67733bff514829ae1154 100644 --- a/src/main/java/net/minecraft/core/BlockPos.java +++ b/src/main/java/net/minecraft/core/BlockPos.java -@@ -521,6 +521,7 @@ public class BlockPos extends Vec3i { +@@ -562,6 +562,7 @@ public class BlockPos extends Vec3i { } } @@ -5458,7 +5458,7 @@ index 819562d2c938fa05b8e8a00d1ae1f7c1fc9b00d5..4dffce4dc3434ef6adef7dc3cfac867a @Override public BlockPos.MutableBlockPos setX(int i) { super.setX(i); -@@ -538,6 +539,7 @@ public class BlockPos extends Vec3i { +@@ -579,6 +580,7 @@ public class BlockPos extends Vec3i { super.setZ(i); return this; } @@ -5504,7 +5504,7 @@ index e6c4379b0fd7c1338e1713281cd9515cb54acecb..a63e7ee5c42bd51312155feab31c6ec4 throw new SkipPacketException(var10); } else { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 41a6756144a3b826d32ecb85a71d26761e25ec11..5725631835ea68802c75934cd85d5c1b1a78d358 100644 +index a9e30b7b3a666d83b3c595a7975693ccfcf3e8f9..9b34e401040a45393afbb9e984ff421a89f744a0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -296,6 +296,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop S spin(Function serverFactory) { AtomicReference atomicreference = new AtomicReference(); -@@ -931,6 +932,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop CHUNK_STATUSES = ChunkStatus.getStatusList(); private final AtomicReferenceArray>> futures; private final LevelHeightAccessor levelHeightAccessor; - private volatile CompletableFuture> fullChunkFuture; @@ -5571,8 +5571,8 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 private CompletableFuture chunkToSave; @Nullable private final DebugBuffer chunkToSaveHistory; -@@ -73,6 +73,18 @@ public class ChunkHolder { - private boolean resendLight; +@@ -70,6 +70,18 @@ public class ChunkHolder { + private boolean wasAccessibleSinceLastSave; private CompletableFuture pendingFullStateConfirmation; + private final ChunkMap chunkMap; // Paper @@ -5590,7 +5590,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) { this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size()); this.fullChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE; -@@ -93,8 +105,23 @@ public class ChunkHolder { +@@ -90,8 +102,23 @@ public class ChunkHolder { this.queueLevel = this.oldTicketLevel; this.setTicketLevel(level); this.changedBlocksPerSection = new ShortSet[world.getSectionsCount()]; @@ -5614,8 +5614,8 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 // CraftBukkit start public LevelChunk getFullChunkNow() { // Note: We use the oldTicketLevel for isLoaded checks. -@@ -119,20 +146,20 @@ public class ChunkHolder { - return ChunkHolder.getStatus(this.ticketLevel).isOrAfter(leastStatus) ? this.getFutureIfPresentUnchecked(leastStatus) : ChunkHolder.UNLOADED_CHUNK_FUTURE; +@@ -116,20 +143,20 @@ public class ChunkHolder { + return ChunkLevel.generationStatus(this.ticketLevel).isOrAfter(leastStatus) ? this.getFutureIfPresentUnchecked(leastStatus) : ChunkHolder.UNLOADED_CHUNK_FUTURE; } - public CompletableFuture> getTickingChunkFuture() { @@ -5639,7 +5639,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 CompletableFuture> completablefuture = this.getTickingChunkFuture(); Either either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error -@@ -140,7 +167,7 @@ public class ChunkHolder { +@@ -137,7 +164,7 @@ public class ChunkHolder { } @Nullable @@ -5648,7 +5648,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 CompletableFuture> completablefuture = this.getFullChunkFuture(); Either either = (Either) completablefuture.getNow(null); // CraftBukkit - decompile error -@@ -161,6 +188,21 @@ public class ChunkHolder { +@@ -158,6 +185,21 @@ public class ChunkHolder { return null; } @@ -5670,7 +5670,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 @Nullable public ChunkAccess getLastAvailable() { for (int i = ChunkHolder.CHUNK_STATUSES.size() - 1; i >= 0; --i) { -@@ -179,7 +221,7 @@ public class ChunkHolder { +@@ -176,7 +218,7 @@ public class ChunkHolder { return null; } @@ -5679,8 +5679,8 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 return this.chunkToSave; } -@@ -360,11 +402,11 @@ public class ChunkHolder { - return ChunkHolder.getFullChunkStatus(this.ticketLevel); +@@ -364,11 +406,11 @@ public class ChunkHolder { + return ChunkLevel.fullStatus(this.ticketLevel); } - public ChunkPos getPos() { @@ -5693,13 +5693,13 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 return this.ticketLevel; } -@@ -453,14 +495,31 @@ public class ChunkHolder { +@@ -457,14 +499,31 @@ public class ChunkHolder { this.wasAccessibleSinceLastSave |= flag3; if (!flag2 && flag3) { + int expectCreateCount = ++this.fullChunkCreateCount; // Paper this.fullChunkFuture = chunkStorage.prepareAccessibleChunk(this); - this.scheduleFullChunkPromotion(chunkStorage, this.fullChunkFuture, executor, ChunkHolder.FullChunkStatus.BORDER); + this.scheduleFullChunkPromotion(chunkStorage, this.fullChunkFuture, executor, FullChunkStatus.FULL); + // Paper start - cache ticking ready status + this.fullChunkFuture.thenAccept(either -> { + final Optional left = either.left(); @@ -5724,11 +5724,11 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 + this.isFullChunkReady = false; // Paper - cache ticking ready status } - boolean flag4 = playerchunk_state.isOrAfter(ChunkHolder.FullChunkStatus.TICKING); -@@ -469,11 +528,25 @@ public class ChunkHolder { + boolean flag4 = fullchunkstatus.isOrAfter(FullChunkStatus.BLOCK_TICKING); +@@ -473,11 +532,25 @@ public class ChunkHolder { if (!flag4 && flag5) { this.tickingChunkFuture = chunkStorage.prepareTickingChunk(this); - this.scheduleFullChunkPromotion(chunkStorage, this.tickingChunkFuture, executor, ChunkHolder.FullChunkStatus.TICKING); + this.scheduleFullChunkPromotion(chunkStorage, this.tickingChunkFuture, executor, FullChunkStatus.BLOCK_TICKING); + // Paper start - cache ticking ready status + this.tickingChunkFuture.thenAccept(either -> { + either.ifLeft(chunk -> { @@ -5752,10 +5752,10 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 this.tickingChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE; } -@@ -487,11 +560,24 @@ public class ChunkHolder { +@@ -491,11 +564,24 @@ public class ChunkHolder { - this.entityTickingChunkFuture = chunkStorage.prepareEntityTickingChunk(this.pos); - this.scheduleFullChunkPromotion(chunkStorage, this.entityTickingChunkFuture, executor, ChunkHolder.FullChunkStatus.ENTITY_TICKING); + this.entityTickingChunkFuture = chunkStorage.prepareEntityTickingChunk(this); + this.scheduleFullChunkPromotion(chunkStorage, this.entityTickingChunkFuture, executor, FullChunkStatus.ENTITY_TICKING); + // Paper start - cache ticking ready status + this.entityTickingChunkFuture.thenAccept(either -> { + either.ifLeft(chunk -> { @@ -5778,7 +5778,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 this.entityTickingChunkFuture = ChunkHolder.UNLOADED_LEVEL_CHUNK_FUTURE; } -@@ -608,4 +694,18 @@ public class ChunkHolder { +@@ -593,4 +679,18 @@ public class ChunkHolder { } }; } @@ -5798,7 +5798,7 @@ index 68583e2f293e6e4d2f9f3345b6cf1ea050a210b6..941ca1b44c7cac656bdd76c7095887b1 + // Paper end } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef67d3d13c 100644 +index de34a02c44043b6f90806eeef94a232e6b3c845b..c943e64d70bab240f8dc733e78a185172664c5e4 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -68,6 +68,7 @@ import net.minecraft.network.protocol.game.ClientboundSetChunkCacheCenterPacket; @@ -5809,7 +5809,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.server.network.ServerPlayerConnection; import net.minecraft.util.CsvOutput; -@@ -176,6 +177,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -175,6 +176,56 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider }; // CraftBukkit end @@ -5866,7 +5866,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef public ChunkMap(ServerLevel world, LevelStorageSource.LevelStorageAccess session, DataFixer dataFixer, StructureTemplateManager structureTemplateManager, Executor executor, BlockableEventLoop mainThreadExecutor, LightChunkGetter chunkProvider, ChunkGenerator chunkGenerator, ChunkProgressListener worldGenerationProgressListener, ChunkStatusUpdateListener chunkStatusChangeListener, Supplier persistentStateManagerFactory, int viewDistance, boolean dsync) { super(session.getDimensionPath(world.dimension()).resolve("region"), dataFixer, dsync); this.visibleChunkMap = this.updatingChunkMap.clone(); -@@ -229,6 +280,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -228,6 +279,10 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.overworldDataStorage = persistentStateManagerFactory; this.poiManager = new PoiManager(path.resolve("poi"), dataFixer, dsync, iregistrycustom, world); this.setViewDistance(viewDistance); @@ -5877,7 +5877,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } protected ChunkGenerator generator() { -@@ -326,6 +381,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -324,6 +379,15 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } } @@ -5885,14 +5885,15 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef + public final int getEffectiveViewDistance() { + // TODO this needs to be checked on update + // Mojang currently sets it to +1 of the configured view distance. So subtract one to get the one we really want. -+ return this.viewDistance - 1; ++ //TODO check if +0 is correct now ++ return this.viewDistance; + } + // Paper end + - private CompletableFuture, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkPos centerChunk, int margin, IntFunction distanceToStatus) { - List>> list = new ArrayList(); - List list1 = new ArrayList(); -@@ -413,9 +476,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider + private CompletableFuture, ChunkHolder.ChunkLoadingFailure>> getChunkRangeFuture(ChunkHolder centerChunk, int margin, IntFunction distanceToStatus) { + if (margin == 0) { + ChunkStatus chunkstatus = (ChunkStatus) distanceToStatus.apply(0); +@@ -420,9 +484,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider }; stringbuilder.append("Updating:").append(System.lineSeparator()); @@ -5904,7 +5905,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef CrashReport crashreport = CrashReport.forThrowable(exception, "Chunk loading"); CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Chunk loading"); -@@ -457,8 +520,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -464,8 +528,14 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider holder.setTicketLevel(level); } else { holder = new ChunkHolder(new ChunkPos(pos), level, this.level, this.lightEngine, this.queueSorter, this); @@ -5919,7 +5920,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef this.updatingChunkMap.put(pos, holder); this.modified = true; } -@@ -480,7 +549,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -487,7 +557,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider protected void saveAllChunks(boolean flush) { if (flush) { @@ -5928,7 +5929,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef MutableBoolean mutableboolean = new MutableBoolean(); do { -@@ -509,7 +578,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -516,7 +586,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider }); this.flushWorker(); } else { @@ -5937,7 +5938,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } } -@@ -528,7 +597,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -535,7 +605,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public boolean hasWork() { @@ -5946,7 +5947,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } private void processUnloads(BooleanSupplier shouldKeepTicking) { -@@ -539,6 +608,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -546,6 +616,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider ChunkHolder playerchunk = (ChunkHolder) this.updatingChunkMap.remove(j); if (playerchunk != null) { @@ -5954,7 +5955,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef this.pendingUnloads.put(j, playerchunk); this.modified = true; ++i; -@@ -556,7 +626,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -563,7 +634,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } int l = 0; @@ -5963,7 +5964,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef while (l < 20 && shouldKeepTicking.getAsBoolean() && objectiterator.hasNext()) { if (this.saveChunkIfNeeded((ChunkHolder) objectiterator.next())) { -@@ -574,7 +644,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -581,7 +652,11 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider if (completablefuture1 != completablefuture) { this.scheduleUnload(pos, holder); } else { @@ -5976,7 +5977,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef if (ichunkaccess instanceof LevelChunk) { ((LevelChunk) ichunkaccess).setLoaded(false); } -@@ -590,7 +664,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -597,7 +672,9 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.lightEngine.tryScheduleUpdate(); this.progressListener.onStatusChange(ichunkaccess.getPos(), (ChunkStatus) null); this.chunkSaveCooldowns.remove(ichunkaccess.getPos().toLong()); @@ -5987,16 +5988,16 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } }; -@@ -971,7 +1047,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -991,7 +1068,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider this.viewDistance = j; - this.distanceManager.updatePlayerTickets(this.viewDistance + 1); + this.distanceManager.updatePlayerTickets(this.viewDistance); - ObjectIterator objectiterator = this.updatingChunkMap.values().iterator(); + Iterator objectiterator = io.papermc.paper.chunk.system.ChunkSystem.getUpdatingChunkHolders(this.level).iterator(); // Paper while (objectiterator.hasNext()) { ChunkHolder playerchunk = (ChunkHolder) objectiterator.next(); -@@ -1014,7 +1090,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1034,7 +1111,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } public int size() { @@ -6005,7 +6006,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } public DistanceManager getDistanceManager() { -@@ -1022,19 +1098,19 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1042,19 +1119,19 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } protected Iterable getChunks() { @@ -6030,7 +6031,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef Optional optional = Optional.ofNullable(playerchunk.getLastAvailable()); Optional optional1 = optional.flatMap((ichunkaccess) -> { return ichunkaccess instanceof LevelChunk ? Optional.of((LevelChunk) ichunkaccess) : Optional.empty(); -@@ -1160,6 +1236,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1180,6 +1257,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider if (!flag1) { this.distanceManager.addPlayer(SectionPos.of((EntityAccess) player), player); } @@ -6038,7 +6039,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } else { SectionPos sectionposition = player.getLastSectionPos(); -@@ -1167,6 +1244,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1187,6 +1265,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider if (!flag2) { this.distanceManager.removePlayer(sectionposition, player); } @@ -6046,7 +6047,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } for (int k = i - this.viewDistance - 1; k <= i + this.viewDistance + 1; ++k) { -@@ -1279,6 +1357,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1300,6 +1379,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider } } @@ -6055,7 +6056,7 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef } @Override -@@ -1515,7 +1595,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider +@@ -1536,7 +1617,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider private class ChunkDistanceManager extends DistanceManager { protected ChunkDistanceManager(Executor workerExecutor, Executor mainThreadExecutor) { @@ -6065,10 +6066,10 @@ index 9fe2d44fbfb648c342daf0b8f0820090785b8bf7..714b36e4942fda9d6c8a202b9e7a34ef @Override diff --git a/src/main/java/net/minecraft/server/level/DistanceManager.java b/src/main/java/net/minecraft/server/level/DistanceManager.java -index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a813824e6f2c2 100644 +index 1bfa33253a154c66dc8b7e476c777b74cda8999f..d8b83c8c89143d78620f812c491a1950e3218eb1 100644 --- a/src/main/java/net/minecraft/server/level/DistanceManager.java +++ b/src/main/java/net/minecraft/server/level/DistanceManager.java -@@ -60,8 +60,9 @@ public abstract class DistanceManager { +@@ -56,8 +56,9 @@ public abstract class DistanceManager { final Executor mainThreadExecutor; private long ticketTickCounter; private int simulationDistance = 10; @@ -6079,7 +6080,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138 Objects.requireNonNull(mainThreadExecutor); ProcessorHandle mailbox = ProcessorHandle.of("player ticket throttler", mainThreadExecutor::execute); ChunkTaskPriorityQueueSorter chunktaskqueuesorter = new ChunkTaskPriorityQueueSorter(ImmutableList.of(mailbox), workerExecutor, 4); -@@ -70,6 +71,7 @@ public abstract class DistanceManager { +@@ -66,6 +67,7 @@ public abstract class DistanceManager { this.ticketThrottlerInput = chunktaskqueuesorter.getProcessor(mailbox, true); this.ticketThrottlerReleaser = chunktaskqueuesorter.getReleaseProcessor(mailbox); this.mainThreadExecutor = mainThreadExecutor; @@ -6087,7 +6088,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138 } protected void purgeStaleTickets() { -@@ -319,6 +321,12 @@ public abstract class DistanceManager { +@@ -315,6 +317,12 @@ public abstract class DistanceManager { this.playerTicketManager.updateViewDistance(viewDistance); } @@ -6100,7 +6101,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138 public void updateSimulationDistance(int simulationDistance) { if (simulationDistance != this.simulationDistance) { this.simulationDistance = simulationDistance; -@@ -382,7 +390,7 @@ public abstract class DistanceManager { +@@ -378,7 +386,7 @@ public abstract class DistanceManager { } public void removeTicketsOnClosing() { @@ -6110,7 +6111,7 @@ index 6c98676827ceb6999f340fa2b06a0b3e1cb4cae2..fbe62a31ab199d83a1db0a4e0b1a8138 while (objectiterator.hasNext()) { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e6919ea09 100644 +index 2bc9afcd46f2d42e8bab1cf29defe53d00b2bc8b..07e1c75c0df7362ced6cffd125aec4fd553a9243 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -51,6 +51,7 @@ import net.minecraft.world.level.storage.LevelStorageSource; @@ -6403,7 +6404,7 @@ index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e @Nullable @Override public ChunkAccess getChunk(int x, int z, ChunkStatus leastStatus, boolean create) { -@@ -328,6 +597,12 @@ public class ServerChunkCache extends ChunkSource { +@@ -329,6 +598,12 @@ public class ServerChunkCache extends ChunkSource { } } @@ -6417,10 +6418,10 @@ index b323b8329f534b7020dd595b8b15197c29939590..794ad2dbaea2555d4557124e9d942d3e ChunkHolder playerchunk = this.getVisibleChunkIfPresent(pos); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9..aa164a81d072d9390fa1400120e801979e5d74d0 100644 +index ebae711991a3ae35e35c2cffa8d928677c205492..7be97441aed66fa3a21d13ad2211b3e0e08120c0 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -173,6 +173,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; +@@ -176,6 +176,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; import org.bukkit.event.world.GenericGameEvent; import org.bukkit.event.world.TimeSkipEvent; // CraftBukkit end @@ -6428,7 +6429,7 @@ index 3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9..aa164a81d072d9390fa1400120e80197 public class ServerLevel extends Level implements WorldGenLevel { -@@ -224,6 +225,98 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -228,6 +229,98 @@ public class ServerLevel extends Level implements WorldGenLevel { return convertable.dimensionType; } @@ -6525,10 +6526,10 @@ index 3bcbdf37ad9d76ec97ad3f20e7a683e267441ed9..aa164a81d072d9390fa1400120e80197 + // Paper end + // Add env and gen to constructor, IWorldDataServer -> WorldDataServer - public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { + public ServerLevel(MinecraftServer minecraftserver, Executor executor, LevelStorageSource.LevelStorageAccess convertable_conversionsession, PrimaryLevelData iworlddataserver, ResourceKey resourcekey, LevelStem worlddimension, ChunkProgressListener worldloadlistener, boolean flag, long i, List list, boolean flag1, @Nullable RandomSequences randomsequences, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider) { // IRegistryCustom.Dimension iregistrycustom_dimension = minecraftserver.registryAccess(); // CraftBukkit - decompile error diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index fcc9aaa87b4092e838b6523e15347f01b38b8943..e8f748a7af40637b6aa5e0b032de909316e1161f 100644 +index e1a8dc23249c04de66289fbf157d349e7fae606d..931955a7f5b20f04350ec91b3bc95146e8e219a3 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -255,6 +255,8 @@ public class ServerPlayer extends Player { @@ -6540,7 +6541,7 @@ index fcc9aaa87b4092e838b6523e15347f01b38b8943..e8f748a7af40637b6aa5e0b032de9093 public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) { super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile); -@@ -320,6 +322,8 @@ public class ServerPlayer extends Player { +@@ -319,6 +321,8 @@ public class ServerPlayer extends Player { this.setMaxUpStep(1.0F); this.fudgeSpawnLocation(world); @@ -6593,7 +6594,7 @@ index a63d5ba706a5b8e430aedc045bdeb3a410bd0eef..e96a0ca47e4701ba187555bd92c96834 public BlockState getBlockState(BlockPos pos) { return this.getChunk(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getZ())).getBlockState(pos); diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 5ef84d53146de440e4eb14ba33bc4fb9885045b8..9909208363443a216cf689197f103d9e79119bbf 100644 +index ce4194ebecceec9a86f5f11873da41e1382646d1..c48318d9d5882dd87e423aecf27c31994af42bdb 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -185,6 +185,7 @@ public abstract class PlayerList { @@ -6603,7 +6604,7 @@ index 5ef84d53146de440e4eb14ba33bc4fb9885045b8..9909208363443a216cf689197f103d9e + player.isRealPlayer = true; // Paper GameProfile gameprofile = player.getGameProfile(); GameProfileCache usercache = this.server.getProfileCache(); - Optional optional = usercache.get(gameprofile.getId()); + String s; diff --git a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java b/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a9621346384a11b 100644 --- a/src/main/java/net/minecraft/util/thread/BlockableEventLoop.java @@ -6623,10 +6624,10 @@ index 337e0a7b3c14e1b1a28744920e0dc0a69e0c5a87..f5829ae484d93b547a5437b85a962134 @Override public void tell(R runnable) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3177b3b974b6a98d41bc9e57c75b49bf9584b17b..956c39b6d0c208366508f2064f7b98270eebaedc 100644 +index 10089634151125402123f75b756b5443b328362d..cde2df65bf2e33494c9e893d2c944c2e33f5419f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -319,6 +319,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { +@@ -323,6 +323,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { return this.level.hasChunk((int) Math.floor(this.getX()) >> 4, (int) Math.floor(this.getZ()) >> 4); } // CraftBukkit end @@ -6639,10 +6640,10 @@ index 3177b3b974b6a98d41bc9e57c75b49bf9584b17b..956c39b6d0c208366508f2064f7b9827 public Entity(EntityType type, Level world) { this.id = Entity.ENTITY_COUNTER.incrementAndGet(); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c0859f1ded9679e59b19313352fa474742653255..592e41884ffda0075ec16e5538d5004efeb80f78 100644 +index 34d9f71b9d23ec60494d8567af3cc5966d6a2525..0a070ff26a1e9b2583e95adac0b2dd85b567c8d1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -256,6 +256,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -259,6 +259,7 @@ public abstract class LivingEntity extends Entity implements Attackable { public boolean collides = true; public Set collidableExemptions = new HashSet<>(); public boolean bukkitPickUpLoot; @@ -6651,10 +6652,10 @@ index c0859f1ded9679e59b19313352fa474742653255..592e41884ffda0075ec16e5538d5004e @Override public float getBukkitYaw() { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 1afd00e39bc5423d8bcce37a2caa4d6401c5b5e7..a290487b153a66a3e936ed1183f3c2ce343e59b1 100644 +index 7224ab24ea0e5806665ee1355b3d1ce64123fd29..c2c2c24a593f67abc1eec4a20ced1ec0b5fa8cad 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java -@@ -272,6 +272,7 @@ public abstract class Mob extends LivingEntity implements Targeting { +@@ -275,6 +275,7 @@ public abstract class Mob extends LivingEntity implements Targeting { return this.target; } @@ -6663,7 +6664,7 @@ index 1afd00e39bc5423d8bcce37a2caa4d6401c5b5e7..a290487b153a66a3e936ed1183f3c2ce // CraftBukkit start - fire event this.setTarget(target, EntityTargetEvent.TargetReason.UNKNOWN, true); diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java -index fbe69ec9cded766c9b76ed4a1bcba6d4f49d6165..6ae3f5cd42dfd424fc3741957995f47ad5ec8941 100644 +index 9aa82c1d8743076e7737d5b0d14ea36687e87723..d8ce7ea5fcb2785435ec1f530cb6e7114c01e4b7 100644 --- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java +++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java @@ -18,6 +18,8 @@ public abstract class PathfinderMob extends Mob { @@ -6673,7 +6674,7 @@ index fbe69ec9cded766c9b76ed4a1bcba6d4f49d6165..6ae3f5cd42dfd424fc3741957995f47a + public org.bukkit.craftbukkit.entity.CraftCreature getBukkitCreature() { return (org.bukkit.craftbukkit.entity.CraftCreature) super.getBukkitEntity(); } // Paper + public float getWalkTargetValue(BlockPos pos) { - return this.getWalkTargetValue(pos, this.level); + return this.getWalkTargetValue(pos, this.level()); } diff --git a/src/main/java/net/minecraft/world/entity/monster/Monster.java b/src/main/java/net/minecraft/world/entity/monster/Monster.java index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292544e9f3c 100644 @@ -6688,10 +6689,10 @@ index a0b5895abc88d297045e05f25bb09527991d43f0..6e0bd0eab0b06a4ac3042496bbb91292 super(type, world); this.xpReward = 5; diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index fecfcd21647efa27c2fb82617070eed10574abc5..81f6b580873fdad106515c3fc619e2288d936ca3 100644 +index 3aa6636aec62b031e2449db7b1b844d2ee5e9a8d..70e663baefe90c06eca2033f07e7e85c6f27c97f 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java -@@ -786,6 +786,25 @@ public final class ItemStack { +@@ -788,6 +788,25 @@ public final class ItemStack { return this.tag != null ? this.tag.getList("Enchantments", 10) : new ListTag(); } @@ -6717,7 +6718,7 @@ index fecfcd21647efa27c2fb82617070eed10574abc5..81f6b580873fdad106515c3fc619e228 public void setTag(@Nullable CompoundTag nbt) { this.tag = nbt; if (this.getItem().canBeDepleted()) { -@@ -1176,6 +1195,7 @@ public final class ItemStack { +@@ -1178,6 +1197,7 @@ public final class ItemStack { // CraftBukkit start @Deprecated public void setItem(Item item) { @@ -6831,7 +6832,7 @@ index 3c707d6674b2594b09503b959a31c1f4ad3981e6..db61b6b0158a9bcc0e1d735e34fe3671 public BlockState getBlockState(BlockPos pos) { return Blocks.AIR.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd35264b015f4 100644 +index bacd4d875642cd93c3185f788745dd73a3cfde8a..003e2064f64115d1f5c48ac97e16100d4c10c5d7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -90,6 +90,7 @@ import org.bukkit.craftbukkit.CraftServer; @@ -6842,7 +6843,7 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352 import org.bukkit.craftbukkit.block.data.CraftBlockData; import org.bukkit.craftbukkit.util.CraftSpawnCategory; import org.bukkit.craftbukkit.util.CraftNamespacedKey; -@@ -293,18 +294,52 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -292,18 +293,52 @@ public abstract class Level implements LevelAccessor, AutoCloseable { return y < -20000000 || y >= 20000000; } @@ -6899,7 +6900,7 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352 ChunkAccess ichunkaccess = this.getChunkSource().getChunk(chunkX, chunkZ, leastStatus, create); if (ichunkaccess == null && create) { -@@ -315,7 +350,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -314,7 +349,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { } @Override @@ -6908,7 +6909,7 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352 return this.setBlock(pos, state, flags, 512); } -@@ -559,7 +594,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { +@@ -552,7 +587,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable { if (this.isOutsideBuildHeight(pos)) { return Blocks.VOID_AIR.defaultBlockState(); } else { @@ -6918,17 +6919,18 @@ index 40deaa2463876659c0579b5273b5249760e8f8c0..e4ebdf81b7907e1054c356091ebcd352 return chunk.getBlockState(pos); } diff --git a/src/main/java/net/minecraft/world/level/LevelReader.java b/src/main/java/net/minecraft/world/level/LevelReader.java -index f5dbac0a13d23413dbdc48cfacc247ef25ef9444..7fe1b8856bf916796fa6d2a984f0a07a2331e23b 100644 +index e6aabec35f4e27623d1fbbfb285cc78531137014..fe76ec5b10242beb6d6057bd680484fc63b7eac3 100644 --- a/src/main/java/net/minecraft/world/level/LevelReader.java +++ b/src/main/java/net/minecraft/world/level/LevelReader.java -@@ -24,6 +24,7 @@ import net.minecraft.world.level.levelgen.Heightmap; - import net.minecraft.world.phys.AABB; - - public interface LevelReader extends BlockAndTintGetter, CollisionGetter, BiomeManager.NoiseBiomeSource { -+ @Nullable ChunkAccess getChunkIfLoadedImmediately(int x, int z); // Paper - ifLoaded api (we need this since current impl blocks if the chunk is loading) +@@ -26,6 +26,8 @@ public interface LevelReader extends BlockAndTintGetter, CollisionGetter, Signal @Nullable ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create); ++ @Nullable ChunkAccess getChunkIfLoadedImmediately(int x, int z); // Paper - ifLoaded api (we need this since current impl blocks if the chunk is loading) ++ + /** @deprecated */ + @Deprecated + boolean hasChunk(int chunkX, int chunkZ); diff --git a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java b/src/main/java/net/minecraft/world/level/PathNavigationRegion.java index 249b3ed33672a9a9529bd14de978722b62019314..0f1025495237aebe30132ace0832aa5718d6f9bb 100644 --- a/src/main/java/net/minecraft/world/level/PathNavigationRegion.java @@ -6982,10 +6984,10 @@ index 249b3ed33672a9a9529bd14de978722b62019314..0f1025495237aebe30132ace0832aa57 public WorldBorder getWorldBorder() { return this.level.getWorldBorder(); diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741d18910ca 100644 +index ccb3ceddd8f60f59473cd24d6ca5282f6e51f630..88b1aabec2812252c54d0901ccd1eba0216cb7c3 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java -@@ -711,14 +711,14 @@ public abstract class BlockBehaviour implements FeatureElement { +@@ -754,8 +754,8 @@ public abstract class BlockBehaviour implements FeatureElement { public abstract static class BlockStateBase extends StateHolder { @@ -6994,8 +6996,10 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741 + private final int lightEmission; public final int getEmittedLight() { return this.lightEmission; } // Paper - OBFHELPER + private final boolean useShapeForLightOcclusion; public final boolean isTransparentOnSomeFaces() { return this.useShapeForLightOcclusion; } // Paper - OBFHELPER private final boolean isAir; - private final Material material; - private final MaterialColor materialColor; + private final boolean ignitedByLava; + /** @deprecated */ +@@ -768,7 +768,7 @@ public abstract class BlockBehaviour implements FeatureElement { + private final MapColor mapColor; public final float destroySpeed; private final boolean requiresCorrectToolForDrops; - private final boolean canOcclude; @@ -7003,8 +7007,8 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741 private final BlockBehaviour.StatePredicate isRedstoneConductor; private final BlockBehaviour.StatePredicate isSuffocating; private final BlockBehaviour.StatePredicate isViewBlocking; -@@ -753,12 +753,20 @@ public abstract class BlockBehaviour implements FeatureElement { - this.spawnParticlesOnBreak = blockbase_info.spawnParticlesOnBreak; +@@ -829,12 +829,20 @@ public abstract class BlockBehaviour implements FeatureElement { + } } + // Paper start @@ -7022,9 +7026,9 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741 } + this.shapeExceedsCube = this.cache == null || this.cache.largeCollisionShape; // Paper - moved from actual method to here + this.legacySolid = this.calculateSolid(); } - -@@ -794,8 +802,8 @@ public abstract class BlockBehaviour implements FeatureElement { +@@ -881,8 +889,8 @@ public abstract class BlockBehaviour implements FeatureElement { return this.getBlock().getOcclusionShape(this.asState(), world, pos); } @@ -7036,10 +7040,10 @@ index 9d753d0cf25150ea0e5972c657320ac8af864c57..2cb3463f3d77a32ada67a6251707d741 public boolean useShapeForLightOcclusion() { diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java -index db6a64ae4437b76c39e7ddb02adbea27c95fde78..3fdbb777d4722596cc4df79b2d4d7b9c553580fd 100644 +index 532a0cae6db0d830e720a72e9021aa7a8ed0f106..e5e562f75e7d4b6a750f192842940c5e3af81e7d 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java +++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java -@@ -58,7 +58,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom +@@ -62,7 +62,7 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom protected final ShortList[] postProcessing; protected volatile boolean unsaved; private volatile boolean isLightCorrect; @@ -7048,10 +7052,10 @@ index db6a64ae4437b76c39e7ddb02adbea27c95fde78..3fdbb777d4722596cc4df79b2d4d7b9c private long inhabitedTime; /** @deprecated */ @Nullable -@@ -83,7 +83,8 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom +@@ -88,7 +88,8 @@ public abstract class ChunkAccess implements BlockGetter, BiomeManager.NoiseBiom // CraftBukkit end - public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biome, long inhabitedTime, @Nullable LevelChunkSection[] sectionArrayInitializer, @Nullable BlendingData blendingData) { + public ChunkAccess(ChunkPos pos, UpgradeData upgradeData, LevelHeightAccessor heightLimitView, Registry biomeRegistry, long inhabitedTime, @Nullable LevelChunkSection[] sectionArray, @Nullable BlendingData blendingData) { - this.chunkPos = pos; + this.locX = pos.x; this.locZ = pos.z; // Paper - reduce need for field lookups + this.chunkPos = pos; this.coordinateKey = ChunkPos.asLong(locX, locZ); // Paper - cache long key @@ -7059,18 +7063,10 @@ index db6a64ae4437b76c39e7ddb02adbea27c95fde78..3fdbb777d4722596cc4df79b2d4d7b9c this.levelHeightAccessor = heightLimitView; this.sections = new LevelChunkSection[heightLimitView.getSectionsCount()]; 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 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871f88528d4 100644 +index 36c3a06a94177ec21cfc5c513d16f7168fe2fe2c..5aa89166e854136f366eb36ff02a37ae9ba77ab1 100644 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java -@@ -25,6 +25,7 @@ import net.minecraft.nbt.CompoundTag; - import net.minecraft.network.FriendlyByteBuf; - import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData; - import net.minecraft.server.level.ChunkHolder; -+import net.minecraft.server.level.ServerChunkCache; - import net.minecraft.server.level.ServerLevel; - import net.minecraft.util.profiling.ProfilerFiller; - import net.minecraft.world.entity.Entity; -@@ -117,6 +118,109 @@ public class LevelChunk extends ChunkAccess { +@@ -114,6 +114,109 @@ public class LevelChunk extends ChunkAccess { public boolean needsDecoration; // CraftBukkit end @@ -7180,7 +7176,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871 public LevelChunk(ServerLevel world, ProtoChunk protoChunk, @Nullable LevelChunk.PostLoadProcessor entityLoader) { this(world, protoChunk.getPos(), protoChunk.getUpgradeData(), protoChunk.unpackBlockTicks(), protoChunk.unpackFluidTicks(), protoChunk.getInhabitedTime(), protoChunk.getSections(), entityLoader, protoChunk.getBlendingData()); Iterator iterator = protoChunk.getBlockEntities().values().iterator(); -@@ -226,6 +330,18 @@ public class LevelChunk extends ChunkAccess { +@@ -224,6 +327,18 @@ public class LevelChunk extends ChunkAccess { } } @@ -7199,7 +7195,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871 @Override public FluidState getFluidState(BlockPos pos) { return this.getFluidState(pos.getX(), pos.getY(), pos.getZ()); -@@ -347,6 +463,7 @@ public class LevelChunk extends ChunkAccess { +@@ -355,6 +470,7 @@ public class LevelChunk extends ChunkAccess { return this.getBlockEntity(pos, LevelChunk.EntityCreationType.CHECK); } @@ -7207,14 +7203,14 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871 @Nullable public BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType) { // CraftBukkit start -@@ -528,7 +645,25 @@ public class LevelChunk extends ChunkAccess { +@@ -537,7 +653,25 @@ public class LevelChunk extends ChunkAccess { // CraftBukkit start public void loadCallback() { + // Paper start - neighbour cache + int chunkX = this.chunkPos.x; + int chunkZ = this.chunkPos.z; -+ ServerChunkCache chunkProvider = this.level.getChunkSource(); ++ net.minecraft.server.level.ServerChunkCache chunkProvider = this.level.getChunkSource(); + for (int dx = -NEIGHBOUR_CACHE_RADIUS; dx <= NEIGHBOUR_CACHE_RADIUS; ++dx) { + for (int dz = -NEIGHBOUR_CACHE_RADIUS; dz <= NEIGHBOUR_CACHE_RADIUS; ++dz) { + LevelChunk neighbour = chunkProvider.getChunkAtIfLoadedMainThreadNoCache(chunkX + dx, chunkZ + dz); @@ -7233,7 +7229,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871 if (server != null) { /* * If it's a new world, the first few chunks are generated inside -@@ -569,6 +704,22 @@ public class LevelChunk extends ChunkAccess { +@@ -578,6 +712,22 @@ public class LevelChunk extends ChunkAccess { server.getPluginManager().callEvent(unloadEvent); // note: saving can be prevented, but not forced if no saving is actually required this.mustNotSave = !unloadEvent.isSaveChunk(); @@ -7241,7 +7237,7 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871 + // Paper start - neighbour cache + int chunkX = this.chunkPos.x; + int chunkZ = this.chunkPos.z; -+ ServerChunkCache chunkProvider = this.level.getChunkSource(); ++ net.minecraft.server.level.ServerChunkCache chunkProvider = this.level.getChunkSource(); + for (int dx = -NEIGHBOUR_CACHE_RADIUS; dx <= NEIGHBOUR_CACHE_RADIUS; ++dx) { + for (int dz = -NEIGHBOUR_CACHE_RADIUS; dz <= NEIGHBOUR_CACHE_RADIUS; ++dz) { + LevelChunk neighbour = chunkProvider.getChunkAtIfLoadedMainThreadNoCache(chunkX + dx, chunkZ + dz); @@ -7257,10 +7253,10 @@ index 876d52861880d405bfc718a38113cd2bdfb1d447..bedafac1c29f4b2a820822b01814b871 @Override diff --git a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -index cb4e43177a735442fa2adda8640263bca8cdcb64..92a64c49b1c7227a5b34488ea15d3d8adb0f9c80 100644 +index 51a0ddcee9a9cb1040fda643a6442d2e2e15b8a0..38ec21faaa16df5485a81a581506700a5ab0a440 100644 --- a/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java +++ b/src/main/java/net/minecraft/world/level/chunk/ProtoChunk.java -@@ -74,6 +74,18 @@ public class ProtoChunk extends ChunkAccess { +@@ -72,6 +72,18 @@ public class ProtoChunk extends ChunkAccess { return new ChunkAccess.TicksToSave(this.blockTicks, this.fluidTicks); } @@ -7280,7 +7276,7 @@ index cb4e43177a735442fa2adda8640263bca8cdcb64..92a64c49b1c7227a5b34488ea15d3d8a public BlockState getBlockState(BlockPos pos) { int i = pos.getY(); diff --git a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java -index f66369ddaeab5c5ac643c0979dac3ed21337ff71..038abf2ac104ceecaab11b10d466ea69ec86623e 100644 +index 25156be63f91a1c41ef41154f675d04eb97459a8..ace46eec77b30aee6024e19fec9e50f363da162a 100644 --- a/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java +++ b/src/main/java/net/minecraft/world/level/entity/PersistentEntitySectionManager.java @@ -90,6 +90,18 @@ public class PersistentEntitySectionManager implements A @@ -7303,7 +7299,7 @@ index f66369ddaeab5c5ac643c0979dac3ed21337ff71..038abf2ac104ceecaab11b10d466ea69 return false; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fa2872042a6ee6b5e865c50b3f8eabab3e7d6a46..e75f3d6f0c14f49cb828e919e12d0f69c898d46f 100644 +index e729db7818024842925dcf28cca063098a393984..c8a035d396a56e3f4c437c5524e8e67a946b1674 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -243,8 +243,8 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -7360,7 +7356,7 @@ index fa2872042a6ee6b5e865c50b3f8eabab3e7d6a46..e75f3d6f0c14f49cb828e919e12d0f69 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a3d5c050ad73697573970e3a4db72845671de9c8..cf9bbc1334a151dfd96be91e6f2cf3cb9afd9384 100644 +index 2c824ead41389bc7d2085536ecb8d0d2b6515ddb..6807507017bbb171657ba230223f281b083da28a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1182,4 +1182,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -7624,7 +7620,7 @@ index 0000000000000000000000000000000000000000..909b2c98e7a9117d2f737245e4661792 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 8d8f76feea13c2daeef310a572dec8f75f0f6103..3c41b9d3d7bdb0b2657eeb337499dfcca5ec4068 100644 +index 141f7c287252ae319e88d8c279e5661524baa1bf..381cfd86fc1158dc9a7c1e76c3ada962b0964373 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -104,8 +104,17 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/patches/server/0010-Adventure.patch b/patches/unapplied/server/0010-Adventure.patch similarity index 100% rename from patches/server/0010-Adventure.patch rename to patches/unapplied/server/0010-Adventure.patch diff --git a/patches/server/0011-Paper-command.patch b/patches/unapplied/server/0011-Paper-command.patch similarity index 100% rename from patches/server/0011-Paper-command.patch rename to patches/unapplied/server/0011-Paper-command.patch diff --git a/patches/server/0012-Paper-Metrics.patch b/patches/unapplied/server/0012-Paper-Metrics.patch similarity index 100% rename from patches/server/0012-Paper-Metrics.patch rename to patches/unapplied/server/0012-Paper-Metrics.patch diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/unapplied/server/0013-Paper-Plugins.patch similarity index 100% rename from patches/server/0013-Paper-Plugins.patch rename to patches/unapplied/server/0013-Paper-Plugins.patch diff --git a/patches/server/0014-Timings-v2.patch b/patches/unapplied/server/0014-Timings-v2.patch similarity index 100% rename from patches/server/0014-Timings-v2.patch rename to patches/unapplied/server/0014-Timings-v2.patch diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/unapplied/server/0015-Rewrite-dataconverter-system.patch similarity index 100% rename from patches/server/0015-Rewrite-dataconverter-system.patch rename to patches/unapplied/server/0015-Rewrite-dataconverter-system.patch diff --git a/patches/server/0016-Starlight.patch b/patches/unapplied/server/0016-Starlight.patch similarity index 100% rename from patches/server/0016-Starlight.patch rename to patches/unapplied/server/0016-Starlight.patch diff --git a/patches/server/0017-Add-TickThread.patch b/patches/unapplied/server/0017-Add-TickThread.patch similarity index 100% rename from patches/server/0017-Add-TickThread.patch rename to patches/unapplied/server/0017-Add-TickThread.patch diff --git a/patches/server/0018-Rewrite-chunk-system.patch b/patches/unapplied/server/0018-Rewrite-chunk-system.patch similarity index 100% rename from patches/server/0018-Rewrite-chunk-system.patch rename to patches/unapplied/server/0018-Rewrite-chunk-system.patch diff --git a/patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/unapplied/server/0019-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch b/patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch similarity index 100% rename from patches/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch rename to patches/unapplied/server/0020-Configurable-cactus-bamboo-and-reed-growth-heights.patch diff --git a/patches/server/0021-Configurable-baby-zombie-movement-speed.patch b/patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch similarity index 100% rename from patches/server/0021-Configurable-baby-zombie-movement-speed.patch rename to patches/unapplied/server/0021-Configurable-baby-zombie-movement-speed.patch diff --git a/patches/server/0022-Configurable-fishing-time-ranges.patch b/patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch similarity index 100% rename from patches/server/0022-Configurable-fishing-time-ranges.patch rename to patches/unapplied/server/0022-Configurable-fishing-time-ranges.patch diff --git a/patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch similarity index 100% rename from patches/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch rename to patches/unapplied/server/0023-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch diff --git a/patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch b/patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch similarity index 100% rename from patches/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch rename to patches/unapplied/server/0024-Add-configurable-despawn-distances-for-living-entiti.patch diff --git a/patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch b/patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch similarity index 100% rename from patches/server/0025-Allow-for-toggling-of-spawn-chunks.patch rename to patches/unapplied/server/0025-Allow-for-toggling-of-spawn-chunks.patch diff --git a/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch similarity index 100% rename from patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch rename to patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch diff --git a/patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch similarity index 100% rename from patches/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch rename to patches/unapplied/server/0027-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch diff --git a/patches/server/0028-Implement-Paper-VersionChecker.patch b/patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch similarity index 100% rename from patches/server/0028-Implement-Paper-VersionChecker.patch rename to patches/unapplied/server/0028-Implement-Paper-VersionChecker.patch diff --git a/patches/server/0029-Add-version-history-to-version-command.patch b/patches/unapplied/server/0029-Add-version-history-to-version-command.patch similarity index 100% rename from patches/server/0029-Add-version-history-to-version-command.patch rename to patches/unapplied/server/0029-Add-version-history-to-version-command.patch diff --git a/patches/server/0030-Player-affects-spawning-API.patch b/patches/unapplied/server/0030-Player-affects-spawning-API.patch similarity index 100% rename from patches/server/0030-Player-affects-spawning-API.patch rename to patches/unapplied/server/0030-Player-affects-spawning-API.patch diff --git a/patches/server/0031-Further-improve-server-tick-loop.patch b/patches/unapplied/server/0031-Further-improve-server-tick-loop.patch similarity index 100% rename from patches/server/0031-Further-improve-server-tick-loop.patch rename to patches/unapplied/server/0031-Further-improve-server-tick-loop.patch diff --git a/patches/server/0032-Only-refresh-abilities-if-needed.patch b/patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch similarity index 100% rename from patches/server/0032-Only-refresh-abilities-if-needed.patch rename to patches/unapplied/server/0032-Only-refresh-abilities-if-needed.patch diff --git a/patches/server/0033-Entity-Origin-API.patch b/patches/unapplied/server/0033-Entity-Origin-API.patch similarity index 100% rename from patches/server/0033-Entity-Origin-API.patch rename to patches/unapplied/server/0033-Entity-Origin-API.patch diff --git a/patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch b/patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch similarity index 100% rename from patches/server/0034-Prevent-tile-entity-and-entity-crashes.patch rename to patches/unapplied/server/0034-Prevent-tile-entity-and-entity-crashes.patch diff --git a/patches/server/0035-Configurable-top-of-nether-void-damage.patch b/patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch similarity index 100% rename from patches/server/0035-Configurable-top-of-nether-void-damage.patch rename to patches/unapplied/server/0035-Configurable-top-of-nether-void-damage.patch diff --git a/patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch b/patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch similarity index 100% rename from patches/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch rename to patches/unapplied/server/0036-Check-online-mode-before-converting-and-renaming-pla.patch diff --git a/patches/server/0037-Always-tick-falling-blocks.patch b/patches/unapplied/server/0037-Always-tick-falling-blocks.patch similarity index 100% rename from patches/server/0037-Always-tick-falling-blocks.patch rename to patches/unapplied/server/0037-Always-tick-falling-blocks.patch diff --git a/patches/server/0038-Configurable-end-credits.patch b/patches/unapplied/server/0038-Configurable-end-credits.patch similarity index 100% rename from patches/server/0038-Configurable-end-credits.patch rename to patches/unapplied/server/0038-Configurable-end-credits.patch diff --git a/patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch b/patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch similarity index 100% rename from patches/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch rename to patches/unapplied/server/0039-Fix-lag-from-explosions-processing-dead-entities.patch diff --git a/patches/server/0040-Optimize-explosions.patch b/patches/unapplied/server/0040-Optimize-explosions.patch similarity index 100% rename from patches/server/0040-Optimize-explosions.patch rename to patches/unapplied/server/0040-Optimize-explosions.patch diff --git a/patches/server/0041-Disable-explosion-knockback.patch b/patches/unapplied/server/0041-Disable-explosion-knockback.patch similarity index 100% rename from patches/server/0041-Disable-explosion-knockback.patch rename to patches/unapplied/server/0041-Disable-explosion-knockback.patch diff --git a/patches/server/0042-Disable-thunder.patch b/patches/unapplied/server/0042-Disable-thunder.patch similarity index 100% rename from patches/server/0042-Disable-thunder.patch rename to patches/unapplied/server/0042-Disable-thunder.patch diff --git a/patches/server/0043-Disable-ice-and-snow.patch b/patches/unapplied/server/0043-Disable-ice-and-snow.patch similarity index 100% rename from patches/server/0043-Disable-ice-and-snow.patch rename to patches/unapplied/server/0043-Disable-ice-and-snow.patch diff --git a/patches/server/0044-Configurable-mob-spawner-tick-rate.patch b/patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch similarity index 100% rename from patches/server/0044-Configurable-mob-spawner-tick-rate.patch rename to patches/unapplied/server/0044-Configurable-mob-spawner-tick-rate.patch diff --git a/patches/server/0045-Implement-PlayerLocaleChangeEvent.patch b/patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/server/0045-Implement-PlayerLocaleChangeEvent.patch rename to patches/unapplied/server/0045-Implement-PlayerLocaleChangeEvent.patch diff --git a/patches/server/0046-Add-BeaconEffectEvent.patch b/patches/unapplied/server/0046-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/server/0046-Add-BeaconEffectEvent.patch rename to patches/unapplied/server/0046-Add-BeaconEffectEvent.patch diff --git a/patches/server/0047-Configurable-container-update-tick-rate.patch b/patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch similarity index 100% rename from patches/server/0047-Configurable-container-update-tick-rate.patch rename to patches/unapplied/server/0047-Configurable-container-update-tick-rate.patch diff --git a/patches/server/0048-Use-UserCache-for-player-heads.patch b/patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch similarity index 100% rename from patches/server/0048-Use-UserCache-for-player-heads.patch rename to patches/unapplied/server/0048-Use-UserCache-for-player-heads.patch diff --git a/patches/server/0049-Disable-spigot-tick-limiters.patch b/patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch similarity index 100% rename from patches/server/0049-Disable-spigot-tick-limiters.patch rename to patches/unapplied/server/0049-Disable-spigot-tick-limiters.patch diff --git a/patches/server/0050-Add-PlayerInitialSpawnEvent.patch b/patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/server/0050-Add-PlayerInitialSpawnEvent.patch rename to patches/unapplied/server/0050-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch b/patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch similarity index 100% rename from patches/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch rename to patches/unapplied/server/0051-Configurable-Disabling-Cat-Chest-Detection.patch diff --git a/patches/server/0052-Ensure-commands-are-not-ran-async.patch b/patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch similarity index 100% rename from patches/server/0052-Ensure-commands-are-not-ran-async.patch rename to patches/unapplied/server/0052-Ensure-commands-are-not-ran-async.patch diff --git a/patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch b/patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch similarity index 100% rename from patches/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch rename to patches/unapplied/server/0053-All-chunks-are-slime-spawn-chunks-toggle.patch diff --git a/patches/server/0054-Expose-server-CommandMap.patch b/patches/unapplied/server/0054-Expose-server-CommandMap.patch similarity index 100% rename from patches/server/0054-Expose-server-CommandMap.patch rename to patches/unapplied/server/0054-Expose-server-CommandMap.patch diff --git a/patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch b/patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch similarity index 100% rename from patches/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch rename to patches/unapplied/server/0055-Be-a-bit-more-informative-in-maxHealth-exception.patch diff --git a/patches/server/0056-Player-Tab-List-and-Title-APIs.patch b/patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/server/0056-Player-Tab-List-and-Title-APIs.patch rename to patches/unapplied/server/0056-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/server/0057-Add-configurable-portal-search-radius.patch b/patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch similarity index 100% rename from patches/server/0057-Add-configurable-portal-search-radius.patch rename to patches/unapplied/server/0057-Add-configurable-portal-search-radius.patch diff --git a/patches/server/0058-Add-velocity-warnings.patch b/patches/unapplied/server/0058-Add-velocity-warnings.patch similarity index 100% rename from patches/server/0058-Add-velocity-warnings.patch rename to patches/unapplied/server/0058-Add-velocity-warnings.patch diff --git a/patches/server/0059-Configurable-inter-world-teleportation-safety.patch b/patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch similarity index 100% rename from patches/server/0059-Configurable-inter-world-teleportation-safety.patch rename to patches/unapplied/server/0059-Configurable-inter-world-teleportation-safety.patch diff --git a/patches/server/0060-Add-exception-reporting-event.patch b/patches/unapplied/server/0060-Add-exception-reporting-event.patch similarity index 100% rename from patches/server/0060-Add-exception-reporting-event.patch rename to patches/unapplied/server/0060-Add-exception-reporting-event.patch diff --git a/patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch similarity index 100% rename from patches/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch rename to patches/unapplied/server/0061-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch diff --git a/patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch b/patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch similarity index 100% rename from patches/server/0062-Disable-Scoreboards-for-non-players-by-default.patch rename to patches/unapplied/server/0062-Disable-Scoreboards-for-non-players-by-default.patch diff --git a/patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/unapplied/server/0063-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/server/0064-Chunk-Save-Reattempt.patch b/patches/unapplied/server/0064-Chunk-Save-Reattempt.patch similarity index 100% rename from patches/server/0064-Chunk-Save-Reattempt.patch rename to patches/unapplied/server/0064-Chunk-Save-Reattempt.patch diff --git a/patches/server/0065-Complete-resource-pack-API.patch b/patches/unapplied/server/0065-Complete-resource-pack-API.patch similarity index 100% rename from patches/server/0065-Complete-resource-pack-API.patch rename to patches/unapplied/server/0065-Complete-resource-pack-API.patch diff --git a/patches/server/0066-Default-loading-permissions.yml-before-plugins.patch b/patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch similarity index 100% rename from patches/server/0066-Default-loading-permissions.yml-before-plugins.patch rename to patches/unapplied/server/0066-Default-loading-permissions.yml-before-plugins.patch diff --git a/patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch b/patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch similarity index 100% rename from patches/server/0067-Allow-Reloading-of-Custom-Permissions.patch rename to patches/unapplied/server/0067-Allow-Reloading-of-Custom-Permissions.patch diff --git a/patches/server/0068-Remove-Metadata-on-reload.patch b/patches/unapplied/server/0068-Remove-Metadata-on-reload.patch similarity index 100% rename from patches/server/0068-Remove-Metadata-on-reload.patch rename to patches/unapplied/server/0068-Remove-Metadata-on-reload.patch diff --git a/patches/server/0069-Handle-Item-Meta-Inconsistencies.patch b/patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch similarity index 100% rename from patches/server/0069-Handle-Item-Meta-Inconsistencies.patch rename to patches/unapplied/server/0069-Handle-Item-Meta-Inconsistencies.patch diff --git a/patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch similarity index 100% rename from patches/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch rename to patches/unapplied/server/0070-Configurable-Non-Player-Arrow-Despawn-Rate.patch diff --git a/patches/server/0071-Add-World-Util-Methods.patch b/patches/unapplied/server/0071-Add-World-Util-Methods.patch similarity index 100% rename from patches/server/0071-Add-World-Util-Methods.patch rename to patches/unapplied/server/0071-Add-World-Util-Methods.patch diff --git a/patches/server/0072-Custom-replacement-for-eaten-items.patch b/patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/server/0072-Custom-replacement-for-eaten-items.patch rename to patches/unapplied/server/0072-Custom-replacement-for-eaten-items.patch diff --git a/patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/patches/unapplied/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch similarity index 100% rename from patches/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch rename to patches/unapplied/server/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch diff --git a/patches/server/0074-Use-a-Shared-Random-for-Entities.patch b/patches/unapplied/server/0074-Use-a-Shared-Random-for-Entities.patch similarity index 100% rename from patches/server/0074-Use-a-Shared-Random-for-Entities.patch rename to patches/unapplied/server/0074-Use-a-Shared-Random-for-Entities.patch diff --git a/patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch b/patches/unapplied/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch similarity index 100% rename from patches/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch rename to patches/unapplied/server/0075-Configurable-spawn-chances-for-skeleton-horses.patch diff --git a/patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/unapplied/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch similarity index 100% rename from patches/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch rename to patches/unapplied/server/0076-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch diff --git a/patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/patches/unapplied/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch similarity index 100% rename from patches/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch rename to patches/unapplied/server/0077-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch diff --git a/patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/unapplied/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/unapplied/server/0078-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/server/0079-Configurable-Chunk-Inhabited-Time.patch b/patches/unapplied/server/0079-Configurable-Chunk-Inhabited-Time.patch similarity index 100% rename from patches/server/0079-Configurable-Chunk-Inhabited-Time.patch rename to patches/unapplied/server/0079-Configurable-Chunk-Inhabited-Time.patch diff --git a/patches/server/0080-EntityPathfindEvent.patch b/patches/unapplied/server/0080-EntityPathfindEvent.patch similarity index 100% rename from patches/server/0080-EntityPathfindEvent.patch rename to patches/unapplied/server/0080-EntityPathfindEvent.patch diff --git a/patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch b/patches/unapplied/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch similarity index 100% rename from patches/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch rename to patches/unapplied/server/0081-Sanitise-RegionFileCache-and-make-configurable.patch diff --git a/patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch b/patches/unapplied/server/0082-Do-not-load-chunks-for-Pathfinding.patch similarity index 100% rename from patches/server/0082-Do-not-load-chunks-for-Pathfinding.patch rename to patches/unapplied/server/0082-Do-not-load-chunks-for-Pathfinding.patch diff --git a/patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch b/patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/server/0083-Add-PlayerUseUnknownEntityEvent.patch rename to patches/unapplied/server/0083-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch b/patches/unapplied/server/0084-Configurable-Grass-Spread-Tick-Rate.patch similarity index 100% rename from patches/server/0084-Configurable-Grass-Spread-Tick-Rate.patch rename to patches/unapplied/server/0084-Configurable-Grass-Spread-Tick-Rate.patch diff --git a/patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/patches/unapplied/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch similarity index 100% rename from patches/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch rename to patches/unapplied/server/0085-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch diff --git a/patches/server/0086-Optimize-DataBits.patch b/patches/unapplied/server/0086-Optimize-DataBits.patch similarity index 100% rename from patches/server/0086-Optimize-DataBits.patch rename to patches/unapplied/server/0086-Optimize-DataBits.patch diff --git a/patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/patches/unapplied/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch similarity index 100% rename from patches/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch rename to patches/unapplied/server/0087-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch diff --git a/patches/server/0088-Configurable-Player-Collision.patch b/patches/unapplied/server/0088-Configurable-Player-Collision.patch similarity index 100% rename from patches/server/0088-Configurable-Player-Collision.patch rename to patches/unapplied/server/0088-Configurable-Player-Collision.patch diff --git a/patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/unapplied/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/unapplied/server/0089-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/server/0090-Configurable-RCON-IP-address.patch b/patches/unapplied/server/0090-Configurable-RCON-IP-address.patch similarity index 100% rename from patches/server/0090-Configurable-RCON-IP-address.patch rename to patches/unapplied/server/0090-Configurable-RCON-IP-address.patch diff --git a/patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/unapplied/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/unapplied/server/0091-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch b/patches/unapplied/server/0092-Add-ability-to-configure-frosted_ice-properties.patch similarity index 100% rename from patches/server/0092-Add-ability-to-configure-frosted_ice-properties.patch rename to patches/unapplied/server/0092-Add-ability-to-configure-frosted_ice-properties.patch diff --git a/patches/server/0093-remove-null-possibility-for-getServer-singleton.patch b/patches/unapplied/server/0093-remove-null-possibility-for-getServer-singleton.patch similarity index 100% rename from patches/server/0093-remove-null-possibility-for-getServer-singleton.patch rename to patches/unapplied/server/0093-remove-null-possibility-for-getServer-singleton.patch diff --git a/patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/unapplied/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch similarity index 100% rename from patches/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch rename to patches/unapplied/server/0094-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch diff --git a/patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch b/patches/unapplied/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch similarity index 100% rename from patches/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch rename to patches/unapplied/server/0095-LootTable-API-Replenishable-Lootables-Feature.patch diff --git a/patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/patches/unapplied/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch similarity index 100% rename from patches/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch rename to patches/unapplied/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch diff --git a/patches/server/0097-System-property-for-disabling-watchdoge.patch b/patches/unapplied/server/0097-System-property-for-disabling-watchdoge.patch similarity index 100% rename from patches/server/0097-System-property-for-disabling-watchdoge.patch rename to patches/unapplied/server/0097-System-property-for-disabling-watchdoge.patch diff --git a/patches/server/0098-Async-GameProfileCache-saving.patch b/patches/unapplied/server/0098-Async-GameProfileCache-saving.patch similarity index 100% rename from patches/server/0098-Async-GameProfileCache-saving.patch rename to patches/unapplied/server/0098-Async-GameProfileCache-saving.patch diff --git a/patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch b/patches/unapplied/server/0099-Optional-TNT-doesn-t-move-in-water.patch similarity index 100% rename from patches/server/0099-Optional-TNT-doesn-t-move-in-water.patch rename to patches/unapplied/server/0099-Optional-TNT-doesn-t-move-in-water.patch diff --git a/patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch b/patches/unapplied/server/0100-Faster-redstone-torch-rapid-clock-removal.patch similarity index 100% rename from patches/server/0100-Faster-redstone-torch-rapid-clock-removal.patch rename to patches/unapplied/server/0100-Faster-redstone-torch-rapid-clock-removal.patch diff --git a/patches/server/0101-Add-server-name-parameter.patch b/patches/unapplied/server/0101-Add-server-name-parameter.patch similarity index 100% rename from patches/server/0101-Add-server-name-parameter.patch rename to patches/unapplied/server/0101-Add-server-name-parameter.patch diff --git a/patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch b/patches/unapplied/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch similarity index 100% rename from patches/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch rename to patches/unapplied/server/0102-Only-send-global-sounds-to-same-world-if-limiting-ra.patch diff --git a/patches/server/0103-Fix-Old-Sign-Conversion.patch b/patches/unapplied/server/0103-Fix-Old-Sign-Conversion.patch similarity index 100% rename from patches/server/0103-Fix-Old-Sign-Conversion.patch rename to patches/unapplied/server/0103-Fix-Old-Sign-Conversion.patch diff --git a/patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch b/patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch similarity index 100% rename from patches/server/0104-Avoid-blocking-on-Network-Manager-creation.patch rename to patches/unapplied/server/0104-Avoid-blocking-on-Network-Manager-creation.patch diff --git a/patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch similarity index 100% rename from patches/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch rename to patches/unapplied/server/0105-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch diff --git a/patches/server/0106-Add-setting-for-proxy-online-mode-status.patch b/patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch similarity index 100% rename from patches/server/0106-Add-setting-for-proxy-online-mode-status.patch rename to patches/unapplied/server/0106-Add-setting-for-proxy-online-mode-status.patch diff --git a/patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch b/patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch similarity index 100% rename from patches/server/0107-Optimise-BlockState-s-hashCode-equals.patch rename to patches/unapplied/server/0107-Optimise-BlockState-s-hashCode-equals.patch diff --git a/patches/server/0108-Configurable-packet-in-spam-threshold.patch b/patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch similarity index 100% rename from patches/server/0108-Configurable-packet-in-spam-threshold.patch rename to patches/unapplied/server/0108-Configurable-packet-in-spam-threshold.patch diff --git a/patches/server/0109-Configurable-flying-kick-messages.patch b/patches/unapplied/server/0109-Configurable-flying-kick-messages.patch similarity index 100% rename from patches/server/0109-Configurable-flying-kick-messages.patch rename to patches/unapplied/server/0109-Configurable-flying-kick-messages.patch diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/unapplied/server/0110-Add-EntityZapEvent.patch similarity index 100% rename from patches/server/0110-Add-EntityZapEvent.patch rename to patches/unapplied/server/0110-Add-EntityZapEvent.patch diff --git a/patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch b/patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch similarity index 100% rename from patches/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch rename to patches/unapplied/server/0111-Filter-bad-tile-entity-nbt-data-from-falling-blocks.patch diff --git a/patches/server/0112-Cache-user-authenticator-threads.patch b/patches/unapplied/server/0112-Cache-user-authenticator-threads.patch similarity index 100% rename from patches/server/0112-Cache-user-authenticator-threads.patch rename to patches/unapplied/server/0112-Cache-user-authenticator-threads.patch diff --git a/patches/server/0113-Allow-Reloading-of-Command-Aliases.patch b/patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/server/0113-Allow-Reloading-of-Command-Aliases.patch rename to patches/unapplied/server/0113-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch rename to patches/unapplied/server/0114-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/server/0115-Add-ProjectileCollideEvent.patch rename to patches/unapplied/server/0115-Add-ProjectileCollideEvent.patch diff --git a/patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch b/patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch similarity index 100% rename from patches/server/0116-Prevent-Pathfinding-out-of-World-Border.patch rename to patches/unapplied/server/0116-Prevent-Pathfinding-out-of-World-Border.patch diff --git a/patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch b/patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch similarity index 100% rename from patches/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch rename to patches/unapplied/server/0117-Optimize-World.isLoaded-BlockPosition-Z.patch diff --git a/patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch b/patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch similarity index 100% rename from patches/server/0118-Bound-Treasure-Maps-to-World-Border.patch rename to patches/unapplied/server/0118-Bound-Treasure-Maps-to-World-Border.patch diff --git a/patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch b/patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch similarity index 100% rename from patches/server/0119-Configurable-Cartographer-Treasure-Maps.patch rename to patches/unapplied/server/0119-Configurable-Cartographer-Treasure-Maps.patch diff --git a/patches/server/0120-Optimize-ItemStack.isEmpty.patch b/patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch similarity index 100% rename from patches/server/0120-Optimize-ItemStack.isEmpty.patch rename to patches/unapplied/server/0120-Optimize-ItemStack.isEmpty.patch diff --git a/patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/unapplied/server/0121-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/server/0122-String-based-Action-Bar-API.patch b/patches/unapplied/server/0122-String-based-Action-Bar-API.patch similarity index 100% rename from patches/server/0122-String-based-Action-Bar-API.patch rename to patches/unapplied/server/0122-String-based-Action-Bar-API.patch diff --git a/patches/server/0123-Properly-fix-item-duplication-bug.patch b/patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch similarity index 100% rename from patches/server/0123-Properly-fix-item-duplication-bug.patch rename to patches/unapplied/server/0123-Properly-fix-item-duplication-bug.patch diff --git a/patches/server/0124-Firework-API-s.patch b/patches/unapplied/server/0124-Firework-API-s.patch similarity index 100% rename from patches/server/0124-Firework-API-s.patch rename to patches/unapplied/server/0124-Firework-API-s.patch diff --git a/patches/server/0125-PlayerTeleportEndGatewayEvent.patch b/patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0125-PlayerTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0125-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/unapplied/server/0126-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/server/0127-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0127-Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/0127-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch b/patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch similarity index 100% rename from patches/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch rename to patches/unapplied/server/0128-Don-t-allow-entities-to-ride-themselves-572.patch diff --git a/patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/0129-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/server/0130-Cap-Entity-Collisions.patch b/patches/unapplied/server/0130-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0130-Cap-Entity-Collisions.patch rename to patches/unapplied/server/0130-Cap-Entity-Collisions.patch diff --git a/patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/0131-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0132-Do-not-let-armorstands-drown.patch b/patches/unapplied/server/0132-Do-not-let-armorstands-drown.patch similarity index 100% rename from patches/server/0132-Do-not-let-armorstands-drown.patch rename to patches/unapplied/server/0132-Do-not-let-armorstands-drown.patch diff --git a/patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0133-Properly-handle-async-calls-to-restart-the-server.patch similarity index 100% rename from patches/server/0133-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/0133-Properly-handle-async-calls-to-restart-the-server.patch diff --git a/patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch similarity index 100% rename from patches/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch rename to patches/unapplied/server/0134-Add-option-to-make-parrots-stay-on-shoulders-despite.patch diff --git a/patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/unapplied/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/unapplied/server/0135-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/unapplied/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch similarity index 100% rename from patches/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch rename to patches/unapplied/server/0136-Use-TerminalConsoleAppender-for-console-improvements.patch diff --git a/patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch b/patches/unapplied/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch similarity index 100% rename from patches/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch rename to patches/unapplied/server/0137-provide-a-configurable-option-to-disable-creeper-lin.patch diff --git a/patches/server/0138-Item-canEntityPickup.patch b/patches/unapplied/server/0138-Item-canEntityPickup.patch similarity index 100% rename from patches/server/0138-Item-canEntityPickup.patch rename to patches/unapplied/server/0138-Item-canEntityPickup.patch diff --git a/patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/unapplied/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/unapplied/server/0139-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/server/0140-PlayerAttemptPickupItemEvent.patch b/patches/unapplied/server/0140-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/server/0140-PlayerAttemptPickupItemEvent.patch rename to patches/unapplied/server/0140-PlayerAttemptPickupItemEvent.patch diff --git a/patches/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch b/patches/unapplied/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch similarity index 100% rename from patches/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch rename to patches/unapplied/server/0141-Do-not-submit-profile-lookups-to-worldgen-threads.patch diff --git a/patches/server/0142-Add-UnknownCommandEvent.patch b/patches/unapplied/server/0142-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/server/0142-Add-UnknownCommandEvent.patch rename to patches/unapplied/server/0142-Add-UnknownCommandEvent.patch diff --git a/patches/server/0143-Basic-PlayerProfile-API.patch b/patches/unapplied/server/0143-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/server/0143-Basic-PlayerProfile-API.patch rename to patches/unapplied/server/0143-Basic-PlayerProfile-API.patch diff --git a/patches/server/0144-Shoulder-Entities-Release-API.patch b/patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/server/0144-Shoulder-Entities-Release-API.patch rename to patches/unapplied/server/0144-Shoulder-Entities-Release-API.patch diff --git a/patches/server/0145-Profile-Lookup-Events.patch b/patches/unapplied/server/0145-Profile-Lookup-Events.patch similarity index 100% rename from patches/server/0145-Profile-Lookup-Events.patch rename to patches/unapplied/server/0145-Profile-Lookup-Events.patch diff --git a/patches/server/0146-Block-player-logins-during-server-shutdown.patch b/patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch similarity index 100% rename from patches/server/0146-Block-player-logins-during-server-shutdown.patch rename to patches/unapplied/server/0146-Block-player-logins-during-server-shutdown.patch diff --git a/patches/server/0147-Entity-fromMobSpawner.patch b/patches/unapplied/server/0147-Entity-fromMobSpawner.patch similarity index 100% rename from patches/server/0147-Entity-fromMobSpawner.patch rename to patches/unapplied/server/0147-Entity-fromMobSpawner.patch diff --git a/patches/server/0148-Improve-the-Saddle-API-for-Horses.patch b/patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/server/0148-Improve-the-Saddle-API-for-Horses.patch rename to patches/unapplied/server/0148-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/server/0149-Implement-ensureServerConversions-API.patch b/patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch similarity index 100% rename from patches/server/0149-Implement-ensureServerConversions-API.patch rename to patches/unapplied/server/0149-Implement-ensureServerConversions-API.patch diff --git a/patches/server/0150-Implement-getI18NDisplayName.patch b/patches/unapplied/server/0150-Implement-getI18NDisplayName.patch similarity index 100% rename from patches/server/0150-Implement-getI18NDisplayName.patch rename to patches/unapplied/server/0150-Implement-getI18NDisplayName.patch diff --git a/patches/server/0151-ProfileWhitelistVerifyEvent.patch b/patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/server/0151-ProfileWhitelistVerifyEvent.patch rename to patches/unapplied/server/0151-ProfileWhitelistVerifyEvent.patch diff --git a/patches/server/0152-Fix-this-stupid-bullshit.patch b/patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch similarity index 100% rename from patches/server/0152-Fix-this-stupid-bullshit.patch rename to patches/unapplied/server/0152-Fix-this-stupid-bullshit.patch diff --git a/patches/server/0153-LivingEntity-setKiller.patch b/patches/unapplied/server/0153-LivingEntity-setKiller.patch similarity index 100% rename from patches/server/0153-LivingEntity-setKiller.patch rename to patches/unapplied/server/0153-LivingEntity-setKiller.patch diff --git a/patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch b/patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch similarity index 100% rename from patches/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch rename to patches/unapplied/server/0154-Ocelot-despawns-should-honor-nametags-and-leash.patch diff --git a/patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch similarity index 100% rename from patches/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch rename to patches/unapplied/server/0155-Reset-spawner-timer-when-spawner-event-is-cancelled.patch diff --git a/patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch b/patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch similarity index 100% rename from patches/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch rename to patches/unapplied/server/0156-Allow-specifying-a-custom-authentication-servers-dow.patch diff --git a/patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch b/patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch similarity index 100% rename from patches/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch rename to patches/unapplied/server/0157-Handle-plugin-prefixes-using-Log4J-configuration.patch diff --git a/patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch b/patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch similarity index 100% rename from patches/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch rename to patches/unapplied/server/0158-Improve-Log4J-Configuration-Plugin-Loggers.patch diff --git a/patches/server/0159-Add-PlayerJumpEvent.patch b/patches/unapplied/server/0159-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/server/0159-Add-PlayerJumpEvent.patch rename to patches/unapplied/server/0159-Add-PlayerJumpEvent.patch diff --git a/patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch b/patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch similarity index 100% rename from patches/server/0160-handle-ServerboundKeepAlivePacket-async.patch rename to patches/unapplied/server/0160-handle-ServerboundKeepAlivePacket-async.patch diff --git a/patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch b/patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/server/0161-Expose-client-protocol-version-and-virtual-host.patch rename to patches/unapplied/server/0161-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/server/0162-revert-serverside-behavior-of-keepalives.patch b/patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch similarity index 100% rename from patches/server/0162-revert-serverside-behavior-of-keepalives.patch rename to patches/unapplied/server/0162-revert-serverside-behavior-of-keepalives.patch diff --git a/patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch similarity index 100% rename from patches/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch rename to patches/unapplied/server/0163-Send-attack-SoundEffects-only-to-players-who-can-see.patch diff --git a/patches/server/0164-Add-PlayerArmorChangeEvent.patch b/patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/server/0164-Add-PlayerArmorChangeEvent.patch rename to patches/unapplied/server/0164-Add-PlayerArmorChangeEvent.patch diff --git a/patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch b/patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch similarity index 100% rename from patches/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch rename to patches/unapplied/server/0165-Prevent-logins-from-being-processed-when-the-player-.patch diff --git a/patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch similarity index 100% rename from patches/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch rename to patches/unapplied/server/0166-Fix-MC-117075-TE-Unload-Lag-Spike.patch diff --git a/patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch b/patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch similarity index 100% rename from patches/server/0167-use-CB-BlockState-implementations-for-captured-block.patch rename to patches/unapplied/server/0167-use-CB-BlockState-implementations-for-captured-block.patch diff --git a/patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/unapplied/server/0168-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/server/0169-AsyncTabCompleteEvent.patch b/patches/unapplied/server/0169-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/server/0169-AsyncTabCompleteEvent.patch rename to patches/unapplied/server/0169-AsyncTabCompleteEvent.patch diff --git a/patches/server/0170-PlayerPickupExperienceEvent.patch b/patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/server/0170-PlayerPickupExperienceEvent.patch rename to patches/unapplied/server/0170-PlayerPickupExperienceEvent.patch diff --git a/patches/server/0171-Ability-to-apply-mending-to-XP-API.patch b/patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/server/0171-Ability-to-apply-mending-to-XP-API.patch rename to patches/unapplied/server/0171-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch b/patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/server/0172-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/unapplied/server/0172-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch b/patches/unapplied/server/0173-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/server/0173-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/unapplied/server/0173-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/server/0174-PreCreatureSpawnEvent.patch b/patches/unapplied/server/0174-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/server/0174-PreCreatureSpawnEvent.patch rename to patches/unapplied/server/0174-PreCreatureSpawnEvent.patch diff --git a/patches/server/0175-Fill-Profile-Property-Events.patch b/patches/unapplied/server/0175-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/server/0175-Fill-Profile-Property-Events.patch rename to patches/unapplied/server/0175-Fill-Profile-Property-Events.patch diff --git a/patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch b/patches/unapplied/server/0176-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/server/0176-PlayerAdvancementCriterionGrantEvent.patch rename to patches/unapplied/server/0176-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/server/0177-Add-ArmorStand-Item-Meta.patch b/patches/unapplied/server/0177-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/server/0177-Add-ArmorStand-Item-Meta.patch rename to patches/unapplied/server/0177-Add-ArmorStand-Item-Meta.patch diff --git a/patches/server/0178-Extend-Player-Interact-cancellation.patch b/patches/unapplied/server/0178-Extend-Player-Interact-cancellation.patch similarity index 100% rename from patches/server/0178-Extend-Player-Interact-cancellation.patch rename to patches/unapplied/server/0178-Extend-Player-Interact-cancellation.patch diff --git a/patches/server/0179-Tameable-getOwnerUniqueId-API.patch b/patches/unapplied/server/0179-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/server/0179-Tameable-getOwnerUniqueId-API.patch rename to patches/unapplied/server/0179-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/patches/unapplied/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch similarity index 100% rename from patches/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch rename to patches/unapplied/server/0180-Toggleable-player-crits-helps-mitigate-hacked-client.patch diff --git a/patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch b/patches/unapplied/server/0181-Disable-Explicit-Network-Manager-Flushing.patch similarity index 100% rename from patches/server/0181-Disable-Explicit-Network-Manager-Flushing.patch rename to patches/unapplied/server/0181-Disable-Explicit-Network-Manager-Flushing.patch diff --git a/patches/server/0182-Implement-extended-PaperServerListPingEvent.patch b/patches/unapplied/server/0182-Implement-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/server/0182-Implement-extended-PaperServerListPingEvent.patch rename to patches/unapplied/server/0182-Implement-extended-PaperServerListPingEvent.patch diff --git a/patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/unapplied/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/unapplied/server/0183-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/server/0184-Player.setPlayerProfile-API.patch b/patches/unapplied/server/0184-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/server/0184-Player.setPlayerProfile-API.patch rename to patches/unapplied/server/0184-Player.setPlayerProfile-API.patch diff --git a/patches/server/0185-getPlayerUniqueId-API.patch b/patches/unapplied/server/0185-getPlayerUniqueId-API.patch similarity index 100% rename from patches/server/0185-getPlayerUniqueId-API.patch rename to patches/unapplied/server/0185-getPlayerUniqueId-API.patch diff --git a/patches/server/0186-Improved-Async-Task-Scheduler.patch b/patches/unapplied/server/0186-Improved-Async-Task-Scheduler.patch similarity index 100% rename from patches/server/0186-Improved-Async-Task-Scheduler.patch rename to patches/unapplied/server/0186-Improved-Async-Task-Scheduler.patch diff --git a/patches/server/0187-Make-legacy-ping-handler-more-reliable.patch b/patches/unapplied/server/0187-Make-legacy-ping-handler-more-reliable.patch similarity index 100% rename from patches/server/0187-Make-legacy-ping-handler-more-reliable.patch rename to patches/unapplied/server/0187-Make-legacy-ping-handler-more-reliable.patch diff --git a/patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch b/patches/unapplied/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 100% rename from patches/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to patches/unapplied/server/0188-Call-PaperServerListPingEvent-for-legacy-pings.patch diff --git a/patches/server/0189-Flag-to-disable-the-channel-limit.patch b/patches/unapplied/server/0189-Flag-to-disable-the-channel-limit.patch similarity index 100% rename from patches/server/0189-Flag-to-disable-the-channel-limit.patch rename to patches/unapplied/server/0189-Flag-to-disable-the-channel-limit.patch diff --git a/patches/server/0190-Add-openSign-method-to-HumanEntity.patch b/patches/unapplied/server/0190-Add-openSign-method-to-HumanEntity.patch similarity index 100% rename from patches/server/0190-Add-openSign-method-to-HumanEntity.patch rename to patches/unapplied/server/0190-Add-openSign-method-to-HumanEntity.patch diff --git a/patches/server/0191-Configurable-sprint-interruption-on-attack.patch b/patches/unapplied/server/0191-Configurable-sprint-interruption-on-attack.patch similarity index 100% rename from patches/server/0191-Configurable-sprint-interruption-on-attack.patch rename to patches/unapplied/server/0191-Configurable-sprint-interruption-on-attack.patch diff --git a/patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch similarity index 100% rename from patches/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch rename to patches/unapplied/server/0192-Fix-exploit-that-allowed-colored-signs-to-be-created.patch diff --git a/patches/server/0193-EndermanEscapeEvent.patch b/patches/unapplied/server/0193-EndermanEscapeEvent.patch similarity index 100% rename from patches/server/0193-EndermanEscapeEvent.patch rename to patches/unapplied/server/0193-EndermanEscapeEvent.patch diff --git a/patches/server/0194-Enderman.teleportRandomly.patch b/patches/unapplied/server/0194-Enderman.teleportRandomly.patch similarity index 100% rename from patches/server/0194-Enderman.teleportRandomly.patch rename to patches/unapplied/server/0194-Enderman.teleportRandomly.patch diff --git a/patches/server/0195-Block-Enderpearl-Travel-Exploit.patch b/patches/unapplied/server/0195-Block-Enderpearl-Travel-Exploit.patch similarity index 100% rename from patches/server/0195-Block-Enderpearl-Travel-Exploit.patch rename to patches/unapplied/server/0195-Block-Enderpearl-Travel-Exploit.patch diff --git a/patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/unapplied/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/unapplied/server/0196-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/patches/unapplied/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch similarity index 100% rename from patches/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch rename to patches/unapplied/server/0197-Prevent-Frosted-Ice-from-loading-holding-chunks.patch diff --git a/patches/server/0198-EndermanAttackPlayerEvent.patch b/patches/unapplied/server/0198-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/server/0198-EndermanAttackPlayerEvent.patch rename to patches/unapplied/server/0198-EndermanAttackPlayerEvent.patch diff --git a/patches/server/0199-WitchConsumePotionEvent.patch b/patches/unapplied/server/0199-WitchConsumePotionEvent.patch similarity index 100% rename from patches/server/0199-WitchConsumePotionEvent.patch rename to patches/unapplied/server/0199-WitchConsumePotionEvent.patch diff --git a/patches/server/0200-WitchThrowPotionEvent.patch b/patches/unapplied/server/0200-WitchThrowPotionEvent.patch similarity index 100% rename from patches/server/0200-WitchThrowPotionEvent.patch rename to patches/unapplied/server/0200-WitchThrowPotionEvent.patch diff --git a/patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/patches/unapplied/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch similarity index 100% rename from patches/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch rename to patches/unapplied/server/0201-Allow-spawning-Item-entities-with-World.spawnEntity.patch diff --git a/patches/server/0202-WitchReadyPotionEvent.patch b/patches/unapplied/server/0202-WitchReadyPotionEvent.patch similarity index 100% rename from patches/server/0202-WitchReadyPotionEvent.patch rename to patches/unapplied/server/0202-WitchReadyPotionEvent.patch diff --git a/patches/server/0203-ItemStack-getMaxItemUseDuration.patch b/patches/unapplied/server/0203-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/server/0203-ItemStack-getMaxItemUseDuration.patch rename to patches/unapplied/server/0203-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch b/patches/unapplied/server/0204-Implement-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/server/0204-Implement-EntityTeleportEndGatewayEvent.patch rename to patches/unapplied/server/0204-Implement-EntityTeleportEndGatewayEvent.patch diff --git a/patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/patches/unapplied/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch similarity index 100% rename from patches/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch rename to patches/unapplied/server/0205-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch diff --git a/patches/server/0206-Fix-CraftEntity-hashCode.patch b/patches/unapplied/server/0206-Fix-CraftEntity-hashCode.patch similarity index 100% rename from patches/server/0206-Fix-CraftEntity-hashCode.patch rename to patches/unapplied/server/0206-Fix-CraftEntity-hashCode.patch diff --git a/patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch b/patches/unapplied/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch similarity index 100% rename from patches/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch rename to patches/unapplied/server/0207-Configurable-Alternative-LootPool-Luck-Formula.patch diff --git a/patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch b/patches/unapplied/server/0208-Print-Error-details-when-failing-to-save-player-data.patch similarity index 100% rename from patches/server/0208-Print-Error-details-when-failing-to-save-player-data.patch rename to patches/unapplied/server/0208-Print-Error-details-when-failing-to-save-player-data.patch diff --git a/patches/server/0209-Make-shield-blocking-delay-configurable.patch b/patches/unapplied/server/0209-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/server/0209-Make-shield-blocking-delay-configurable.patch rename to patches/unapplied/server/0209-Make-shield-blocking-delay-configurable.patch diff --git a/patches/server/0210-Improve-EntityShootBowEvent.patch b/patches/unapplied/server/0210-Improve-EntityShootBowEvent.patch similarity index 100% rename from patches/server/0210-Improve-EntityShootBowEvent.patch rename to patches/unapplied/server/0210-Improve-EntityShootBowEvent.patch diff --git a/patches/server/0211-PlayerReadyArrowEvent.patch b/patches/unapplied/server/0211-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/server/0211-PlayerReadyArrowEvent.patch rename to patches/unapplied/server/0211-PlayerReadyArrowEvent.patch diff --git a/patches/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch b/patches/unapplied/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch similarity index 100% rename from patches/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch rename to patches/unapplied/server/0212-Implement-EntityKnockbackByEntityEvent-and-EntityPus.patch diff --git a/patches/server/0213-Expand-Explosions-API.patch b/patches/unapplied/server/0213-Expand-Explosions-API.patch similarity index 100% rename from patches/server/0213-Expand-Explosions-API.patch rename to patches/unapplied/server/0213-Expand-Explosions-API.patch diff --git a/patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/unapplied/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/unapplied/server/0214-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/server/0215-RangedEntity-API.patch b/patches/unapplied/server/0215-RangedEntity-API.patch similarity index 100% rename from patches/server/0215-RangedEntity-API.patch rename to patches/unapplied/server/0215-RangedEntity-API.patch diff --git a/patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch b/patches/unapplied/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch similarity index 100% rename from patches/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch rename to patches/unapplied/server/0216-Add-config-to-disable-ender-dragon-legacy-check.patch diff --git a/patches/server/0217-Implement-World.getEntity-UUID-API.patch b/patches/unapplied/server/0217-Implement-World.getEntity-UUID-API.patch similarity index 100% rename from patches/server/0217-Implement-World.getEntity-UUID-API.patch rename to patches/unapplied/server/0217-Implement-World.getEntity-UUID-API.patch diff --git a/patches/server/0218-InventoryCloseEvent-Reason-API.patch b/patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch similarity index 100% rename from patches/server/0218-InventoryCloseEvent-Reason-API.patch rename to patches/unapplied/server/0218-InventoryCloseEvent-Reason-API.patch diff --git a/patches/server/0219-Vex-get-setSummoner-API.patch b/patches/unapplied/server/0219-Vex-get-setSummoner-API.patch similarity index 100% rename from patches/server/0219-Vex-get-setSummoner-API.patch rename to patches/unapplied/server/0219-Vex-get-setSummoner-API.patch diff --git a/patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch similarity index 100% rename from patches/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch rename to patches/unapplied/server/0220-Refresh-player-inventory-when-cancelling-PlayerInter.patch diff --git a/patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch b/patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch similarity index 100% rename from patches/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch rename to patches/unapplied/server/0221-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch diff --git a/patches/server/0222-add-more-information-to-Entity.toString.patch b/patches/unapplied/server/0222-add-more-information-to-Entity.toString.patch similarity index 100% rename from patches/server/0222-add-more-information-to-Entity.toString.patch rename to patches/unapplied/server/0222-add-more-information-to-Entity.toString.patch diff --git a/patches/server/0223-EnderDragon-Events.patch b/patches/unapplied/server/0223-EnderDragon-Events.patch similarity index 100% rename from patches/server/0223-EnderDragon-Events.patch rename to patches/unapplied/server/0223-EnderDragon-Events.patch diff --git a/patches/server/0224-PlayerElytraBoostEvent.patch b/patches/unapplied/server/0224-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/server/0224-PlayerElytraBoostEvent.patch rename to patches/unapplied/server/0224-PlayerElytraBoostEvent.patch diff --git a/patches/server/0225-PlayerLaunchProjectileEvent.patch b/patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/server/0225-PlayerLaunchProjectileEvent.patch rename to patches/unapplied/server/0225-PlayerLaunchProjectileEvent.patch diff --git a/patches/server/0226-Improve-BlockPosition-inlining.patch b/patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch similarity index 100% rename from patches/server/0226-Improve-BlockPosition-inlining.patch rename to patches/unapplied/server/0226-Improve-BlockPosition-inlining.patch diff --git a/patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch similarity index 100% rename from patches/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch rename to patches/unapplied/server/0227-Option-to-prevent-armor-stands-from-doing-entity-loo.patch diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch similarity index 100% rename from patches/server/0228-Vanished-players-don-t-have-rights.patch rename to patches/unapplied/server/0228-Vanished-players-don-t-have-rights.patch diff --git a/patches/server/0229-Allow-disabling-armour-stand-ticking.patch b/patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/server/0229-Allow-disabling-armour-stand-ticking.patch rename to patches/unapplied/server/0229-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/server/0230-SkeletonHorse-Additions.patch b/patches/unapplied/server/0230-SkeletonHorse-Additions.patch similarity index 100% rename from patches/server/0230-SkeletonHorse-Additions.patch rename to patches/unapplied/server/0230-SkeletonHorse-Additions.patch diff --git a/patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch b/patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch similarity index 100% rename from patches/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch rename to patches/unapplied/server/0231-Don-t-call-getItemMeta-on-hasItemMeta.patch diff --git a/patches/server/0232-Implement-Expanded-ArmorStand-API.patch b/patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch similarity index 100% rename from patches/server/0232-Implement-Expanded-ArmorStand-API.patch rename to patches/unapplied/server/0232-Implement-Expanded-ArmorStand-API.patch diff --git a/patches/server/0233-AnvilDamageEvent.patch b/patches/unapplied/server/0233-AnvilDamageEvent.patch similarity index 100% rename from patches/server/0233-AnvilDamageEvent.patch rename to patches/unapplied/server/0233-AnvilDamageEvent.patch diff --git a/patches/server/0234-Add-TNTPrimeEvent.patch b/patches/unapplied/server/0234-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/server/0234-Add-TNTPrimeEvent.patch rename to patches/unapplied/server/0234-Add-TNTPrimeEvent.patch diff --git a/patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch b/patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch similarity index 100% rename from patches/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch rename to patches/unapplied/server/0235-Break-up-and-make-tab-spam-limits-configurable.patch diff --git a/patches/server/0236-Fix-NBT-type-issues.patch b/patches/unapplied/server/0236-Fix-NBT-type-issues.patch similarity index 100% rename from patches/server/0236-Fix-NBT-type-issues.patch rename to patches/unapplied/server/0236-Fix-NBT-type-issues.patch diff --git a/patches/server/0237-Remove-unnecessary-itemmeta-handling.patch b/patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch similarity index 100% rename from patches/server/0237-Remove-unnecessary-itemmeta-handling.patch rename to patches/unapplied/server/0237-Remove-unnecessary-itemmeta-handling.patch diff --git a/patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch similarity index 100% rename from patches/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch rename to patches/unapplied/server/0238-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch diff --git a/patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch b/patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch similarity index 100% rename from patches/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch rename to patches/unapplied/server/0239-Add-Early-Warning-Feature-to-WatchDog.patch diff --git a/patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch b/patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch similarity index 100% rename from patches/server/0240-Use-ConcurrentHashMap-in-JsonList.patch rename to patches/unapplied/server/0240-Use-ConcurrentHashMap-in-JsonList.patch diff --git a/patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch b/patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch similarity index 100% rename from patches/server/0241-Use-a-Queue-for-Queueing-Commands.patch rename to patches/unapplied/server/0241-Use-a-Queue-for-Queueing-Commands.patch diff --git a/patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/unapplied/server/0242-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/server/0243-Optimize-BlockPosition-helper-methods.patch b/patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch similarity index 100% rename from patches/server/0243-Optimize-BlockPosition-helper-methods.patch rename to patches/unapplied/server/0243-Optimize-BlockPosition-helper-methods.patch diff --git a/patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch b/patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch similarity index 100% rename from patches/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch rename to patches/unapplied/server/0244-Restore-vanilla-default-mob-spawn-range-and-water-an.patch diff --git a/patches/server/0245-Slime-Pathfinder-Events.patch b/patches/unapplied/server/0245-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/server/0245-Slime-Pathfinder-Events.patch rename to patches/unapplied/server/0245-Slime-Pathfinder-Events.patch diff --git a/patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch b/patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch similarity index 100% rename from patches/server/0246-Configurable-speed-for-water-flowing-over-lava.patch rename to patches/unapplied/server/0246-Configurable-speed-for-water-flowing-over-lava.patch diff --git a/patches/server/0247-Optimize-CraftBlockData-Creation.patch b/patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch similarity index 100% rename from patches/server/0247-Optimize-CraftBlockData-Creation.patch rename to patches/unapplied/server/0247-Optimize-CraftBlockData-Creation.patch diff --git a/patches/server/0248-Optimize-MappedRegistry.patch b/patches/unapplied/server/0248-Optimize-MappedRegistry.patch similarity index 100% rename from patches/server/0248-Optimize-MappedRegistry.patch rename to patches/unapplied/server/0248-Optimize-MappedRegistry.patch diff --git a/patches/server/0249-Add-PhantomPreSpawnEvent.patch b/patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/server/0249-Add-PhantomPreSpawnEvent.patch rename to patches/unapplied/server/0249-Add-PhantomPreSpawnEvent.patch diff --git a/patches/server/0250-Add-More-Creeper-API.patch b/patches/unapplied/server/0250-Add-More-Creeper-API.patch similarity index 100% rename from patches/server/0250-Add-More-Creeper-API.patch rename to patches/unapplied/server/0250-Add-More-Creeper-API.patch diff --git a/patches/server/0251-Inventory-removeItemAnySlot.patch b/patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/server/0251-Inventory-removeItemAnySlot.patch rename to patches/unapplied/server/0251-Inventory-removeItemAnySlot.patch diff --git a/patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch similarity index 100% rename from patches/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch rename to patches/unapplied/server/0252-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch diff --git a/patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 100% rename from patches/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/unapplied/server/0253-Add-ray-tracing-methods-to-LivingEntity.patch diff --git a/patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch b/patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/server/0254-Expose-attack-cooldown-methods-for-Player.patch rename to patches/unapplied/server/0254-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/server/0255-Improve-death-events.patch b/patches/unapplied/server/0255-Improve-death-events.patch similarity index 100% rename from patches/server/0255-Improve-death-events.patch rename to patches/unapplied/server/0255-Improve-death-events.patch diff --git a/patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 100% rename from patches/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/unapplied/server/0256-Allow-chests-to-be-placed-with-NBT-data.patch diff --git a/patches/server/0257-Mob-Pathfinding-API.patch b/patches/unapplied/server/0257-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0257-Mob-Pathfinding-API.patch rename to patches/unapplied/server/0257-Mob-Pathfinding-API.patch diff --git a/patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch similarity index 100% rename from patches/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch rename to patches/unapplied/server/0258-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch diff --git a/patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/0259-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch similarity index 100% rename from patches/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch rename to patches/unapplied/server/0260-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch diff --git a/patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/unapplied/server/0261-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0262-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/0262-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch b/patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch similarity index 100% rename from patches/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch rename to patches/unapplied/server/0263-Catch-JsonParseException-in-Entity-and-TE-names.patch diff --git a/patches/server/0264-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0264-Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/0264-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0265-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0265-Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/0265-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0266-Hook-into-CB-plugin-rewrites.patch b/patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch similarity index 100% rename from patches/server/0266-Hook-into-CB-plugin-rewrites.patch rename to patches/unapplied/server/0266-Hook-into-CB-plugin-rewrites.patch diff --git a/patches/server/0267-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0267-PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/0267-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0268-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0268-Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/0268-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0269-Add-sun-related-API.patch b/patches/unapplied/server/0269-Add-sun-related-API.patch similarity index 100% rename from patches/server/0269-Add-sun-related-API.patch rename to patches/unapplied/server/0269-Add-sun-related-API.patch diff --git a/patches/server/0270-Turtle-API.patch b/patches/unapplied/server/0270-Turtle-API.patch similarity index 100% rename from patches/server/0270-Turtle-API.patch rename to patches/unapplied/server/0270-Turtle-API.patch diff --git a/patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0271-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/unapplied/server/0271-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch similarity index 100% rename from patches/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch rename to patches/unapplied/server/0272-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch diff --git a/patches/server/0273-Add-more-Witch-API.patch b/patches/unapplied/server/0273-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0273-Add-more-Witch-API.patch rename to patches/unapplied/server/0273-Add-more-Witch-API.patch diff --git a/patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/0274-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/unapplied/server/0275-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0276-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0276-Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/0276-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/unapplied/server/0277-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 100% rename from patches/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/unapplied/server/0278-Improve-Server-Thread-Pool-and-Thread-Priorities.patch diff --git a/patches/server/0279-Optimize-World-Time-Updates.patch b/patches/unapplied/server/0279-Optimize-World-Time-Updates.patch similarity index 100% rename from patches/server/0279-Optimize-World-Time-Updates.patch rename to patches/unapplied/server/0279-Optimize-World-Time-Updates.patch diff --git a/patches/server/0280-Restore-custom-InventoryHolder-support.patch b/patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch similarity index 100% rename from patches/server/0280-Restore-custom-InventoryHolder-support.patch rename to patches/unapplied/server/0280-Restore-custom-InventoryHolder-support.patch diff --git a/patches/server/0281-Use-Vanilla-Minecart-Speeds.patch b/patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch similarity index 100% rename from patches/server/0281-Use-Vanilla-Minecart-Speeds.patch rename to patches/unapplied/server/0281-Use-Vanilla-Minecart-Speeds.patch diff --git a/patches/server/0282-Fix-SpongeAbsortEvent-handling.patch b/patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch similarity index 100% rename from patches/server/0282-Fix-SpongeAbsortEvent-handling.patch rename to patches/unapplied/server/0282-Fix-SpongeAbsortEvent-handling.patch diff --git a/patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch b/patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch similarity index 100% rename from patches/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch rename to patches/unapplied/server/0283-Don-t-allow-digging-into-unloaded-chunks.patch diff --git a/patches/server/0284-Make-the-default-permission-message-configurable.patch b/patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/server/0284-Make-the-default-permission-message-configurable.patch rename to patches/unapplied/server/0284-Make-the-default-permission-message-configurable.patch diff --git a/patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch b/patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch similarity index 100% rename from patches/server/0285-Prevent-rayTrace-from-loading-chunks.patch rename to patches/unapplied/server/0285-Prevent-rayTrace-from-loading-chunks.patch diff --git a/patches/server/0286-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/0286-Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/0286-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/0287-force-entity-dismount-during-teleportation.patch b/patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch similarity index 100% rename from patches/server/0287-force-entity-dismount-during-teleportation.patch rename to patches/unapplied/server/0287-force-entity-dismount-during-teleportation.patch diff --git a/patches/server/0288-Add-more-Zombie-API.patch b/patches/unapplied/server/0288-Add-more-Zombie-API.patch similarity index 100% rename from patches/server/0288-Add-more-Zombie-API.patch rename to patches/unapplied/server/0288-Add-more-Zombie-API.patch diff --git a/patches/server/0289-Book-Size-Limits.patch b/patches/unapplied/server/0289-Book-Size-Limits.patch similarity index 100% rename from patches/server/0289-Book-Size-Limits.patch rename to patches/unapplied/server/0289-Book-Size-Limits.patch diff --git a/patches/server/0290-Add-PlayerConnectionCloseEvent.patch b/patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/server/0290-Add-PlayerConnectionCloseEvent.patch rename to patches/unapplied/server/0290-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/server/0291-Prevent-Enderman-from-loading-chunks.patch b/patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch similarity index 100% rename from patches/server/0291-Prevent-Enderman-from-loading-chunks.patch rename to patches/unapplied/server/0291-Prevent-Enderman-from-loading-chunks.patch diff --git a/patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/unapplied/server/0292-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch similarity index 100% rename from patches/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch rename to patches/unapplied/server/0293-Workaround-for-vehicle-tracking-issue-on-disconnect.patch diff --git a/patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch b/patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch similarity index 100% rename from patches/server/0294-Block-Entity-remove-from-being-called-on-Players.patch rename to patches/unapplied/server/0294-Block-Entity-remove-from-being-called-on-Players.patch diff --git a/patches/server/0295-BlockDestroyEvent.patch b/patches/unapplied/server/0295-BlockDestroyEvent.patch similarity index 100% rename from patches/server/0295-BlockDestroyEvent.patch rename to patches/unapplied/server/0295-BlockDestroyEvent.patch diff --git a/patches/server/0296-Async-command-map-building.patch b/patches/unapplied/server/0296-Async-command-map-building.patch similarity index 100% rename from patches/server/0296-Async-command-map-building.patch rename to patches/unapplied/server/0296-Async-command-map-building.patch diff --git a/patches/server/0297-Implement-Brigadier-Mojang-API.patch b/patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch similarity index 100% rename from patches/server/0297-Implement-Brigadier-Mojang-API.patch rename to patches/unapplied/server/0297-Implement-Brigadier-Mojang-API.patch diff --git a/patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch similarity index 100% rename from patches/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch rename to patches/unapplied/server/0298-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch diff --git a/patches/server/0299-Limit-Client-Sign-length-more.patch b/patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch similarity index 100% rename from patches/server/0299-Limit-Client-Sign-length-more.patch rename to patches/unapplied/server/0299-Limit-Client-Sign-length-more.patch diff --git a/patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch similarity index 100% rename from patches/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch rename to patches/unapplied/server/0300-Don-t-check-ConvertSigns-boolean-every-sign-save.patch diff --git a/patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch similarity index 100% rename from patches/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch rename to patches/unapplied/server/0301-Optimize-Network-Manager-and-add-advanced-packet-sup.patch diff --git a/patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch b/patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch similarity index 100% rename from patches/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch rename to patches/unapplied/server/0302-Handle-Oversized-Tile-Entities-in-chunks.patch diff --git a/patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch similarity index 100% rename from patches/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch rename to patches/unapplied/server/0303-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch diff --git a/patches/server/0304-Entity-getEntitySpawnReason.patch b/patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/server/0304-Entity-getEntitySpawnReason.patch rename to patches/unapplied/server/0304-Entity-getEntitySpawnReason.patch diff --git a/patches/server/0305-Fire-event-on-GS4-query.patch b/patches/unapplied/server/0305-Fire-event-on-GS4-query.patch similarity index 100% rename from patches/server/0305-Fire-event-on-GS4-query.patch rename to patches/unapplied/server/0305-Fire-event-on-GS4-query.patch diff --git a/patches/server/0306-Implement-PlayerPostRespawnEvent.patch b/patches/unapplied/server/0306-Implement-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/server/0306-Implement-PlayerPostRespawnEvent.patch rename to patches/unapplied/server/0306-Implement-PlayerPostRespawnEvent.patch diff --git a/patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/patches/unapplied/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch similarity index 100% rename from patches/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch rename to patches/unapplied/server/0307-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch diff --git a/patches/server/0308-Server-Tick-Events.patch b/patches/unapplied/server/0308-Server-Tick-Events.patch similarity index 100% rename from patches/server/0308-Server-Tick-Events.patch rename to patches/unapplied/server/0308-Server-Tick-Events.patch diff --git a/patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch b/patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/server/0309-PlayerDeathEvent-getItemsToKeep.patch rename to patches/unapplied/server/0309-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch b/patches/unapplied/server/0310-Optimize-Captured-TileEntity-Lookup.patch similarity index 100% rename from patches/server/0310-Optimize-Captured-TileEntity-Lookup.patch rename to patches/unapplied/server/0310-Optimize-Captured-TileEntity-Lookup.patch diff --git a/patches/server/0311-Add-Heightmap-API.patch b/patches/unapplied/server/0311-Add-Heightmap-API.patch similarity index 100% rename from patches/server/0311-Add-Heightmap-API.patch rename to patches/unapplied/server/0311-Add-Heightmap-API.patch diff --git a/patches/server/0312-Mob-Spawner-API-Enhancements.patch b/patches/unapplied/server/0312-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/server/0312-Mob-Spawner-API-Enhancements.patch rename to patches/unapplied/server/0312-Mob-Spawner-API-Enhancements.patch diff --git a/patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch b/patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch similarity index 100% rename from patches/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch rename to patches/unapplied/server/0313-Fix-CB-call-to-changed-postToMainThread-method.patch diff --git a/patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/patches/unapplied/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch similarity index 100% rename from patches/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch rename to patches/unapplied/server/0314-Fix-sounds-when-item-frames-are-modified-MC-123450.patch diff --git a/patches/server/0315-Implement-CraftBlockSoundGroup.patch b/patches/unapplied/server/0315-Implement-CraftBlockSoundGroup.patch similarity index 100% rename from patches/server/0315-Implement-CraftBlockSoundGroup.patch rename to patches/unapplied/server/0315-Implement-CraftBlockSoundGroup.patch diff --git a/patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/patches/unapplied/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch similarity index 100% rename from patches/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch rename to patches/unapplied/server/0316-Configurable-Keep-Spawn-Loaded-range-per-world.patch diff --git a/patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch b/patches/unapplied/server/0317-Allow-Saving-of-Oversized-Chunks.patch similarity index 100% rename from patches/server/0317-Allow-Saving-of-Oversized-Chunks.patch rename to patches/unapplied/server/0317-Allow-Saving-of-Oversized-Chunks.patch diff --git a/patches/server/0318-Expose-the-internal-current-tick.patch b/patches/unapplied/server/0318-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/server/0318-Expose-the-internal-current-tick.patch rename to patches/unapplied/server/0318-Expose-the-internal-current-tick.patch diff --git a/patches/server/0319-Fix-World-isChunkGenerated-calls.patch b/patches/unapplied/server/0319-Fix-World-isChunkGenerated-calls.patch similarity index 100% rename from patches/server/0319-Fix-World-isChunkGenerated-calls.patch rename to patches/unapplied/server/0319-Fix-World-isChunkGenerated-calls.patch diff --git a/patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch b/patches/unapplied/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch similarity index 100% rename from patches/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch rename to patches/unapplied/server/0320-Show-blockstate-location-if-we-failed-to-read-it.patch diff --git a/patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/patches/unapplied/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch similarity index 100% rename from patches/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch rename to patches/unapplied/server/0321-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch diff --git a/patches/server/0322-Configurable-projectile-relative-velocity.patch b/patches/unapplied/server/0322-Configurable-projectile-relative-velocity.patch similarity index 100% rename from patches/server/0322-Configurable-projectile-relative-velocity.patch rename to patches/unapplied/server/0322-Configurable-projectile-relative-velocity.patch diff --git a/patches/server/0323-offset-item-frame-ticking.patch b/patches/unapplied/server/0323-offset-item-frame-ticking.patch similarity index 100% rename from patches/server/0323-offset-item-frame-ticking.patch rename to patches/unapplied/server/0323-offset-item-frame-ticking.patch diff --git a/patches/server/0324-Fix-MC-158900.patch b/patches/unapplied/server/0324-Fix-MC-158900.patch similarity index 100% rename from patches/server/0324-Fix-MC-158900.patch rename to patches/unapplied/server/0324-Fix-MC-158900.patch diff --git a/patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch b/patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch similarity index 100% rename from patches/server/0325-Prevent-consuming-the-wrong-itemstack.patch rename to patches/unapplied/server/0325-Prevent-consuming-the-wrong-itemstack.patch diff --git a/patches/server/0326-Dont-send-unnecessary-sign-update.patch b/patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch similarity index 100% rename from patches/server/0326-Dont-send-unnecessary-sign-update.patch rename to patches/unapplied/server/0326-Dont-send-unnecessary-sign-update.patch diff --git a/patches/server/0327-Add-option-to-disable-pillager-patrols.patch b/patches/unapplied/server/0327-Add-option-to-disable-pillager-patrols.patch similarity index 100% rename from patches/server/0327-Add-option-to-disable-pillager-patrols.patch rename to patches/unapplied/server/0327-Add-option-to-disable-pillager-patrols.patch diff --git a/patches/server/0328-Flat-bedrock-generator-settings.patch b/patches/unapplied/server/0328-Flat-bedrock-generator-settings.patch similarity index 100% rename from patches/server/0328-Flat-bedrock-generator-settings.patch rename to patches/unapplied/server/0328-Flat-bedrock-generator-settings.patch diff --git a/patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/patches/unapplied/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch similarity index 100% rename from patches/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch rename to patches/unapplied/server/0329-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch diff --git a/patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch b/patches/unapplied/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch similarity index 100% rename from patches/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch rename to patches/unapplied/server/0330-MC-145656-Fix-Follow-Range-Initial-Target.patch diff --git a/patches/server/0331-Duplicate-UUID-Resolve-Option.patch b/patches/unapplied/server/0331-Duplicate-UUID-Resolve-Option.patch similarity index 100% rename from patches/server/0331-Duplicate-UUID-Resolve-Option.patch rename to patches/unapplied/server/0331-Duplicate-UUID-Resolve-Option.patch diff --git a/patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch b/patches/unapplied/server/0332-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/server/0332-PlayerDeathEvent-shouldDropExperience.patch rename to patches/unapplied/server/0332-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch b/patches/unapplied/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch similarity index 100% rename from patches/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch rename to patches/unapplied/server/0333-Prevent-bees-loading-chunks-checking-hive-position.patch diff --git a/patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/patches/unapplied/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch similarity index 100% rename from patches/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch rename to patches/unapplied/server/0334-Don-t-load-Chunks-from-Hoppers-and-other-things.patch diff --git a/patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch b/patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch similarity index 100% rename from patches/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch rename to patches/unapplied/server/0335-Guard-against-serializing-mismatching-chunk-coordina.patch diff --git a/patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch b/patches/unapplied/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch similarity index 100% rename from patches/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch rename to patches/unapplied/server/0336-Optimise-EntityGetter-getPlayerByUUID.patch diff --git a/patches/server/0337-Fix-items-not-falling-correctly.patch b/patches/unapplied/server/0337-Fix-items-not-falling-correctly.patch similarity index 100% rename from patches/server/0337-Fix-items-not-falling-correctly.patch rename to patches/unapplied/server/0337-Fix-items-not-falling-correctly.patch diff --git a/patches/server/0338-Lag-compensate-eating.patch b/patches/unapplied/server/0338-Lag-compensate-eating.patch similarity index 100% rename from patches/server/0338-Lag-compensate-eating.patch rename to patches/unapplied/server/0338-Lag-compensate-eating.patch diff --git a/patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch b/patches/unapplied/server/0339-Optimize-call-to-getFluid-for-explosions.patch similarity index 100% rename from patches/server/0339-Optimize-call-to-getFluid-for-explosions.patch rename to patches/unapplied/server/0339-Optimize-call-to-getFluid-for-explosions.patch diff --git a/patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/patches/unapplied/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch similarity index 100% rename from patches/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch rename to patches/unapplied/server/0340-Fix-last-firework-in-stack-not-having-effects-when-d.patch diff --git a/patches/server/0341-Entity-Activation-Range-2.0.patch b/patches/unapplied/server/0341-Entity-Activation-Range-2.0.patch similarity index 100% rename from patches/server/0341-Entity-Activation-Range-2.0.patch rename to patches/unapplied/server/0341-Entity-Activation-Range-2.0.patch diff --git a/patches/server/0342-Increase-Light-Queue-Size.patch b/patches/unapplied/server/0342-Increase-Light-Queue-Size.patch similarity index 100% rename from patches/server/0342-Increase-Light-Queue-Size.patch rename to patches/unapplied/server/0342-Increase-Light-Queue-Size.patch diff --git a/patches/server/0343-Anti-Xray.patch b/patches/unapplied/server/0343-Anti-Xray.patch similarity index 100% rename from patches/server/0343-Anti-Xray.patch rename to patches/unapplied/server/0343-Anti-Xray.patch diff --git a/patches/server/0344-Implement-alternative-item-despawn-rate.patch b/patches/unapplied/server/0344-Implement-alternative-item-despawn-rate.patch similarity index 100% rename from patches/server/0344-Implement-alternative-item-despawn-rate.patch rename to patches/unapplied/server/0344-Implement-alternative-item-despawn-rate.patch diff --git a/patches/server/0345-Tracking-Range-Improvements.patch b/patches/unapplied/server/0345-Tracking-Range-Improvements.patch similarity index 100% rename from patches/server/0345-Tracking-Range-Improvements.patch rename to patches/unapplied/server/0345-Tracking-Range-Improvements.patch diff --git a/patches/server/0346-Fix-items-vanishing-through-end-portal.patch b/patches/unapplied/server/0346-Fix-items-vanishing-through-end-portal.patch similarity index 100% rename from patches/server/0346-Fix-items-vanishing-through-end-portal.patch rename to patches/unapplied/server/0346-Fix-items-vanishing-through-end-portal.patch diff --git a/patches/server/0347-implement-optional-per-player-mob-spawns.patch b/patches/unapplied/server/0347-implement-optional-per-player-mob-spawns.patch similarity index 100% rename from patches/server/0347-implement-optional-per-player-mob-spawns.patch rename to patches/unapplied/server/0347-implement-optional-per-player-mob-spawns.patch diff --git a/patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/patches/unapplied/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch similarity index 100% rename from patches/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch rename to patches/unapplied/server/0348-Bees-get-gravity-in-void.-Fixes-MC-167279.patch diff --git a/patches/server/0349-Improve-Block-breakNaturally-API.patch b/patches/unapplied/server/0349-Improve-Block-breakNaturally-API.patch similarity index 100% rename from patches/server/0349-Improve-Block-breakNaturally-API.patch rename to patches/unapplied/server/0349-Improve-Block-breakNaturally-API.patch diff --git a/patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/patches/unapplied/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch similarity index 100% rename from patches/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch rename to patches/unapplied/server/0350-Optimise-getChunkAt-calls-for-loaded-chunks.patch diff --git a/patches/server/0351-Add-debug-for-sync-chunk-loads.patch b/patches/unapplied/server/0351-Add-debug-for-sync-chunk-loads.patch similarity index 100% rename from patches/server/0351-Add-debug-for-sync-chunk-loads.patch rename to patches/unapplied/server/0351-Add-debug-for-sync-chunk-loads.patch diff --git a/patches/server/0352-Remove-garbage-Java-version-check.patch b/patches/unapplied/server/0352-Remove-garbage-Java-version-check.patch similarity index 100% rename from patches/server/0352-Remove-garbage-Java-version-check.patch rename to patches/unapplied/server/0352-Remove-garbage-Java-version-check.patch diff --git a/patches/server/0353-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0353-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0353-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/0353-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0354-Entity-Jump-API.patch b/patches/unapplied/server/0354-Entity-Jump-API.patch similarity index 100% rename from patches/server/0354-Entity-Jump-API.patch rename to patches/unapplied/server/0354-Entity-Jump-API.patch diff --git a/patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 100% rename from patches/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/0355-Add-option-to-nerf-pigmen-from-nether-portals.patch diff --git a/patches/server/0356-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0356-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0356-Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/0356-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0357-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/server/0357-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/0357-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/server/0358-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0358-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0358-Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/0358-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/0359-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0360-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0360-Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/0360-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0361-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0361-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0361-Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/0361-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 100% rename from patches/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/0362-Set-spigots-verbose-world-setting-to-false-by-def.patch diff --git a/patches/server/0363-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0363-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0363-Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/0363-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0364-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0364-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0364-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/0364-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/0365-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 100% rename from patches/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/0366-Pillager-patrol-spawn-settings-and-per-player-option.patch diff --git a/patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 100% rename from patches/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/0367-Remote-Connections-shouldn-t-hold-up-shutdown.patch diff --git a/patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/0368-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/0369-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0370-Don-t-tick-dead-players.patch b/patches/unapplied/server/0370-Don-t-tick-dead-players.patch similarity index 100% rename from patches/server/0370-Don-t-tick-dead-players.patch rename to patches/unapplied/server/0370-Don-t-tick-dead-players.patch diff --git a/patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 100% rename from patches/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/0371-Dead-Player-s-shouldn-t-be-able-to-move.patch diff --git a/patches/server/0372-Optimize-Collision-to-not-load-chunks.patch b/patches/unapplied/server/0372-Optimize-Collision-to-not-load-chunks.patch similarity index 100% rename from patches/server/0372-Optimize-Collision-to-not-load-chunks.patch rename to patches/unapplied/server/0372-Optimize-Collision-to-not-load-chunks.patch diff --git a/patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0373-Don-t-move-existing-players-to-world-spawn.patch similarity index 100% rename from patches/server/0373-Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/0373-Don-t-move-existing-players-to-world-spawn.patch diff --git a/patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/unapplied/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch similarity index 100% rename from patches/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch rename to patches/unapplied/server/0374-Optimize-GoalSelector-Goal.Flag-Set-operations.patch diff --git a/patches/server/0375-Improved-Watchdog-Support.patch b/patches/unapplied/server/0375-Improved-Watchdog-Support.patch similarity index 100% rename from patches/server/0375-Improved-Watchdog-Support.patch rename to patches/unapplied/server/0375-Improved-Watchdog-Support.patch diff --git a/patches/server/0376-Optimize-Pathfinding.patch b/patches/unapplied/server/0376-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0376-Optimize-Pathfinding.patch rename to patches/unapplied/server/0376-Optimize-Pathfinding.patch diff --git a/patches/server/0377-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0377-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0377-Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/0377-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch b/patches/unapplied/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch similarity index 100% rename from patches/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch rename to patches/unapplied/server/0378-Reduce-memory-footprint-of-NBTTagCompound.patch diff --git a/patches/server/0379-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0379-Prevent-opening-inventories-when-frozen.patch similarity index 100% rename from patches/server/0379-Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/0379-Prevent-opening-inventories-when-frozen.patch diff --git a/patches/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/0380-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0381-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0381-Implement-Player-Client-Options-API.patch similarity index 100% rename from patches/server/0381-Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/0381-Implement-Player-Client-Options-API.patch diff --git a/patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/0382-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch b/patches/unapplied/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch similarity index 100% rename from patches/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch rename to patches/unapplied/server/0383-Fix-Longstanding-Broken-behavior-of-PlayerJoinEvent.patch diff --git a/patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 100% rename from patches/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/0384-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch diff --git a/patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/0385-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/0386-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0387-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0387-Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/0387-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch b/patches/unapplied/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch similarity index 100% rename from patches/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch rename to patches/unapplied/server/0388-Fix-numerous-item-duplication-issues-and-teleport-is.patch diff --git a/patches/server/0389-Villager-Restocks-API.patch b/patches/unapplied/server/0389-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0389-Villager-Restocks-API.patch rename to patches/unapplied/server/0389-Villager-Restocks-API.patch diff --git a/patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/0390-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0391-Expose-game-version.patch b/patches/unapplied/server/0391-Expose-game-version.patch similarity index 100% rename from patches/server/0391-Expose-game-version.patch rename to patches/unapplied/server/0391-Expose-game-version.patch diff --git a/patches/server/0392-Optimize-Voxel-Shape-Merging.patch b/patches/unapplied/server/0392-Optimize-Voxel-Shape-Merging.patch similarity index 100% rename from patches/server/0392-Optimize-Voxel-Shape-Merging.patch rename to patches/unapplied/server/0392-Optimize-Voxel-Shape-Merging.patch diff --git a/patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 100% rename from patches/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/0393-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch diff --git a/patches/server/0394-misc-debugging-dumps.patch b/patches/unapplied/server/0394-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0394-misc-debugging-dumps.patch rename to patches/unapplied/server/0394-misc-debugging-dumps.patch diff --git a/patches/server/0395-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0395-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0395-Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/0395-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/unapplied/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch similarity index 100% rename from patches/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch rename to patches/unapplied/server/0396-Deobfuscate-stacktraces-in-log-messages-crash-report.patch diff --git a/patches/server/0397-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0397-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0397-Implement-Mob-Goal-API.patch rename to patches/unapplied/server/0397-Implement-Mob-Goal-API.patch diff --git a/patches/server/0398-Add-villager-reputation-API.patch b/patches/unapplied/server/0398-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0398-Add-villager-reputation-API.patch rename to patches/unapplied/server/0398-Add-villager-reputation-API.patch diff --git a/patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch b/patches/unapplied/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch similarity index 100% rename from patches/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch rename to patches/unapplied/server/0399-Option-for-maximum-exp-value-when-merging-orbs.patch diff --git a/patches/server/0400-ExperienceOrbMergeEvent.patch b/patches/unapplied/server/0400-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/server/0400-ExperienceOrbMergeEvent.patch rename to patches/unapplied/server/0400-ExperienceOrbMergeEvent.patch diff --git a/patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0401-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0401-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/0401-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0402-Optimize-brigadier-child-sorting-performance.patch b/patches/unapplied/server/0402-Optimize-brigadier-child-sorting-performance.patch similarity index 100% rename from patches/server/0402-Optimize-brigadier-child-sorting-performance.patch rename to patches/unapplied/server/0402-Optimize-brigadier-child-sorting-performance.patch diff --git a/patches/server/0403-Potential-bed-API.patch b/patches/unapplied/server/0403-Potential-bed-API.patch similarity index 100% rename from patches/server/0403-Potential-bed-API.patch rename to patches/unapplied/server/0403-Potential-bed-API.patch diff --git a/patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0404-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0404-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/0404-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/0405-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/unapplied/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch similarity index 100% rename from patches/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch rename to patches/unapplied/server/0406-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch diff --git a/patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch b/patches/unapplied/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch similarity index 100% rename from patches/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch rename to patches/unapplied/server/0407-Reduce-MutableInt-allocations-from-light-engine.patch diff --git a/patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/0408-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0409-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0409-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0409-Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/0409-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0410-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0410-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0410-Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/0410-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch b/patches/unapplied/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch similarity index 100% rename from patches/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch rename to patches/unapplied/server/0411-Optimize-anyPlayerCloseEnoughForSpawning-to-use-dist.patch diff --git a/patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch b/patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch similarity index 100% rename from patches/server/0412-Use-distance-map-to-optimise-entity-tracker.patch rename to patches/unapplied/server/0412-Use-distance-map-to-optimise-entity-tracker.patch diff --git a/patches/server/0413-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0413-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0413-Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/0413-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0414-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0414-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0414-Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/0414-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/0415-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/0416-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/0417-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0418-Fix-sand-duping.patch b/patches/unapplied/server/0418-Fix-sand-duping.patch similarity index 100% rename from patches/server/0418-Fix-sand-duping.patch rename to patches/unapplied/server/0418-Fix-sand-duping.patch diff --git a/patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/0419-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch b/patches/unapplied/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch similarity index 100% rename from patches/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch rename to patches/unapplied/server/0420-Prevent-position-desync-in-playerconnection-causing-.patch diff --git a/patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0421-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0421-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/0421-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0422-Improve-Arrow-API.patch b/patches/unapplied/server/0422-Improve-Arrow-API.patch similarity index 100% rename from patches/server/0422-Improve-Arrow-API.patch rename to patches/unapplied/server/0422-Improve-Arrow-API.patch diff --git a/patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/0423-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0424-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0424-Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/0424-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0425-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0425-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0425-Add-permission-for-command-blocks.patch rename to patches/unapplied/server/0425-Add-permission-for-command-blocks.patch diff --git a/patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch b/patches/unapplied/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch similarity index 100% rename from patches/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch rename to patches/unapplied/server/0426-Ensure-Entity-AABB-s-are-never-invalid.patch diff --git a/patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 100% rename from patches/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/0427-Fix-Per-World-Difficulty-Remembering-Difficulty.patch diff --git a/patches/server/0428-Paper-dumpitem-command.patch b/patches/unapplied/server/0428-Paper-dumpitem-command.patch similarity index 100% rename from patches/server/0428-Paper-dumpitem-command.patch rename to patches/unapplied/server/0428-Paper-dumpitem-command.patch diff --git a/patches/server/0429-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0429-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0429-Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/0429-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0430-Optimize-Bit-Operations-by-inlining.patch b/patches/unapplied/server/0430-Optimize-Bit-Operations-by-inlining.patch similarity index 100% rename from patches/server/0430-Optimize-Bit-Operations-by-inlining.patch rename to patches/unapplied/server/0430-Optimize-Bit-Operations-by-inlining.patch diff --git a/patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/0431-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0432-incremental-chunk-and-player-saving.patch b/patches/unapplied/server/0432-incremental-chunk-and-player-saving.patch similarity index 100% rename from patches/server/0432-incremental-chunk-and-player-saving.patch rename to patches/unapplied/server/0432-incremental-chunk-and-player-saving.patch diff --git a/patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch b/patches/unapplied/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch similarity index 100% rename from patches/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch rename to patches/unapplied/server/0433-Stop-copy-on-write-operations-for-updating-light-dat.patch diff --git a/patches/server/0434-Support-old-UUID-format-for-NBT.patch b/patches/unapplied/server/0434-Support-old-UUID-format-for-NBT.patch similarity index 100% rename from patches/server/0434-Support-old-UUID-format-for-NBT.patch rename to patches/unapplied/server/0434-Support-old-UUID-format-for-NBT.patch diff --git a/patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch b/patches/unapplied/server/0435-Clean-up-duplicated-GameProfile-Properties.patch similarity index 100% rename from patches/server/0435-Clean-up-duplicated-GameProfile-Properties.patch rename to patches/unapplied/server/0435-Clean-up-duplicated-GameProfile-Properties.patch diff --git a/patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0436-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0436-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/0436-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0437-Remove-some-streams-from-structures.patch b/patches/unapplied/server/0437-Remove-some-streams-from-structures.patch similarity index 100% rename from patches/server/0437-Remove-some-streams-from-structures.patch rename to patches/unapplied/server/0437-Remove-some-streams-from-structures.patch diff --git a/patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch b/patches/unapplied/server/0438-Remove-streams-from-classes-related-villager-gossip.patch similarity index 100% rename from patches/server/0438-Remove-streams-from-classes-related-villager-gossip.patch rename to patches/unapplied/server/0438-Remove-streams-from-classes-related-villager-gossip.patch diff --git a/patches/server/0439-Support-components-in-ItemMeta.patch b/patches/unapplied/server/0439-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/server/0439-Support-components-in-ItemMeta.patch rename to patches/unapplied/server/0439-Support-components-in-ItemMeta.patch diff --git a/patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/unapplied/server/0440-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0441-Add-entity-liquid-API.patch b/patches/unapplied/server/0441-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0441-Add-entity-liquid-API.patch rename to patches/unapplied/server/0441-Add-entity-liquid-API.patch diff --git a/patches/server/0442-Update-itemstack-legacy-name-and-lore.patch b/patches/unapplied/server/0442-Update-itemstack-legacy-name-and-lore.patch similarity index 100% rename from patches/server/0442-Update-itemstack-legacy-name-and-lore.patch rename to patches/unapplied/server/0442-Update-itemstack-legacy-name-and-lore.patch diff --git a/patches/server/0443-Spawn-player-in-correct-world-on-login.patch b/patches/unapplied/server/0443-Spawn-player-in-correct-world-on-login.patch similarity index 100% rename from patches/server/0443-Spawn-player-in-correct-world-on-login.patch rename to patches/unapplied/server/0443-Spawn-player-in-correct-world-on-login.patch diff --git a/patches/server/0444-Add-PrepareResultEvent.patch b/patches/unapplied/server/0444-Add-PrepareResultEvent.patch similarity index 100% rename from patches/server/0444-Add-PrepareResultEvent.patch rename to patches/unapplied/server/0444-Add-PrepareResultEvent.patch diff --git a/patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/0445-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0446-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0446-Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/0446-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0447-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0447-Fix-arrows-never-despawning-MC-125757.patch similarity index 100% rename from patches/server/0447-Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/0447-Fix-arrows-never-despawning-MC-125757.patch diff --git a/patches/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/0448-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0449-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0449-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0449-Fix-SPIGOT-5989.patch rename to patches/unapplied/server/0449-Fix-SPIGOT-5989.patch diff --git a/patches/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/0450-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/0451-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/0452-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0453-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0453-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0453-Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/0453-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/0454-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/0455-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0456-Brand-support.patch b/patches/unapplied/server/0456-Brand-support.patch similarity index 100% rename from patches/server/0456-Brand-support.patch rename to patches/unapplied/server/0456-Brand-support.patch diff --git a/patches/server/0457-Add-setMaxPlayers-API.patch b/patches/unapplied/server/0457-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/server/0457-Add-setMaxPlayers-API.patch rename to patches/unapplied/server/0457-Add-setMaxPlayers-API.patch diff --git a/patches/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/0458-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0459-Don-t-require-FACING-data.patch b/patches/unapplied/server/0459-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0459-Don-t-require-FACING-data.patch rename to patches/unapplied/server/0459-Don-t-require-FACING-data.patch diff --git a/patches/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 100% rename from patches/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/0460-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch diff --git a/patches/server/0461-Add-moon-phase-API.patch b/patches/unapplied/server/0461-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0461-Add-moon-phase-API.patch rename to patches/unapplied/server/0461-Add-moon-phase-API.patch diff --git a/patches/server/0462-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0462-Prevent-headless-pistons-from-being-created.patch similarity index 100% rename from patches/server/0462-Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/0462-Prevent-headless-pistons-from-being-created.patch diff --git a/patches/server/0463-Add-BellRingEvent.patch b/patches/unapplied/server/0463-Add-BellRingEvent.patch similarity index 100% rename from patches/server/0463-Add-BellRingEvent.patch rename to patches/unapplied/server/0463-Add-BellRingEvent.patch diff --git a/patches/server/0464-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0464-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0464-Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/0464-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0465-Buffer-joins-to-world.patch b/patches/unapplied/server/0465-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0465-Buffer-joins-to-world.patch rename to patches/unapplied/server/0465-Buffer-joins-to-world.patch diff --git a/patches/server/0466-Eigencraft-redstone-implementation.patch b/patches/unapplied/server/0466-Eigencraft-redstone-implementation.patch similarity index 100% rename from patches/server/0466-Eigencraft-redstone-implementation.patch rename to patches/unapplied/server/0466-Eigencraft-redstone-implementation.patch diff --git a/patches/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/0467-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from patches/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/0468-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/patches/server/0469-Fix-CraftTeam-null-check.patch b/patches/unapplied/server/0469-Fix-CraftTeam-null-check.patch similarity index 100% rename from patches/server/0469-Fix-CraftTeam-null-check.patch rename to patches/unapplied/server/0469-Fix-CraftTeam-null-check.patch diff --git a/patches/server/0470-Add-more-Evoker-API.patch b/patches/unapplied/server/0470-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0470-Add-more-Evoker-API.patch rename to patches/unapplied/server/0470-Add-more-Evoker-API.patch diff --git a/patches/server/0471-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0471-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0471-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/0471-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/0472-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0473-Cache-block-data-strings.patch b/patches/unapplied/server/0473-Cache-block-data-strings.patch similarity index 100% rename from patches/server/0473-Cache-block-data-strings.patch rename to patches/unapplied/server/0473-Cache-block-data-strings.patch diff --git a/patches/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/patches/unapplied/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from patches/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to patches/unapplied/server/0474-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/patches/server/0475-Add-additional-open-container-api-to-HumanEntity.patch b/patches/unapplied/server/0475-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/server/0475-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/unapplied/server/0475-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/patches/unapplied/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from patches/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to patches/unapplied/server/0476-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/patches/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch b/patches/unapplied/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from patches/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch rename to patches/unapplied/server/0477-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/patches/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/unapplied/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/unapplied/server/0478-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/server/0479-Lazily-track-plugin-scoreboards-by-default.patch b/patches/unapplied/server/0479-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from patches/server/0479-Lazily-track-plugin-scoreboards-by-default.patch rename to patches/unapplied/server/0479-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/patches/server/0480-Entity-isTicking.patch b/patches/unapplied/server/0480-Entity-isTicking.patch similarity index 100% rename from patches/server/0480-Entity-isTicking.patch rename to patches/unapplied/server/0480-Entity-isTicking.patch diff --git a/patches/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch b/patches/unapplied/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch similarity index 100% rename from patches/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch rename to patches/unapplied/server/0481-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch diff --git a/patches/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch b/patches/unapplied/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch similarity index 100% rename from patches/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch rename to patches/unapplied/server/0482-Fix-Concurrency-issue-in-ShufflingList.patch diff --git a/patches/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/unapplied/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch similarity index 100% rename from patches/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch rename to patches/unapplied/server/0483-Reset-Ender-Crystals-on-Dragon-Spawn.patch diff --git a/patches/server/0484-Fix-for-large-move-vectors-crashing-server.patch b/patches/unapplied/server/0484-Fix-for-large-move-vectors-crashing-server.patch similarity index 100% rename from patches/server/0484-Fix-for-large-move-vectors-crashing-server.patch rename to patches/unapplied/server/0484-Fix-for-large-move-vectors-crashing-server.patch diff --git a/patches/server/0485-Optimise-getType-calls.patch b/patches/unapplied/server/0485-Optimise-getType-calls.patch similarity index 100% rename from patches/server/0485-Optimise-getType-calls.patch rename to patches/unapplied/server/0485-Optimise-getType-calls.patch diff --git a/patches/server/0486-Villager-resetOffers.patch b/patches/unapplied/server/0486-Villager-resetOffers.patch similarity index 100% rename from patches/server/0486-Villager-resetOffers.patch rename to patches/unapplied/server/0486-Villager-resetOffers.patch diff --git a/patches/server/0487-Retain-block-place-order-when-capturing-blockstates.patch b/patches/unapplied/server/0487-Retain-block-place-order-when-capturing-blockstates.patch similarity index 100% rename from patches/server/0487-Retain-block-place-order-when-capturing-blockstates.patch rename to patches/unapplied/server/0487-Retain-block-place-order-when-capturing-blockstates.patch diff --git a/patches/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch b/patches/unapplied/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch similarity index 100% rename from patches/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch rename to patches/unapplied/server/0488-Reduce-blockpos-allocation-from-pathfinding.patch diff --git a/patches/server/0489-Fix-item-locations-dropped-from-campfires.patch b/patches/unapplied/server/0489-Fix-item-locations-dropped-from-campfires.patch similarity index 100% rename from patches/server/0489-Fix-item-locations-dropped-from-campfires.patch rename to patches/unapplied/server/0489-Fix-item-locations-dropped-from-campfires.patch diff --git a/patches/server/0490-Player-elytra-boost-API.patch b/patches/unapplied/server/0490-Player-elytra-boost-API.patch similarity index 100% rename from patches/server/0490-Player-elytra-boost-API.patch rename to patches/unapplied/server/0490-Player-elytra-boost-API.patch diff --git a/patches/server/0491-Fixed-TileEntityBell-memory-leak.patch b/patches/unapplied/server/0491-Fixed-TileEntityBell-memory-leak.patch similarity index 100% rename from patches/server/0491-Fixed-TileEntityBell-memory-leak.patch rename to patches/unapplied/server/0491-Fixed-TileEntityBell-memory-leak.patch diff --git a/patches/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch b/patches/unapplied/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch similarity index 100% rename from patches/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch rename to patches/unapplied/server/0492-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch diff --git a/patches/server/0493-Add-getOfflinePlayerIfCached-String.patch b/patches/unapplied/server/0493-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/server/0493-Add-getOfflinePlayerIfCached-String.patch rename to patches/unapplied/server/0493-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/server/0494-Add-ignore-discounts-API.patch b/patches/unapplied/server/0494-Add-ignore-discounts-API.patch similarity index 100% rename from patches/server/0494-Add-ignore-discounts-API.patch rename to patches/unapplied/server/0494-Add-ignore-discounts-API.patch diff --git a/patches/server/0495-Toggle-for-removing-existing-dragon.patch b/patches/unapplied/server/0495-Toggle-for-removing-existing-dragon.patch similarity index 100% rename from patches/server/0495-Toggle-for-removing-existing-dragon.patch rename to patches/unapplied/server/0495-Toggle-for-removing-existing-dragon.patch diff --git a/patches/server/0496-Fix-client-lag-on-advancement-loading.patch b/patches/unapplied/server/0496-Fix-client-lag-on-advancement-loading.patch similarity index 100% rename from patches/server/0496-Fix-client-lag-on-advancement-loading.patch rename to patches/unapplied/server/0496-Fix-client-lag-on-advancement-loading.patch diff --git a/patches/server/0497-Item-no-age-no-player-pickup.patch b/patches/unapplied/server/0497-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/server/0497-Item-no-age-no-player-pickup.patch rename to patches/unapplied/server/0497-Item-no-age-no-player-pickup.patch diff --git a/patches/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/unapplied/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch similarity index 100% rename from patches/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch rename to patches/unapplied/server/0498-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch diff --git a/patches/server/0499-Beacon-API-custom-effect-ranges.patch b/patches/unapplied/server/0499-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/server/0499-Beacon-API-custom-effect-ranges.patch rename to patches/unapplied/server/0499-Beacon-API-custom-effect-ranges.patch diff --git a/patches/server/0500-Add-API-for-quit-reason.patch b/patches/unapplied/server/0500-Add-API-for-quit-reason.patch similarity index 100% rename from patches/server/0500-Add-API-for-quit-reason.patch rename to patches/unapplied/server/0500-Add-API-for-quit-reason.patch diff --git a/patches/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch b/patches/unapplied/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch similarity index 100% rename from patches/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch rename to patches/unapplied/server/0501-Add-Wandering-Trader-spawn-rate-config-options.patch diff --git a/patches/server/0502-Expose-world-spawn-angle.patch b/patches/unapplied/server/0502-Expose-world-spawn-angle.patch similarity index 100% rename from patches/server/0502-Expose-world-spawn-angle.patch rename to patches/unapplied/server/0502-Expose-world-spawn-angle.patch diff --git a/patches/server/0503-Add-Destroy-Speed-API.patch b/patches/unapplied/server/0503-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/server/0503-Add-Destroy-Speed-API.patch rename to patches/unapplied/server/0503-Add-Destroy-Speed-API.patch diff --git a/patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/unapplied/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch similarity index 100% rename from patches/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch rename to patches/unapplied/server/0504-Fix-Player-spawnParticle-x-y-z-precision-loss.patch diff --git a/patches/server/0505-Add-LivingEntity-clearActiveItem.patch b/patches/unapplied/server/0505-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/server/0505-Add-LivingEntity-clearActiveItem.patch rename to patches/unapplied/server/0505-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/server/0506-Add-PlayerItemCooldownEvent.patch b/patches/unapplied/server/0506-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/server/0506-Add-PlayerItemCooldownEvent.patch rename to patches/unapplied/server/0506-Add-PlayerItemCooldownEvent.patch diff --git a/patches/server/0507-Significantly-improve-performance-of-the-end-generat.patch b/patches/unapplied/server/0507-Significantly-improve-performance-of-the-end-generat.patch similarity index 100% rename from patches/server/0507-Significantly-improve-performance-of-the-end-generat.patch rename to patches/unapplied/server/0507-Significantly-improve-performance-of-the-end-generat.patch diff --git a/patches/server/0508-More-lightning-API.patch b/patches/unapplied/server/0508-More-lightning-API.patch similarity index 100% rename from patches/server/0508-More-lightning-API.patch rename to patches/unapplied/server/0508-More-lightning-API.patch diff --git a/patches/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch b/patches/unapplied/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch similarity index 100% rename from patches/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch rename to patches/unapplied/server/0509-Climbing-should-not-bypass-cramming-gamerule.patch diff --git a/patches/server/0510-Added-missing-default-perms-for-commands.patch b/patches/unapplied/server/0510-Added-missing-default-perms-for-commands.patch similarity index 100% rename from patches/server/0510-Added-missing-default-perms-for-commands.patch rename to patches/unapplied/server/0510-Added-missing-default-perms-for-commands.patch diff --git a/patches/server/0511-Add-PlayerShearBlockEvent.patch b/patches/unapplied/server/0511-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/server/0511-Add-PlayerShearBlockEvent.patch rename to patches/unapplied/server/0511-Add-PlayerShearBlockEvent.patch diff --git a/patches/server/0512-Fix-curing-zombie-villager-discount-exploit.patch b/patches/unapplied/server/0512-Fix-curing-zombie-villager-discount-exploit.patch similarity index 100% rename from patches/server/0512-Fix-curing-zombie-villager-discount-exploit.patch rename to patches/unapplied/server/0512-Fix-curing-zombie-villager-discount-exploit.patch diff --git a/patches/server/0513-Limit-recipe-packets.patch b/patches/unapplied/server/0513-Limit-recipe-packets.patch similarity index 100% rename from patches/server/0513-Limit-recipe-packets.patch rename to patches/unapplied/server/0513-Limit-recipe-packets.patch diff --git a/patches/server/0514-Fix-CraftSound-backwards-compatibility.patch b/patches/unapplied/server/0514-Fix-CraftSound-backwards-compatibility.patch similarity index 100% rename from patches/server/0514-Fix-CraftSound-backwards-compatibility.patch rename to patches/unapplied/server/0514-Fix-CraftSound-backwards-compatibility.patch diff --git a/patches/server/0515-Player-Chunk-Load-Unload-Events.patch b/patches/unapplied/server/0515-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/server/0515-Player-Chunk-Load-Unload-Events.patch rename to patches/unapplied/server/0515-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/server/0516-Optimize-Dynamic-get-Missing-Keys.patch b/patches/unapplied/server/0516-Optimize-Dynamic-get-Missing-Keys.patch similarity index 100% rename from patches/server/0516-Optimize-Dynamic-get-Missing-Keys.patch rename to patches/unapplied/server/0516-Optimize-Dynamic-get-Missing-Keys.patch diff --git a/patches/server/0517-Expose-LivingEntity-hurt-direction.patch b/patches/unapplied/server/0517-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/server/0517-Expose-LivingEntity-hurt-direction.patch rename to patches/unapplied/server/0517-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/unapplied/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/unapplied/server/0518-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch b/patches/unapplied/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch similarity index 100% rename from patches/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch rename to patches/unapplied/server/0519-Do-not-crash-from-invalid-ingredient-lists-in-Villag.patch diff --git a/patches/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/0520-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0521-Implement-TargetHitEvent.patch b/patches/unapplied/server/0521-Implement-TargetHitEvent.patch similarity index 100% rename from patches/server/0521-Implement-TargetHitEvent.patch rename to patches/unapplied/server/0521-Implement-TargetHitEvent.patch diff --git a/patches/server/0522-MC-4-Fix-item-position-desync.patch b/patches/unapplied/server/0522-MC-4-Fix-item-position-desync.patch similarity index 100% rename from patches/server/0522-MC-4-Fix-item-position-desync.patch rename to patches/unapplied/server/0522-MC-4-Fix-item-position-desync.patch diff --git a/patches/server/0523-Additional-Block-Material-API-s.patch b/patches/unapplied/server/0523-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/server/0523-Additional-Block-Material-API-s.patch rename to patches/unapplied/server/0523-Additional-Block-Material-API-s.patch diff --git a/patches/server/0524-Fix-harming-potion-dupe.patch b/patches/unapplied/server/0524-Fix-harming-potion-dupe.patch similarity index 100% rename from patches/server/0524-Fix-harming-potion-dupe.patch rename to patches/unapplied/server/0524-Fix-harming-potion-dupe.patch diff --git a/patches/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch b/patches/unapplied/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch similarity index 100% rename from patches/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch rename to patches/unapplied/server/0525-Implement-API-to-get-Material-from-Boats-and-Minecar.patch diff --git a/patches/server/0526-Cache-burn-durations.patch b/patches/unapplied/server/0526-Cache-burn-durations.patch similarity index 100% rename from patches/server/0526-Cache-burn-durations.patch rename to patches/unapplied/server/0526-Cache-burn-durations.patch diff --git a/patches/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch b/patches/unapplied/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch similarity index 100% rename from patches/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch rename to patches/unapplied/server/0527-Allow-disabling-mob-spawner-spawn-egg-transformation.patch diff --git a/patches/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch b/patches/unapplied/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch similarity index 100% rename from patches/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch rename to patches/unapplied/server/0528-Fix-Not-a-string-Map-Conversion-spam.patch diff --git a/patches/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch b/patches/unapplied/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch rename to patches/unapplied/server/0529-Implement-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/server/0530-Fix-interact-event-not-being-called-in-adventure.patch b/patches/unapplied/server/0530-Fix-interact-event-not-being-called-in-adventure.patch similarity index 100% rename from patches/server/0530-Fix-interact-event-not-being-called-in-adventure.patch rename to patches/unapplied/server/0530-Fix-interact-event-not-being-called-in-adventure.patch diff --git a/patches/server/0531-Zombie-API-breaking-doors.patch b/patches/unapplied/server/0531-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/server/0531-Zombie-API-breaking-doors.patch rename to patches/unapplied/server/0531-Zombie-API-breaking-doors.patch diff --git a/patches/server/0532-Fix-nerfed-slime-when-splitting.patch b/patches/unapplied/server/0532-Fix-nerfed-slime-when-splitting.patch similarity index 100% rename from patches/server/0532-Fix-nerfed-slime-when-splitting.patch rename to patches/unapplied/server/0532-Fix-nerfed-slime-when-splitting.patch diff --git a/patches/server/0533-Add-EntityLoadCrossbowEvent.patch b/patches/unapplied/server/0533-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/server/0533-Add-EntityLoadCrossbowEvent.patch rename to patches/unapplied/server/0533-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/server/0534-Added-WorldGameRuleChangeEvent.patch b/patches/unapplied/server/0534-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/server/0534-Added-WorldGameRuleChangeEvent.patch rename to patches/unapplied/server/0534-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/server/0535-Added-ServerResourcesReloadedEvent.patch b/patches/unapplied/server/0535-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/server/0535-Added-ServerResourcesReloadedEvent.patch rename to patches/unapplied/server/0535-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch b/patches/unapplied/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch similarity index 100% rename from patches/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch rename to patches/unapplied/server/0536-Added-world-settings-for-mobs-picking-up-loot.patch diff --git a/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch b/patches/unapplied/server/0537-Implemented-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/server/0537-Implemented-BlockFailedDispenseEvent.patch rename to patches/unapplied/server/0537-Implemented-BlockFailedDispenseEvent.patch diff --git a/patches/server/0538-Added-PlayerLecternPageChangeEvent.patch b/patches/unapplied/server/0538-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/server/0538-Added-PlayerLecternPageChangeEvent.patch rename to patches/unapplied/server/0538-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/server/0539-Added-PlayerLoomPatternSelectEvent.patch b/patches/unapplied/server/0539-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/server/0539-Added-PlayerLoomPatternSelectEvent.patch rename to patches/unapplied/server/0539-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/server/0540-Configurable-door-breaking-difficulty.patch b/patches/unapplied/server/0540-Configurable-door-breaking-difficulty.patch similarity index 100% rename from patches/server/0540-Configurable-door-breaking-difficulty.patch rename to patches/unapplied/server/0540-Configurable-door-breaking-difficulty.patch diff --git a/patches/server/0541-Empty-commands-shall-not-be-dispatched.patch b/patches/unapplied/server/0541-Empty-commands-shall-not-be-dispatched.patch similarity index 100% rename from patches/server/0541-Empty-commands-shall-not-be-dispatched.patch rename to patches/unapplied/server/0541-Empty-commands-shall-not-be-dispatched.patch diff --git a/patches/server/0542-Implement-API-to-expose-exact-interaction-point.patch b/patches/unapplied/server/0542-Implement-API-to-expose-exact-interaction-point.patch similarity index 100% rename from patches/server/0542-Implement-API-to-expose-exact-interaction-point.patch rename to patches/unapplied/server/0542-Implement-API-to-expose-exact-interaction-point.patch diff --git a/patches/server/0543-Remove-stale-POIs.patch b/patches/unapplied/server/0543-Remove-stale-POIs.patch similarity index 100% rename from patches/server/0543-Remove-stale-POIs.patch rename to patches/unapplied/server/0543-Remove-stale-POIs.patch diff --git a/patches/server/0544-Fix-villager-boat-exploit.patch b/patches/unapplied/server/0544-Fix-villager-boat-exploit.patch similarity index 100% rename from patches/server/0544-Fix-villager-boat-exploit.patch rename to patches/unapplied/server/0544-Fix-villager-boat-exploit.patch diff --git a/patches/server/0545-Add-sendOpLevel-API.patch b/patches/unapplied/server/0545-Add-sendOpLevel-API.patch similarity index 100% rename from patches/server/0545-Add-sendOpLevel-API.patch rename to patches/unapplied/server/0545-Add-sendOpLevel-API.patch diff --git a/patches/server/0546-TODO-Registry-Modification-API.patch b/patches/unapplied/server/0546-TODO-Registry-Modification-API.patch similarity index 100% rename from patches/server/0546-TODO-Registry-Modification-API.patch rename to patches/unapplied/server/0546-TODO-Registry-Modification-API.patch diff --git a/patches/server/0547-Add-StructuresLocateEvent.patch b/patches/unapplied/server/0547-Add-StructuresLocateEvent.patch similarity index 100% rename from patches/server/0547-Add-StructuresLocateEvent.patch rename to patches/unapplied/server/0547-Add-StructuresLocateEvent.patch diff --git a/patches/server/0548-Collision-option-for-requiring-a-player-participant.patch b/patches/unapplied/server/0548-Collision-option-for-requiring-a-player-participant.patch similarity index 100% rename from patches/server/0548-Collision-option-for-requiring-a-player-participant.patch rename to patches/unapplied/server/0548-Collision-option-for-requiring-a-player-participant.patch diff --git a/patches/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch b/patches/unapplied/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch similarity index 100% rename from patches/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch rename to patches/unapplied/server/0549-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch diff --git a/patches/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/unapplied/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/unapplied/server/0550-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/server/0551-Make-schedule-command-per-world.patch b/patches/unapplied/server/0551-Make-schedule-command-per-world.patch similarity index 100% rename from patches/server/0551-Make-schedule-command-per-world.patch rename to patches/unapplied/server/0551-Make-schedule-command-per-world.patch diff --git a/patches/server/0552-Configurable-max-leash-distance.patch b/patches/unapplied/server/0552-Configurable-max-leash-distance.patch similarity index 100% rename from patches/server/0552-Configurable-max-leash-distance.patch rename to patches/unapplied/server/0552-Configurable-max-leash-distance.patch diff --git a/patches/server/0553-Implement-BlockPreDispenseEvent.patch b/patches/unapplied/server/0553-Implement-BlockPreDispenseEvent.patch similarity index 100% rename from patches/server/0553-Implement-BlockPreDispenseEvent.patch rename to patches/unapplied/server/0553-Implement-BlockPreDispenseEvent.patch diff --git a/patches/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch b/patches/unapplied/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch rename to patches/unapplied/server/0554-Added-firing-of-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch b/patches/unapplied/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch similarity index 100% rename from patches/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch rename to patches/unapplied/server/0555-Add-toggle-for-always-placing-the-dragon-egg.patch diff --git a/patches/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/unapplied/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/unapplied/server/0556-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/unapplied/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/unapplied/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/server/0558-Reset-shield-blocking-on-dimension-change.patch b/patches/unapplied/server/0558-Reset-shield-blocking-on-dimension-change.patch similarity index 100% rename from patches/server/0558-Reset-shield-blocking-on-dimension-change.patch rename to patches/unapplied/server/0558-Reset-shield-blocking-on-dimension-change.patch diff --git a/patches/server/0559-add-DragonEggFormEvent.patch b/patches/unapplied/server/0559-add-DragonEggFormEvent.patch similarity index 100% rename from patches/server/0559-add-DragonEggFormEvent.patch rename to patches/unapplied/server/0559-add-DragonEggFormEvent.patch diff --git a/patches/server/0560-EntityMoveEvent.patch b/patches/unapplied/server/0560-EntityMoveEvent.patch similarity index 100% rename from patches/server/0560-EntityMoveEvent.patch rename to patches/unapplied/server/0560-EntityMoveEvent.patch diff --git a/patches/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch b/patches/unapplied/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch similarity index 100% rename from patches/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch rename to patches/unapplied/server/0561-added-option-to-disable-pathfinding-updates-on-block.patch diff --git a/patches/server/0562-Inline-shift-direction-fields.patch b/patches/unapplied/server/0562-Inline-shift-direction-fields.patch similarity index 100% rename from patches/server/0562-Inline-shift-direction-fields.patch rename to patches/unapplied/server/0562-Inline-shift-direction-fields.patch diff --git a/patches/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/unapplied/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/unapplied/server/0563-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/unapplied/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/unapplied/server/0564-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/server/0565-living-entity-allow-attribute-registration.patch b/patches/unapplied/server/0565-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/server/0565-living-entity-allow-attribute-registration.patch rename to patches/unapplied/server/0565-living-entity-allow-attribute-registration.patch diff --git a/patches/server/0566-fix-dead-slime-setSize-invincibility.patch b/patches/unapplied/server/0566-fix-dead-slime-setSize-invincibility.patch similarity index 100% rename from patches/server/0566-fix-dead-slime-setSize-invincibility.patch rename to patches/unapplied/server/0566-fix-dead-slime-setSize-invincibility.patch diff --git a/patches/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch b/patches/unapplied/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch similarity index 100% rename from patches/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch rename to patches/unapplied/server/0567-Merchant-getRecipes-should-return-an-immutable-list.patch diff --git a/patches/server/0568-Add-support-for-hex-color-codes-in-console.patch b/patches/unapplied/server/0568-Add-support-for-hex-color-codes-in-console.patch similarity index 100% rename from patches/server/0568-Add-support-for-hex-color-codes-in-console.patch rename to patches/unapplied/server/0568-Add-support-for-hex-color-codes-in-console.patch diff --git a/patches/server/0569-Expose-Tracked-Players.patch b/patches/unapplied/server/0569-Expose-Tracked-Players.patch similarity index 100% rename from patches/server/0569-Expose-Tracked-Players.patch rename to patches/unapplied/server/0569-Expose-Tracked-Players.patch diff --git a/patches/server/0570-Remove-streams-from-SensorNearest.patch b/patches/unapplied/server/0570-Remove-streams-from-SensorNearest.patch similarity index 100% rename from patches/server/0570-Remove-streams-from-SensorNearest.patch rename to patches/unapplied/server/0570-Remove-streams-from-SensorNearest.patch diff --git a/patches/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch b/patches/unapplied/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch similarity index 100% rename from patches/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch rename to patches/unapplied/server/0571-Throw-proper-exception-on-empty-JsonList-file.patch diff --git a/patches/server/0572-Improve-ServerGUI.patch b/patches/unapplied/server/0572-Improve-ServerGUI.patch similarity index 100% rename from patches/server/0572-Improve-ServerGUI.patch rename to patches/unapplied/server/0572-Improve-ServerGUI.patch diff --git a/patches/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch b/patches/unapplied/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch similarity index 100% rename from patches/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch rename to patches/unapplied/server/0573-stop-firing-pressure-plate-EntityInteractEvent-for-i.patch diff --git a/patches/server/0574-fix-converting-txt-to-json-file.patch b/patches/unapplied/server/0574-fix-converting-txt-to-json-file.patch similarity index 100% rename from patches/server/0574-fix-converting-txt-to-json-file.patch rename to patches/unapplied/server/0574-fix-converting-txt-to-json-file.patch diff --git a/patches/server/0575-Add-worldborder-events.patch b/patches/unapplied/server/0575-Add-worldborder-events.patch similarity index 100% rename from patches/server/0575-Add-worldborder-events.patch rename to patches/unapplied/server/0575-Add-worldborder-events.patch diff --git a/patches/server/0576-added-PlayerNameEntityEvent.patch b/patches/unapplied/server/0576-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/server/0576-added-PlayerNameEntityEvent.patch rename to patches/unapplied/server/0576-added-PlayerNameEntityEvent.patch diff --git a/patches/server/0577-Prevent-grindstones-from-overstacking-items.patch b/patches/unapplied/server/0577-Prevent-grindstones-from-overstacking-items.patch similarity index 100% rename from patches/server/0577-Prevent-grindstones-from-overstacking-items.patch rename to patches/unapplied/server/0577-Prevent-grindstones-from-overstacking-items.patch diff --git a/patches/server/0578-Add-recipe-to-cook-events.patch b/patches/unapplied/server/0578-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/server/0578-Add-recipe-to-cook-events.patch rename to patches/unapplied/server/0578-Add-recipe-to-cook-events.patch diff --git a/patches/server/0579-Add-Block-isValidTool.patch b/patches/unapplied/server/0579-Add-Block-isValidTool.patch similarity index 100% rename from patches/server/0579-Add-Block-isValidTool.patch rename to patches/unapplied/server/0579-Add-Block-isValidTool.patch diff --git a/patches/server/0580-Allow-using-signs-inside-spawn-protection.patch b/patches/unapplied/server/0580-Allow-using-signs-inside-spawn-protection.patch similarity index 100% rename from patches/server/0580-Allow-using-signs-inside-spawn-protection.patch rename to patches/unapplied/server/0580-Allow-using-signs-inside-spawn-protection.patch diff --git a/patches/server/0581-Expand-world-key-API.patch b/patches/unapplied/server/0581-Expand-world-key-API.patch similarity index 100% rename from patches/server/0581-Expand-world-key-API.patch rename to patches/unapplied/server/0581-Expand-world-key-API.patch diff --git a/patches/server/0582-Add-fast-alternative-constructor-for-Rotations.patch b/patches/unapplied/server/0582-Add-fast-alternative-constructor-for-Rotations.patch similarity index 100% rename from patches/server/0582-Add-fast-alternative-constructor-for-Rotations.patch rename to patches/unapplied/server/0582-Add-fast-alternative-constructor-for-Rotations.patch diff --git a/patches/server/0583-Item-Rarity-API.patch b/patches/unapplied/server/0583-Item-Rarity-API.patch similarity index 100% rename from patches/server/0583-Item-Rarity-API.patch rename to patches/unapplied/server/0583-Item-Rarity-API.patch diff --git a/patches/server/0584-copy-TESign-isEditable-from-snapshots.patch b/patches/unapplied/server/0584-copy-TESign-isEditable-from-snapshots.patch similarity index 100% rename from patches/server/0584-copy-TESign-isEditable-from-snapshots.patch rename to patches/unapplied/server/0584-copy-TESign-isEditable-from-snapshots.patch diff --git a/patches/server/0585-Drop-carried-item-when-player-has-disconnected.patch b/patches/unapplied/server/0585-Drop-carried-item-when-player-has-disconnected.patch similarity index 100% rename from patches/server/0585-Drop-carried-item-when-player-has-disconnected.patch rename to patches/unapplied/server/0585-Drop-carried-item-when-player-has-disconnected.patch diff --git a/patches/server/0586-forced-whitelist-use-configurable-kick-message.patch b/patches/unapplied/server/0586-forced-whitelist-use-configurable-kick-message.patch similarity index 100% rename from patches/server/0586-forced-whitelist-use-configurable-kick-message.patch rename to patches/unapplied/server/0586-forced-whitelist-use-configurable-kick-message.patch diff --git a/patches/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/unapplied/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch similarity index 100% rename from patches/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch rename to patches/unapplied/server/0587-Don-t-ignore-result-of-PlayerEditBookEvent.patch diff --git a/patches/server/0588-Entity-load-save-limit-per-chunk.patch b/patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch similarity index 100% rename from patches/server/0588-Entity-load-save-limit-per-chunk.patch rename to patches/unapplied/server/0588-Entity-load-save-limit-per-chunk.patch diff --git a/patches/server/0589-Expose-protocol-version.patch b/patches/unapplied/server/0589-Expose-protocol-version.patch similarity index 100% rename from patches/server/0589-Expose-protocol-version.patch rename to patches/unapplied/server/0589-Expose-protocol-version.patch diff --git a/patches/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/unapplied/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch similarity index 100% rename from patches/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch rename to patches/unapplied/server/0590-Enhance-console-tab-completions-for-brigadier-comman.patch diff --git a/patches/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/unapplied/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch similarity index 100% rename from patches/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch rename to patches/unapplied/server/0591-Fix-PlayerItemConsumeEvent-cancelling-properly.patch diff --git a/patches/server/0592-Add-bypass-host-check.patch b/patches/unapplied/server/0592-Add-bypass-host-check.patch similarity index 100% rename from patches/server/0592-Add-bypass-host-check.patch rename to patches/unapplied/server/0592-Add-bypass-host-check.patch diff --git a/patches/server/0593-Set-area-affect-cloud-rotation.patch b/patches/unapplied/server/0593-Set-area-affect-cloud-rotation.patch similarity index 100% rename from patches/server/0593-Set-area-affect-cloud-rotation.patch rename to patches/unapplied/server/0593-Set-area-affect-cloud-rotation.patch diff --git a/patches/server/0594-add-isDeeplySleeping-to-HumanEntity.patch b/patches/unapplied/server/0594-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/server/0594-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/unapplied/server/0594-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/unapplied/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/unapplied/server/0595-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/unapplied/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 100% rename from patches/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/unapplied/server/0596-add-get-set-drop-chance-to-EntityEquipment.patch diff --git a/patches/server/0597-fix-PigZombieAngerEvent-cancellation.patch b/patches/unapplied/server/0597-fix-PigZombieAngerEvent-cancellation.patch similarity index 100% rename from patches/server/0597-fix-PigZombieAngerEvent-cancellation.patch rename to patches/unapplied/server/0597-fix-PigZombieAngerEvent-cancellation.patch diff --git a/patches/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/unapplied/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch similarity index 100% rename from patches/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch rename to patches/unapplied/server/0598-fix-PlayerItemHeldEvent-firing-twice.patch diff --git a/patches/server/0599-Added-PlayerDeepSleepEvent.patch b/patches/unapplied/server/0599-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/server/0599-Added-PlayerDeepSleepEvent.patch rename to patches/unapplied/server/0599-Added-PlayerDeepSleepEvent.patch diff --git a/patches/server/0600-More-World-API.patch b/patches/unapplied/server/0600-More-World-API.patch similarity index 100% rename from patches/server/0600-More-World-API.patch rename to patches/unapplied/server/0600-More-World-API.patch diff --git a/patches/server/0601-Added-PlayerBedFailEnterEvent.patch b/patches/unapplied/server/0601-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/server/0601-Added-PlayerBedFailEnterEvent.patch rename to patches/unapplied/server/0601-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/server/0602-Implement-methods-to-convert-between-Component-and-B.patch b/patches/unapplied/server/0602-Implement-methods-to-convert-between-Component-and-B.patch similarity index 100% rename from patches/server/0602-Implement-methods-to-convert-between-Component-and-B.patch rename to patches/unapplied/server/0602-Implement-methods-to-convert-between-Component-and-B.patch diff --git a/patches/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch b/patches/unapplied/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch similarity index 100% rename from patches/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch rename to patches/unapplied/server/0603-Fix-anchor-respawn-acting-as-a-bed-respawn-from-the-.patch diff --git a/patches/server/0604-Introduce-beacon-activation-deactivation-events.patch b/patches/unapplied/server/0604-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/server/0604-Introduce-beacon-activation-deactivation-events.patch rename to patches/unapplied/server/0604-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/unapplied/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/unapplied/server/0605-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/server/0606-Add-Channel-initialization-listeners.patch b/patches/unapplied/server/0606-Add-Channel-initialization-listeners.patch similarity index 100% rename from patches/server/0606-Add-Channel-initialization-listeners.patch rename to patches/unapplied/server/0606-Add-Channel-initialization-listeners.patch diff --git a/patches/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/unapplied/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch similarity index 100% rename from patches/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch rename to patches/unapplied/server/0607-Send-empty-commands-if-tab-completion-is-disabled.patch diff --git a/patches/server/0608-Add-more-WanderingTrader-API.patch b/patches/unapplied/server/0608-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/server/0608-Add-more-WanderingTrader-API.patch rename to patches/unapplied/server/0608-Add-more-WanderingTrader-API.patch diff --git a/patches/server/0609-Add-EntityBlockStorage-clearEntities.patch b/patches/unapplied/server/0609-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/server/0609-Add-EntityBlockStorage-clearEntities.patch rename to patches/unapplied/server/0609-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/unapplied/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/unapplied/server/0610-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0611-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0612-Inventory-close.patch b/patches/unapplied/server/0612-Inventory-close.patch similarity index 100% rename from patches/server/0612-Inventory-close.patch rename to patches/unapplied/server/0612-Inventory-close.patch diff --git a/patches/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/unapplied/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/unapplied/server/0613-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/server/0614-Fix-CraftPotionBrewer-cache.patch b/patches/unapplied/server/0614-Fix-CraftPotionBrewer-cache.patch similarity index 100% rename from patches/server/0614-Fix-CraftPotionBrewer-cache.patch rename to patches/unapplied/server/0614-Fix-CraftPotionBrewer-cache.patch diff --git a/patches/server/0615-Add-basic-Datapack-API.patch b/patches/unapplied/server/0615-Add-basic-Datapack-API.patch similarity index 100% rename from patches/server/0615-Add-basic-Datapack-API.patch rename to patches/unapplied/server/0615-Add-basic-Datapack-API.patch diff --git a/patches/server/0616-Add-environment-variable-to-disable-server-gui.patch b/patches/unapplied/server/0616-Add-environment-variable-to-disable-server-gui.patch similarity index 100% rename from patches/server/0616-Add-environment-variable-to-disable-server-gui.patch rename to patches/unapplied/server/0616-Add-environment-variable-to-disable-server-gui.patch diff --git a/patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch b/patches/unapplied/server/0617-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/server/0617-additions-to-PlayerGameModeChangeEvent.patch rename to patches/unapplied/server/0617-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/server/0618-ItemStack-repair-check-API.patch b/patches/unapplied/server/0618-ItemStack-repair-check-API.patch similarity index 100% rename from patches/server/0618-ItemStack-repair-check-API.patch rename to patches/unapplied/server/0618-ItemStack-repair-check-API.patch diff --git a/patches/server/0619-More-Enchantment-API.patch b/patches/unapplied/server/0619-More-Enchantment-API.patch similarity index 100% rename from patches/server/0619-More-Enchantment-API.patch rename to patches/unapplied/server/0619-More-Enchantment-API.patch diff --git a/patches/server/0620-Move-range-check-for-block-placing-up.patch b/patches/unapplied/server/0620-Move-range-check-for-block-placing-up.patch similarity index 100% rename from patches/server/0620-Move-range-check-for-block-placing-up.patch rename to patches/unapplied/server/0620-Move-range-check-for-block-placing-up.patch diff --git a/patches/server/0621-Fix-and-optimise-world-force-upgrading.patch b/patches/unapplied/server/0621-Fix-and-optimise-world-force-upgrading.patch similarity index 100% rename from patches/server/0621-Fix-and-optimise-world-force-upgrading.patch rename to patches/unapplied/server/0621-Fix-and-optimise-world-force-upgrading.patch diff --git a/patches/server/0622-Add-Mob-lookAt-API.patch b/patches/unapplied/server/0622-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/server/0622-Add-Mob-lookAt-API.patch rename to patches/unapplied/server/0622-Add-Mob-lookAt-API.patch diff --git a/patches/server/0623-Add-Unix-domain-socket-support.patch b/patches/unapplied/server/0623-Add-Unix-domain-socket-support.patch similarity index 100% rename from patches/server/0623-Add-Unix-domain-socket-support.patch rename to patches/unapplied/server/0623-Add-Unix-domain-socket-support.patch diff --git a/patches/server/0624-Add-EntityInsideBlockEvent.patch b/patches/unapplied/server/0624-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/server/0624-Add-EntityInsideBlockEvent.patch rename to patches/unapplied/server/0624-Add-EntityInsideBlockEvent.patch diff --git a/patches/server/0625-Attributes-API-for-item-defaults.patch b/patches/unapplied/server/0625-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/server/0625-Attributes-API-for-item-defaults.patch rename to patches/unapplied/server/0625-Attributes-API-for-item-defaults.patch diff --git a/patches/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/unapplied/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/unapplied/server/0626-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/server/0627-More-Lidded-Block-API.patch b/patches/unapplied/server/0627-More-Lidded-Block-API.patch similarity index 100% rename from patches/server/0627-More-Lidded-Block-API.patch rename to patches/unapplied/server/0627-More-Lidded-Block-API.patch diff --git a/patches/server/0628-Limit-item-frame-cursors-on-maps.patch b/patches/unapplied/server/0628-Limit-item-frame-cursors-on-maps.patch similarity index 100% rename from patches/server/0628-Limit-item-frame-cursors-on-maps.patch rename to patches/unapplied/server/0628-Limit-item-frame-cursors-on-maps.patch diff --git a/patches/server/0629-Add-PlayerKickEvent-causes.patch b/patches/unapplied/server/0629-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/server/0629-Add-PlayerKickEvent-causes.patch rename to patches/unapplied/server/0629-Add-PlayerKickEvent-causes.patch diff --git a/patches/server/0630-Add-PufferFishStateChangeEvent.patch b/patches/unapplied/server/0630-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/server/0630-Add-PufferFishStateChangeEvent.patch rename to patches/unapplied/server/0630-Add-PufferFishStateChangeEvent.patch diff --git a/patches/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/unapplied/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch similarity index 100% rename from patches/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch rename to patches/unapplied/server/0631-Fix-PlayerBucketEmptyEvent-result-itemstack.patch diff --git a/patches/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/unapplied/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch similarity index 100% rename from patches/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch rename to patches/unapplied/server/0632-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch diff --git a/patches/server/0633-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch similarity index 100% rename from patches/server/0633-Add-option-to-fix-items-merging-through-walls.patch rename to patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch diff --git a/patches/server/0634-Add-BellRevealRaiderEvent.patch b/patches/unapplied/server/0634-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/server/0634-Add-BellRevealRaiderEvent.patch rename to patches/unapplied/server/0634-Add-BellRevealRaiderEvent.patch diff --git a/patches/server/0635-Fix-invulnerable-end-crystals.patch b/patches/unapplied/server/0635-Fix-invulnerable-end-crystals.patch similarity index 100% rename from patches/server/0635-Fix-invulnerable-end-crystals.patch rename to patches/unapplied/server/0635-Fix-invulnerable-end-crystals.patch diff --git a/patches/server/0636-Add-ElderGuardianAppearanceEvent.patch b/patches/unapplied/server/0636-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/server/0636-Add-ElderGuardianAppearanceEvent.patch rename to patches/unapplied/server/0636-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/server/0637-Fix-dangerous-end-portal-logic.patch b/patches/unapplied/server/0637-Fix-dangerous-end-portal-logic.patch similarity index 100% rename from patches/server/0637-Fix-dangerous-end-portal-logic.patch rename to patches/unapplied/server/0637-Fix-dangerous-end-portal-logic.patch diff --git a/patches/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/unapplied/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch similarity index 100% rename from patches/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch rename to patches/unapplied/server/0638-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch diff --git a/patches/server/0639-Make-item-validations-configurable.patch b/patches/unapplied/server/0639-Make-item-validations-configurable.patch similarity index 100% rename from patches/server/0639-Make-item-validations-configurable.patch rename to patches/unapplied/server/0639-Make-item-validations-configurable.patch diff --git a/patches/server/0640-Line-Of-Sight-Changes.patch b/patches/unapplied/server/0640-Line-Of-Sight-Changes.patch similarity index 100% rename from patches/server/0640-Line-Of-Sight-Changes.patch rename to patches/unapplied/server/0640-Line-Of-Sight-Changes.patch diff --git a/patches/server/0641-add-per-world-spawn-limits.patch b/patches/unapplied/server/0641-add-per-world-spawn-limits.patch similarity index 100% rename from patches/server/0641-add-per-world-spawn-limits.patch rename to patches/unapplied/server/0641-add-per-world-spawn-limits.patch diff --git a/patches/server/0642-Fix-potions-splash-events.patch b/patches/unapplied/server/0642-Fix-potions-splash-events.patch similarity index 100% rename from patches/server/0642-Fix-potions-splash-events.patch rename to patches/unapplied/server/0642-Fix-potions-splash-events.patch diff --git a/patches/server/0643-Add-more-LimitedRegion-API.patch b/patches/unapplied/server/0643-Add-more-LimitedRegion-API.patch similarity index 100% rename from patches/server/0643-Add-more-LimitedRegion-API.patch rename to patches/unapplied/server/0643-Add-more-LimitedRegion-API.patch diff --git a/patches/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/unapplied/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch similarity index 100% rename from patches/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch rename to patches/unapplied/server/0644-Fix-PlayerDropItemEvent-using-wrong-item.patch diff --git a/patches/server/0645-Missing-Entity-Behavior-API.patch b/patches/unapplied/server/0645-Missing-Entity-Behavior-API.patch similarity index 100% rename from patches/server/0645-Missing-Entity-Behavior-API.patch rename to patches/unapplied/server/0645-Missing-Entity-Behavior-API.patch diff --git a/patches/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/0646-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/0647-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/0648-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0649-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0649-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0649-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/0649-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0650-Adds-PlayerArmSwingEvent.patch b/patches/unapplied/server/0650-Adds-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0650-Adds-PlayerArmSwingEvent.patch rename to patches/unapplied/server/0650-Adds-PlayerArmSwingEvent.patch diff --git a/patches/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/0651-Fixes-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0652-Add-config-for-mobs-immune-to-default-effects.patch b/patches/unapplied/server/0652-Add-config-for-mobs-immune-to-default-effects.patch similarity index 100% rename from patches/server/0652-Add-config-for-mobs-immune-to-default-effects.patch rename to patches/unapplied/server/0652-Add-config-for-mobs-immune-to-default-effects.patch diff --git a/patches/server/0653-Fix-incorrect-message-for-outdated-client.patch b/patches/unapplied/server/0653-Fix-incorrect-message-for-outdated-client.patch similarity index 100% rename from patches/server/0653-Fix-incorrect-message-for-outdated-client.patch rename to patches/unapplied/server/0653-Fix-incorrect-message-for-outdated-client.patch diff --git a/patches/server/0654-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0654-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0654-Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/0654-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/0655-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch b/patches/unapplied/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch rename to patches/unapplied/server/0656-Add-a-bunch-of-missing-forceDrop-toggles.patch diff --git a/patches/server/0657-Stinger-API.patch b/patches/unapplied/server/0657-Stinger-API.patch similarity index 100% rename from patches/server/0657-Stinger-API.patch rename to patches/unapplied/server/0657-Stinger-API.patch diff --git a/patches/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch b/patches/unapplied/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch similarity index 100% rename from patches/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch rename to patches/unapplied/server/0658-Fix-incosistency-issue-with-empty-map-items-in-CB.patch diff --git a/patches/server/0659-Add-System.out-err-catcher.patch b/patches/unapplied/server/0659-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0659-Add-System.out-err-catcher.patch rename to patches/unapplied/server/0659-Add-System.out-err-catcher.patch diff --git a/patches/server/0660-Fix-test-not-bootstrapping.patch b/patches/unapplied/server/0660-Fix-test-not-bootstrapping.patch similarity index 100% rename from patches/server/0660-Fix-test-not-bootstrapping.patch rename to patches/unapplied/server/0660-Fix-test-not-bootstrapping.patch diff --git a/patches/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/unapplied/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch similarity index 100% rename from patches/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch rename to patches/unapplied/server/0661-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch diff --git a/patches/server/0662-Improve-boat-collision-performance.patch b/patches/unapplied/server/0662-Improve-boat-collision-performance.patch similarity index 100% rename from patches/server/0662-Improve-boat-collision-performance.patch rename to patches/unapplied/server/0662-Improve-boat-collision-performance.patch diff --git a/patches/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/0663-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/0664-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0665-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0665-Add-PlayerSetSpawnEvent.patch similarity index 100% rename from patches/server/0665-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/0665-Add-PlayerSetSpawnEvent.patch diff --git a/patches/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/0666-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0667-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0667-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0667-Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/0667-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0668-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0668-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0668-Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/0668-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0669-Added-EntityDamageItemEvent.patch b/patches/unapplied/server/0669-Added-EntityDamageItemEvent.patch similarity index 100% rename from patches/server/0669-Added-EntityDamageItemEvent.patch rename to patches/unapplied/server/0669-Added-EntityDamageItemEvent.patch diff --git a/patches/server/0670-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0670-Optimize-indirect-passenger-iteration.patch similarity index 100% rename from patches/server/0670-Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/0670-Optimize-indirect-passenger-iteration.patch diff --git a/patches/server/0671-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0671-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0671-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/0671-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0672-Make-EntityUnleashEvent-cancellable.patch b/patches/unapplied/server/0672-Make-EntityUnleashEvent-cancellable.patch similarity index 100% rename from patches/server/0672-Make-EntityUnleashEvent-cancellable.patch rename to patches/unapplied/server/0672-Make-EntityUnleashEvent-cancellable.patch diff --git a/patches/server/0673-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0673-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0673-Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/0673-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0674-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0674-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0674-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/0674-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0675-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0675-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0675-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/0675-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/unapplied/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch similarity index 100% rename from patches/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch rename to patches/unapplied/server/0676-Option-to-prevent-NBT-copy-in-smithing-recipes.patch diff --git a/patches/server/0677-More-CommandBlock-API.patch b/patches/unapplied/server/0677-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0677-More-CommandBlock-API.patch rename to patches/unapplied/server/0677-More-CommandBlock-API.patch diff --git a/patches/server/0678-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0678-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0678-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/0678-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0679-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0679-Add-back-EntityPortalExitEvent.patch similarity index 100% rename from patches/server/0679-Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/0679-Add-back-EntityPortalExitEvent.patch diff --git a/patches/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/0680-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0681-Get-entity-default-attributes.patch b/patches/unapplied/server/0681-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0681-Get-entity-default-attributes.patch rename to patches/unapplied/server/0681-Get-entity-default-attributes.patch diff --git a/patches/server/0682-Left-handed-API.patch b/patches/unapplied/server/0682-Left-handed-API.patch similarity index 100% rename from patches/server/0682-Left-handed-API.patch rename to patches/unapplied/server/0682-Left-handed-API.patch diff --git a/patches/server/0683-Add-more-advancement-API.patch b/patches/unapplied/server/0683-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0683-Add-more-advancement-API.patch rename to patches/unapplied/server/0683-Add-more-advancement-API.patch diff --git a/patches/server/0684-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0684-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0684-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/0684-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0685-Add-critical-damage-API.patch b/patches/unapplied/server/0685-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0685-Add-critical-damage-API.patch rename to patches/unapplied/server/0685-Add-critical-damage-API.patch diff --git a/patches/server/0686-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0686-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0686-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/0686-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0687-Add-isCollidable-methods-to-various-places.patch b/patches/unapplied/server/0687-Add-isCollidable-methods-to-various-places.patch similarity index 100% rename from patches/server/0687-Add-isCollidable-methods-to-various-places.patch rename to patches/unapplied/server/0687-Add-isCollidable-methods-to-various-places.patch diff --git a/patches/server/0688-Goat-ram-API.patch b/patches/unapplied/server/0688-Goat-ram-API.patch similarity index 100% rename from patches/server/0688-Goat-ram-API.patch rename to patches/unapplied/server/0688-Goat-ram-API.patch diff --git a/patches/server/0689-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0689-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0689-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/0689-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0690-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0690-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0690-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/0690-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0691-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0691-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0691-Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/0691-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 100% rename from patches/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/0692-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch diff --git a/patches/server/0693-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0693-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0693-Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/0693-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0694-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0694-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0694-Improve-and-expand-AsyncCatcher.patch rename to patches/unapplied/server/0694-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 100% rename from patches/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/0695-Add-paper-mobcaps-and-paper-playermobcaps.patch diff --git a/patches/server/0696-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0696-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0696-Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/0696-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0697-Allow-controlled-flushing-for-network-manager.patch b/patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch similarity index 100% rename from patches/server/0697-Allow-controlled-flushing-for-network-manager.patch rename to patches/unapplied/server/0697-Allow-controlled-flushing-for-network-manager.patch diff --git a/patches/server/0698-Optimise-general-POI-access.patch b/patches/unapplied/server/0698-Optimise-general-POI-access.patch similarity index 100% rename from patches/server/0698-Optimise-general-POI-access.patch rename to patches/unapplied/server/0698-Optimise-general-POI-access.patch diff --git a/patches/server/0699-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/0699-Optimise-chunk-tick-iteration.patch similarity index 100% rename from patches/server/0699-Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/0699-Optimise-chunk-tick-iteration.patch diff --git a/patches/server/0700-Execute-chunk-tasks-mid-tick.patch b/patches/unapplied/server/0700-Execute-chunk-tasks-mid-tick.patch similarity index 100% rename from patches/server/0700-Execute-chunk-tasks-mid-tick.patch rename to patches/unapplied/server/0700-Execute-chunk-tasks-mid-tick.patch diff --git a/patches/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/unapplied/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch similarity index 100% rename from patches/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch rename to patches/unapplied/server/0701-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch diff --git a/patches/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/unapplied/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch similarity index 100% rename from patches/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch rename to patches/unapplied/server/0702-Custom-table-implementation-for-blockstate-state-loo.patch diff --git a/patches/server/0703-Detail-more-information-in-watchdog-dumps.patch b/patches/unapplied/server/0703-Detail-more-information-in-watchdog-dumps.patch similarity index 100% rename from patches/server/0703-Detail-more-information-in-watchdog-dumps.patch rename to patches/unapplied/server/0703-Detail-more-information-in-watchdog-dumps.patch diff --git a/patches/server/0704-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0704-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0704-Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/0704-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0705-Distance-manager-tick-timings.patch b/patches/unapplied/server/0705-Distance-manager-tick-timings.patch similarity index 100% rename from patches/server/0705-Distance-manager-tick-timings.patch rename to patches/unapplied/server/0705-Distance-manager-tick-timings.patch diff --git a/patches/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/0706-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/0707-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0708-Add-packet-limiter-config.patch b/patches/unapplied/server/0708-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0708-Add-packet-limiter-config.patch rename to patches/unapplied/server/0708-Add-packet-limiter-config.patch diff --git a/patches/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/0709-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch b/patches/unapplied/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch similarity index 100% rename from patches/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch rename to patches/unapplied/server/0710-Consolidate-flush-calls-for-entity-tracker-packets.patch diff --git a/patches/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch b/patches/unapplied/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch similarity index 100% rename from patches/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch rename to patches/unapplied/server/0711-Don-t-lookup-fluid-state-when-raytracing.patch diff --git a/patches/server/0712-Time-scoreboard-search.patch b/patches/unapplied/server/0712-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0712-Time-scoreboard-search.patch rename to patches/unapplied/server/0712-Time-scoreboard-search.patch diff --git a/patches/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/unapplied/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch similarity index 100% rename from patches/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch rename to patches/unapplied/server/0713-Send-full-pos-packets-for-hard-colliding-entities.patch diff --git a/patches/server/0714-Do-not-run-raytrace-logic-for-AIR.patch b/patches/unapplied/server/0714-Do-not-run-raytrace-logic-for-AIR.patch similarity index 100% rename from patches/server/0714-Do-not-run-raytrace-logic-for-AIR.patch rename to patches/unapplied/server/0714-Do-not-run-raytrace-logic-for-AIR.patch diff --git a/patches/server/0715-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0715-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0715-Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/0715-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/0716-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0717-Optimise-random-block-ticking.patch b/patches/unapplied/server/0717-Optimise-random-block-ticking.patch similarity index 100% rename from patches/server/0717-Optimise-random-block-ticking.patch rename to patches/unapplied/server/0717-Optimise-random-block-ticking.patch diff --git a/patches/server/0718-Optimise-non-flush-packet-sending.patch b/patches/unapplied/server/0718-Optimise-non-flush-packet-sending.patch similarity index 100% rename from patches/server/0718-Optimise-non-flush-packet-sending.patch rename to patches/unapplied/server/0718-Optimise-non-flush-packet-sending.patch diff --git a/patches/server/0719-Optimise-nearby-player-lookups.patch b/patches/unapplied/server/0719-Optimise-nearby-player-lookups.patch similarity index 100% rename from patches/server/0719-Optimise-nearby-player-lookups.patch rename to patches/unapplied/server/0719-Optimise-nearby-player-lookups.patch diff --git a/patches/server/0720-Remove-streams-for-villager-AI.patch b/patches/unapplied/server/0720-Remove-streams-for-villager-AI.patch similarity index 100% rename from patches/server/0720-Remove-streams-for-villager-AI.patch rename to patches/unapplied/server/0720-Remove-streams-for-villager-AI.patch diff --git a/patches/server/0721-Use-Velocity-compression-and-cipher-natives.patch b/patches/unapplied/server/0721-Use-Velocity-compression-and-cipher-natives.patch similarity index 100% rename from patches/server/0721-Use-Velocity-compression-and-cipher-natives.patch rename to patches/unapplied/server/0721-Use-Velocity-compression-and-cipher-natives.patch diff --git a/patches/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch b/patches/unapplied/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch similarity index 100% rename from patches/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch rename to patches/unapplied/server/0722-Reduce-worldgen-thread-worker-count-for-low-core-cou.patch diff --git a/patches/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch b/patches/unapplied/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch similarity index 100% rename from patches/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch rename to patches/unapplied/server/0723-Fix-Bukkit-NamespacedKey-shenanigans.patch diff --git a/patches/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/0724-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0725-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0725-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0725-Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/0725-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/0726-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/0727-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0728-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0728-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0728-Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/0728-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0729-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0729-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0729-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/0729-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/0730-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0731-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0731-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0731-Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/0731-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0732-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0732-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0732-fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/0732-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0733-Preserve-overstacked-loot.patch b/patches/unapplied/server/0733-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0733-Preserve-overstacked-loot.patch rename to patches/unapplied/server/0733-Preserve-overstacked-loot.patch diff --git a/patches/server/0734-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0734-Update-head-rotation-in-missing-places.patch similarity index 100% rename from patches/server/0734-Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/0734-Update-head-rotation-in-missing-places.patch diff --git a/patches/server/0735-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0735-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0735-prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/0735-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0736-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0736-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0736-Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/0736-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0737-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0737-Fix-upstreams-block-state-factories.patch similarity index 100% rename from patches/server/0737-Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/0737-Fix-upstreams-block-state-factories.patch diff --git a/patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch b/patches/unapplied/server/0738-Add-config-option-for-logging-player-ip-addresses.patch similarity index 100% rename from patches/server/0738-Add-config-option-for-logging-player-ip-addresses.patch rename to patches/unapplied/server/0738-Add-config-option-for-logging-player-ip-addresses.patch diff --git a/patches/server/0739-Configurable-feature-seeds.patch b/patches/unapplied/server/0739-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0739-Configurable-feature-seeds.patch rename to patches/unapplied/server/0739-Configurable-feature-seeds.patch diff --git a/patches/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch b/patches/unapplied/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch similarity index 100% rename from patches/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch rename to patches/unapplied/server/0740-VanillaCommandWrapper-didnt-account-for-entity-sende.patch diff --git a/patches/server/0741-Add-root-admin-user-detection.patch b/patches/unapplied/server/0741-Add-root-admin-user-detection.patch similarity index 100% rename from patches/server/0741-Add-root-admin-user-detection.patch rename to patches/unapplied/server/0741-Add-root-admin-user-detection.patch diff --git a/patches/server/0742-Always-allow-item-changing-in-Fireball.patch b/patches/unapplied/server/0742-Always-allow-item-changing-in-Fireball.patch similarity index 100% rename from patches/server/0742-Always-allow-item-changing-in-Fireball.patch rename to patches/unapplied/server/0742-Always-allow-item-changing-in-Fireball.patch diff --git a/patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0743-don-t-attempt-to-teleport-dead-entities.patch similarity index 100% rename from patches/server/0743-don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/0743-don-t-attempt-to-teleport-dead-entities.patch diff --git a/patches/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/0744-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/0745-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch b/patches/unapplied/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch similarity index 100% rename from patches/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch rename to patches/unapplied/server/0746-Always-parse-protochunk-light-sources-unless-it-is-m.patch diff --git a/patches/server/0747-Fix-removing-recipes-from-RecipeIterator.patch b/patches/unapplied/server/0747-Fix-removing-recipes-from-RecipeIterator.patch similarity index 100% rename from patches/server/0747-Fix-removing-recipes-from-RecipeIterator.patch rename to patches/unapplied/server/0747-Fix-removing-recipes-from-RecipeIterator.patch diff --git a/patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/0748-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch b/patches/unapplied/server/0749-Hide-unnecessary-itemmeta-from-clients.patch similarity index 100% rename from patches/server/0749-Hide-unnecessary-itemmeta-from-clients.patch rename to patches/unapplied/server/0749-Hide-unnecessary-itemmeta-from-clients.patch diff --git a/patches/server/0750-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0750-Fix-Spigot-growth-modifiers.patch similarity index 100% rename from patches/server/0750-Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/0750-Fix-Spigot-growth-modifiers.patch diff --git a/patches/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/0751-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0752-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0752-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0752-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/0752-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0753-Add-player-health-update-API.patch b/patches/unapplied/server/0753-Add-player-health-update-API.patch similarity index 100% rename from patches/server/0753-Add-player-health-update-API.patch rename to patches/unapplied/server/0753-Add-player-health-update-API.patch diff --git a/patches/server/0754-Optimize-HashMapPalette.patch b/patches/unapplied/server/0754-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0754-Optimize-HashMapPalette.patch rename to patches/unapplied/server/0754-Optimize-HashMapPalette.patch diff --git a/patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/0755-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch b/patches/unapplied/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch similarity index 100% rename from patches/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch rename to patches/unapplied/server/0756-Highly-optimise-single-and-multi-AABB-VoxelShapes-an.patch diff --git a/patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/unapplied/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch similarity index 100% rename from patches/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch rename to patches/unapplied/server/0757-Optimise-collision-checking-in-player-move-packet-ha.patch diff --git a/patches/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/0758-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0759-Add-more-Campfire-API.patch b/patches/unapplied/server/0759-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0759-Add-more-Campfire-API.patch rename to patches/unapplied/server/0759-Add-more-Campfire-API.patch diff --git a/patches/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/0760-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0761-Fix-tripwire-state-inconsistency.patch b/patches/unapplied/server/0761-Fix-tripwire-state-inconsistency.patch similarity index 100% rename from patches/server/0761-Fix-tripwire-state-inconsistency.patch rename to patches/unapplied/server/0761-Fix-tripwire-state-inconsistency.patch diff --git a/patches/server/0762-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0762-Forward-CraftEntity-in-teleport-command.patch similarity index 100% rename from patches/server/0762-Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/0762-Forward-CraftEntity-in-teleport-command.patch diff --git a/patches/server/0763-Improve-scoreboard-entries.patch b/patches/unapplied/server/0763-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0763-Improve-scoreboard-entries.patch rename to patches/unapplied/server/0763-Improve-scoreboard-entries.patch diff --git a/patches/server/0764-Entity-powdered-snow-API.patch b/patches/unapplied/server/0764-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0764-Entity-powdered-snow-API.patch rename to patches/unapplied/server/0764-Entity-powdered-snow-API.patch diff --git a/patches/server/0765-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0765-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0765-Add-API-for-item-entity-health.patch rename to patches/unapplied/server/0765-Add-API-for-item-entity-health.patch diff --git a/patches/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/unapplied/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch similarity index 100% rename from patches/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch rename to patches/unapplied/server/0766-Fix-entity-type-tags-suggestions-in-selectors.patch diff --git a/patches/server/0767-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0767-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0767-Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/0767-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/0768-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch b/patches/unapplied/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch similarity index 100% rename from patches/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch rename to patches/unapplied/server/0769-Load-effect-amplifiers-greater-than-127-correctly.patch diff --git a/patches/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/0770-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0771-Fix-bees-aging-inside-hives.patch b/patches/unapplied/server/0771-Fix-bees-aging-inside-hives.patch similarity index 100% rename from patches/server/0771-Fix-bees-aging-inside-hives.patch rename to patches/unapplied/server/0771-Fix-bees-aging-inside-hives.patch diff --git a/patches/server/0772-Bucketable-API.patch b/patches/unapplied/server/0772-Bucketable-API.patch similarity index 100% rename from patches/server/0772-Bucketable-API.patch rename to patches/unapplied/server/0772-Bucketable-API.patch diff --git a/patches/server/0773-Validate-usernames.patch b/patches/unapplied/server/0773-Validate-usernames.patch similarity index 100% rename from patches/server/0773-Validate-usernames.patch rename to patches/unapplied/server/0773-Validate-usernames.patch diff --git a/patches/server/0774-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0774-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0774-Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/0774-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/0775-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/0776-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/unapplied/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch similarity index 100% rename from patches/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch rename to patches/unapplied/server/0777-Add-new-overload-to-PersistentDataContainer-has.patch diff --git a/patches/server/0778-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0778-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0778-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/0778-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0779-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0779-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0779-Reset-placed-block-on-exception.patch rename to patches/unapplied/server/0779-Reset-placed-block-on-exception.patch diff --git a/patches/server/0780-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0780-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0780-Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/0780-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/unapplied/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch rename to patches/unapplied/server/0781-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/server/0782-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0782-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0782-Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/0782-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0783-Kick-on-main-for-illegal-chat.patch b/patches/unapplied/server/0783-Kick-on-main-for-illegal-chat.patch similarity index 100% rename from patches/server/0783-Kick-on-main-for-illegal-chat.patch rename to patches/unapplied/server/0783-Kick-on-main-for-illegal-chat.patch diff --git a/patches/server/0784-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0784-Multi-Block-Change-API-Implementation.patch similarity index 100% rename from patches/server/0784-Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/0784-Multi-Block-Change-API-Implementation.patch diff --git a/patches/server/0785-Fix-NotePlayEvent.patch b/patches/unapplied/server/0785-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0785-Fix-NotePlayEvent.patch rename to patches/unapplied/server/0785-Fix-NotePlayEvent.patch diff --git a/patches/server/0786-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0786-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0786-Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/0786-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0787-Dolphin-API.patch b/patches/unapplied/server/0787-Dolphin-API.patch similarity index 100% rename from patches/server/0787-Dolphin-API.patch rename to patches/unapplied/server/0787-Dolphin-API.patch diff --git a/patches/server/0788-More-PotionEffectType-API.patch b/patches/unapplied/server/0788-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0788-More-PotionEffectType-API.patch rename to patches/unapplied/server/0788-More-PotionEffectType-API.patch diff --git a/patches/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/0789-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/0790-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0791-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0791-Add-missing-structure-set-seed-configs.patch similarity index 100% rename from patches/server/0791-Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/0791-Add-missing-structure-set-seed-configs.patch diff --git a/patches/server/0792-Implement-regenerateChunk.patch b/patches/unapplied/server/0792-Implement-regenerateChunk.patch similarity index 100% rename from patches/server/0792-Implement-regenerateChunk.patch rename to patches/unapplied/server/0792-Implement-regenerateChunk.patch diff --git a/patches/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 100% rename from patches/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/0793-Fix-cancelled-powdered-snow-bucket-placement.patch diff --git a/patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/0794-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0795-Add-GameEvent-tags.patch b/patches/unapplied/server/0795-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0795-Add-GameEvent-tags.patch rename to patches/unapplied/server/0795-Add-GameEvent-tags.patch diff --git a/patches/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 100% rename from patches/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/0796-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch diff --git a/patches/server/0797-Furnace-RecipesUsed-API.patch b/patches/unapplied/server/0797-Furnace-RecipesUsed-API.patch similarity index 100% rename from patches/server/0797-Furnace-RecipesUsed-API.patch rename to patches/unapplied/server/0797-Furnace-RecipesUsed-API.patch diff --git a/patches/server/0798-Configurable-sculk-sensor-listener-range.patch b/patches/unapplied/server/0798-Configurable-sculk-sensor-listener-range.patch similarity index 100% rename from patches/server/0798-Configurable-sculk-sensor-listener-range.patch rename to patches/unapplied/server/0798-Configurable-sculk-sensor-listener-range.patch diff --git a/patches/server/0799-Add-missing-block-data-mins-and-maxes.patch b/patches/unapplied/server/0799-Add-missing-block-data-mins-and-maxes.patch similarity index 100% rename from patches/server/0799-Add-missing-block-data-mins-and-maxes.patch rename to patches/unapplied/server/0799-Add-missing-block-data-mins-and-maxes.patch diff --git a/patches/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/unapplied/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch similarity index 100% rename from patches/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch rename to patches/unapplied/server/0800-Option-to-have-default-CustomSpawners-in-custom-worl.patch diff --git a/patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch b/patches/unapplied/server/0801-Put-world-into-worldlist-before-initing-the-world.patch similarity index 100% rename from patches/server/0801-Put-world-into-worldlist-before-initing-the-world.patch rename to patches/unapplied/server/0801-Put-world-into-worldlist-before-initing-the-world.patch diff --git a/patches/server/0802-Fix-Entity-Position-Desync.patch b/patches/unapplied/server/0802-Fix-Entity-Position-Desync.patch similarity index 100% rename from patches/server/0802-Fix-Entity-Position-Desync.patch rename to patches/unapplied/server/0802-Fix-Entity-Position-Desync.patch diff --git a/patches/server/0803-Custom-Potion-Mixes.patch b/patches/unapplied/server/0803-Custom-Potion-Mixes.patch similarity index 100% rename from patches/server/0803-Custom-Potion-Mixes.patch rename to patches/unapplied/server/0803-Custom-Potion-Mixes.patch diff --git a/patches/server/0804-Force-close-world-loading-screen.patch b/patches/unapplied/server/0804-Force-close-world-loading-screen.patch similarity index 100% rename from patches/server/0804-Force-close-world-loading-screen.patch rename to patches/unapplied/server/0804-Force-close-world-loading-screen.patch diff --git a/patches/server/0805-Fix-falling-block-spawn-methods.patch b/patches/unapplied/server/0805-Fix-falling-block-spawn-methods.patch similarity index 100% rename from patches/server/0805-Fix-falling-block-spawn-methods.patch rename to patches/unapplied/server/0805-Fix-falling-block-spawn-methods.patch diff --git a/patches/server/0806-Expose-furnace-minecart-push-values.patch b/patches/unapplied/server/0806-Expose-furnace-minecart-push-values.patch similarity index 100% rename from patches/server/0806-Expose-furnace-minecart-push-values.patch rename to patches/unapplied/server/0806-Expose-furnace-minecart-push-values.patch diff --git a/patches/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/unapplied/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch similarity index 100% rename from patches/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch rename to patches/unapplied/server/0807-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch diff --git a/patches/server/0808-More-Projectile-API.patch b/patches/unapplied/server/0808-More-Projectile-API.patch similarity index 100% rename from patches/server/0808-More-Projectile-API.patch rename to patches/unapplied/server/0808-More-Projectile-API.patch diff --git a/patches/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/unapplied/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch similarity index 100% rename from patches/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch rename to patches/unapplied/server/0809-Fix-swamp-hut-cat-generation-deadlock.patch diff --git a/patches/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/unapplied/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch similarity index 100% rename from patches/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch rename to patches/unapplied/server/0810-Don-t-allow-vehicle-movement-from-players-while-tele.patch diff --git a/patches/server/0811-Implement-getComputedBiome-API.patch b/patches/unapplied/server/0811-Implement-getComputedBiome-API.patch similarity index 100% rename from patches/server/0811-Implement-getComputedBiome-API.patch rename to patches/unapplied/server/0811-Implement-getComputedBiome-API.patch diff --git a/patches/server/0812-Make-some-itemstacks-nonnull.patch b/patches/unapplied/server/0812-Make-some-itemstacks-nonnull.patch similarity index 100% rename from patches/server/0812-Make-some-itemstacks-nonnull.patch rename to patches/unapplied/server/0812-Make-some-itemstacks-nonnull.patch diff --git a/patches/server/0813-Implement-enchantWithLevels-API.patch b/patches/unapplied/server/0813-Implement-enchantWithLevels-API.patch similarity index 100% rename from patches/server/0813-Implement-enchantWithLevels-API.patch rename to patches/unapplied/server/0813-Implement-enchantWithLevels-API.patch diff --git a/patches/server/0814-Fix-saving-in-unloadWorld.patch b/patches/unapplied/server/0814-Fix-saving-in-unloadWorld.patch similarity index 100% rename from patches/server/0814-Fix-saving-in-unloadWorld.patch rename to patches/unapplied/server/0814-Fix-saving-in-unloadWorld.patch diff --git a/patches/server/0815-Buffer-OOB-setBlock-calls.patch b/patches/unapplied/server/0815-Buffer-OOB-setBlock-calls.patch similarity index 100% rename from patches/server/0815-Buffer-OOB-setBlock-calls.patch rename to patches/unapplied/server/0815-Buffer-OOB-setBlock-calls.patch diff --git a/patches/server/0816-Add-TameableDeathMessageEvent.patch b/patches/unapplied/server/0816-Add-TameableDeathMessageEvent.patch similarity index 100% rename from patches/server/0816-Add-TameableDeathMessageEvent.patch rename to patches/unapplied/server/0816-Add-TameableDeathMessageEvent.patch diff --git a/patches/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/unapplied/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch similarity index 100% rename from patches/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch rename to patches/unapplied/server/0817-Fix-new-block-data-for-EntityChangeBlockEvent.patch diff --git a/patches/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/unapplied/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch similarity index 100% rename from patches/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch rename to patches/unapplied/server/0818-fix-player-loottables-running-when-mob-loot-gamerule.patch diff --git a/patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/unapplied/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch similarity index 100% rename from patches/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch rename to patches/unapplied/server/0819-Ensure-entity-passenger-world-matches-ridden-entity.patch diff --git a/patches/server/0820-Guard-against-invalid-entity-positions.patch b/patches/unapplied/server/0820-Guard-against-invalid-entity-positions.patch similarity index 100% rename from patches/server/0820-Guard-against-invalid-entity-positions.patch rename to patches/unapplied/server/0820-Guard-against-invalid-entity-positions.patch diff --git a/patches/server/0821-cache-resource-keys.patch b/patches/unapplied/server/0821-cache-resource-keys.patch similarity index 100% rename from patches/server/0821-cache-resource-keys.patch rename to patches/unapplied/server/0821-cache-resource-keys.patch diff --git a/patches/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch b/patches/unapplied/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch similarity index 100% rename from patches/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch rename to patches/unapplied/server/0822-Allow-to-change-the-podium-for-the-EnderDragon.patch diff --git a/patches/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/unapplied/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch similarity index 100% rename from patches/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch rename to patches/unapplied/server/0823-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch diff --git a/patches/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch b/patches/unapplied/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch similarity index 100% rename from patches/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch rename to patches/unapplied/server/0824-Fix-StructureGrowEvent-species-for-RED_MUSHROOM.patch diff --git a/patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch b/patches/unapplied/server/0825-Prevent-tile-entity-copies-loading-chunks.patch similarity index 100% rename from patches/server/0825-Prevent-tile-entity-copies-loading-chunks.patch rename to patches/unapplied/server/0825-Prevent-tile-entity-copies-loading-chunks.patch diff --git a/patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/unapplied/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch similarity index 100% rename from patches/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch rename to patches/unapplied/server/0826-Use-username-instead-of-display-name-in-PlayerList-g.patch diff --git a/patches/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch b/patches/unapplied/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch similarity index 100% rename from patches/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch rename to patches/unapplied/server/0827-Fix-slime-spawners-not-spawning-outside-slime-chunks.patch diff --git a/patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch b/patches/unapplied/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch similarity index 100% rename from patches/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch rename to patches/unapplied/server/0828-Pass-ServerLevel-for-gamerule-callbacks.patch diff --git a/patches/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/unapplied/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch similarity index 100% rename from patches/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch rename to patches/unapplied/server/0829-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch diff --git a/patches/server/0830-WorldCreator-keepSpawnLoaded.patch b/patches/unapplied/server/0830-WorldCreator-keepSpawnLoaded.patch similarity index 100% rename from patches/server/0830-WorldCreator-keepSpawnLoaded.patch rename to patches/unapplied/server/0830-WorldCreator-keepSpawnLoaded.patch diff --git a/patches/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch b/patches/unapplied/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch similarity index 100% rename from patches/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch rename to patches/unapplied/server/0831-Fix-NPE-for-BlockDataMeta-getBlockData.patch diff --git a/patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/unapplied/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch similarity index 100% rename from patches/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch rename to patches/unapplied/server/0832-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch diff --git a/patches/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/unapplied/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch similarity index 100% rename from patches/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch rename to patches/unapplied/server/0833-Add-EntityDyeEvent-and-CollarColorable-interface.patch diff --git a/patches/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/unapplied/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch similarity index 100% rename from patches/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch rename to patches/unapplied/server/0834-Fire-CauldronLevelChange-on-initial-fill.patch diff --git a/patches/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/unapplied/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch similarity index 100% rename from patches/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch rename to patches/unapplied/server/0835-fix-powder-snow-cauldrons-not-turning-to-water.patch diff --git a/patches/server/0836-Add-PlayerStopUsingItemEvent.patch b/patches/unapplied/server/0836-Add-PlayerStopUsingItemEvent.patch similarity index 100% rename from patches/server/0836-Add-PlayerStopUsingItemEvent.patch rename to patches/unapplied/server/0836-Add-PlayerStopUsingItemEvent.patch diff --git a/patches/server/0837-FallingBlock-auto-expire-setting.patch b/patches/unapplied/server/0837-FallingBlock-auto-expire-setting.patch similarity index 100% rename from patches/server/0837-FallingBlock-auto-expire-setting.patch rename to patches/unapplied/server/0837-FallingBlock-auto-expire-setting.patch diff --git a/patches/server/0838-Don-t-tick-markers.patch b/patches/unapplied/server/0838-Don-t-tick-markers.patch similarity index 100% rename from patches/server/0838-Don-t-tick-markers.patch rename to patches/unapplied/server/0838-Don-t-tick-markers.patch diff --git a/patches/server/0839-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0839-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0839-Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/0839-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0840-Add-support-for-Proxy-Protocol.patch b/patches/unapplied/server/0840-Add-support-for-Proxy-Protocol.patch similarity index 100% rename from patches/server/0840-Add-support-for-Proxy-Protocol.patch rename to patches/unapplied/server/0840-Add-support-for-Proxy-Protocol.patch diff --git a/patches/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/unapplied/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch similarity index 100% rename from patches/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch rename to patches/unapplied/server/0841-Fix-OfflinePlayer-getBedSpawnLocation.patch diff --git a/patches/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/unapplied/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch similarity index 100% rename from patches/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch rename to patches/unapplied/server/0842-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch diff --git a/patches/server/0843-Sanitize-Sent-BlockEntity-NBT.patch b/patches/unapplied/server/0843-Sanitize-Sent-BlockEntity-NBT.patch similarity index 100% rename from patches/server/0843-Sanitize-Sent-BlockEntity-NBT.patch rename to patches/unapplied/server/0843-Sanitize-Sent-BlockEntity-NBT.patch diff --git a/patches/server/0844-Disable-component-selector-resolving-in-books-by-def.patch b/patches/unapplied/server/0844-Disable-component-selector-resolving-in-books-by-def.patch similarity index 100% rename from patches/server/0844-Disable-component-selector-resolving-in-books-by-def.patch rename to patches/unapplied/server/0844-Disable-component-selector-resolving-in-books-by-def.patch diff --git a/patches/server/0845-Prevent-entity-loading-causing-async-lookups.patch b/patches/unapplied/server/0845-Prevent-entity-loading-causing-async-lookups.patch similarity index 100% rename from patches/server/0845-Prevent-entity-loading-causing-async-lookups.patch rename to patches/unapplied/server/0845-Prevent-entity-loading-causing-async-lookups.patch diff --git a/patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch b/patches/unapplied/server/0846-Throw-exception-on-world-create-while-being-ticked.patch similarity index 100% rename from patches/server/0846-Throw-exception-on-world-create-while-being-ticked.patch rename to patches/unapplied/server/0846-Throw-exception-on-world-create-while-being-ticked.patch diff --git a/patches/server/0847-Add-Alternate-Current-redstone-implementation.patch b/patches/unapplied/server/0847-Add-Alternate-Current-redstone-implementation.patch similarity index 100% rename from patches/server/0847-Add-Alternate-Current-redstone-implementation.patch rename to patches/unapplied/server/0847-Add-Alternate-Current-redstone-implementation.patch diff --git a/patches/server/0848-Dont-resent-entity-on-art-update.patch b/patches/unapplied/server/0848-Dont-resent-entity-on-art-update.patch similarity index 100% rename from patches/server/0848-Dont-resent-entity-on-art-update.patch rename to patches/unapplied/server/0848-Dont-resent-entity-on-art-update.patch diff --git a/patches/server/0849-Add-WardenAngerChangeEvent.patch b/patches/unapplied/server/0849-Add-WardenAngerChangeEvent.patch similarity index 100% rename from patches/server/0849-Add-WardenAngerChangeEvent.patch rename to patches/unapplied/server/0849-Add-WardenAngerChangeEvent.patch diff --git a/patches/server/0850-Add-option-for-strict-advancement-dimension-checks.patch b/patches/unapplied/server/0850-Add-option-for-strict-advancement-dimension-checks.patch similarity index 100% rename from patches/server/0850-Add-option-for-strict-advancement-dimension-checks.patch rename to patches/unapplied/server/0850-Add-option-for-strict-advancement-dimension-checks.patch diff --git a/patches/server/0851-Add-missing-important-BlockStateListPopulator-method.patch b/patches/unapplied/server/0851-Add-missing-important-BlockStateListPopulator-method.patch similarity index 100% rename from patches/server/0851-Add-missing-important-BlockStateListPopulator-method.patch rename to patches/unapplied/server/0851-Add-missing-important-BlockStateListPopulator-method.patch diff --git a/patches/server/0852-Nameable-Banner-API.patch b/patches/unapplied/server/0852-Nameable-Banner-API.patch similarity index 100% rename from patches/server/0852-Nameable-Banner-API.patch rename to patches/unapplied/server/0852-Nameable-Banner-API.patch diff --git a/patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch b/patches/unapplied/server/0853-Don-t-broadcast-messages-to-command-blocks.patch similarity index 100% rename from patches/server/0853-Don-t-broadcast-messages-to-command-blocks.patch rename to patches/unapplied/server/0853-Don-t-broadcast-messages-to-command-blocks.patch diff --git a/patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch b/patches/unapplied/server/0854-Prevent-empty-items-from-being-added-to-world.patch similarity index 100% rename from patches/server/0854-Prevent-empty-items-from-being-added-to-world.patch rename to patches/unapplied/server/0854-Prevent-empty-items-from-being-added-to-world.patch diff --git a/patches/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/unapplied/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch similarity index 100% rename from patches/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch rename to patches/unapplied/server/0855-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch diff --git a/patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch b/patches/unapplied/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch similarity index 100% rename from patches/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch rename to patches/unapplied/server/0856-Don-t-print-component-in-resource-pack-rejection-mes.patch diff --git a/patches/server/0857-Add-Player-getFishHook.patch b/patches/unapplied/server/0857-Add-Player-getFishHook.patch similarity index 100% rename from patches/server/0857-Add-Player-getFishHook.patch rename to patches/unapplied/server/0857-Add-Player-getFishHook.patch diff --git a/patches/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/unapplied/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch similarity index 100% rename from patches/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch rename to patches/unapplied/server/0858-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch diff --git a/patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/unapplied/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch similarity index 100% rename from patches/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch rename to patches/unapplied/server/0859-Add-various-missing-EntityDropItemEvent-calls.patch diff --git a/patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch b/patches/unapplied/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch similarity index 100% rename from patches/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch rename to patches/unapplied/server/0860-Add-some-minimal-debug-information-to-chat-packet-er.patch diff --git a/patches/server/0861-Fix-Bee-flower-NPE.patch b/patches/unapplied/server/0861-Fix-Bee-flower-NPE.patch similarity index 100% rename from patches/server/0861-Fix-Bee-flower-NPE.patch rename to patches/unapplied/server/0861-Fix-Bee-flower-NPE.patch diff --git a/patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/unapplied/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch similarity index 100% rename from patches/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch rename to patches/unapplied/server/0862-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch diff --git a/patches/server/0863-More-Teleport-API.patch b/patches/unapplied/server/0863-More-Teleport-API.patch similarity index 100% rename from patches/server/0863-More-Teleport-API.patch rename to patches/unapplied/server/0863-More-Teleport-API.patch diff --git a/patches/server/0864-Add-EntityPortalReadyEvent.patch b/patches/unapplied/server/0864-Add-EntityPortalReadyEvent.patch similarity index 100% rename from patches/server/0864-Add-EntityPortalReadyEvent.patch rename to patches/unapplied/server/0864-Add-EntityPortalReadyEvent.patch diff --git a/patches/server/0865-Don-t-use-level-random-in-entity-constructors.patch b/patches/unapplied/server/0865-Don-t-use-level-random-in-entity-constructors.patch similarity index 100% rename from patches/server/0865-Don-t-use-level-random-in-entity-constructors.patch rename to patches/unapplied/server/0865-Don-t-use-level-random-in-entity-constructors.patch diff --git a/patches/server/0866-Send-block-entities-after-destroy-prediction.patch b/patches/unapplied/server/0866-Send-block-entities-after-destroy-prediction.patch similarity index 100% rename from patches/server/0866-Send-block-entities-after-destroy-prediction.patch rename to patches/unapplied/server/0866-Send-block-entities-after-destroy-prediction.patch diff --git a/patches/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/unapplied/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch similarity index 100% rename from patches/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch rename to patches/unapplied/server/0867-Warn-on-plugins-accessing-faraway-chunks.patch diff --git a/patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch b/patches/unapplied/server/0868-Custom-Chat-Completion-Suggestions-API.patch similarity index 100% rename from patches/server/0868-Custom-Chat-Completion-Suggestions-API.patch rename to patches/unapplied/server/0868-Custom-Chat-Completion-Suggestions-API.patch diff --git a/patches/server/0869-Add-missing-BlockFadeEvents.patch b/patches/unapplied/server/0869-Add-missing-BlockFadeEvents.patch similarity index 100% rename from patches/server/0869-Add-missing-BlockFadeEvents.patch rename to patches/unapplied/server/0869-Add-missing-BlockFadeEvents.patch diff --git a/patches/server/0870-Collision-API.patch b/patches/unapplied/server/0870-Collision-API.patch similarity index 100% rename from patches/server/0870-Collision-API.patch rename to patches/unapplied/server/0870-Collision-API.patch diff --git a/patches/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/unapplied/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch similarity index 100% rename from patches/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch rename to patches/unapplied/server/0871-Fix-suggest-command-message-for-brigadier-syntax-exc.patch diff --git a/patches/server/0872-Remove-invalid-signature-login-stacktrace.patch b/patches/unapplied/server/0872-Remove-invalid-signature-login-stacktrace.patch similarity index 100% rename from patches/server/0872-Remove-invalid-signature-login-stacktrace.patch rename to patches/unapplied/server/0872-Remove-invalid-signature-login-stacktrace.patch diff --git a/patches/server/0873-Block-Ticking-API.patch b/patches/unapplied/server/0873-Block-Ticking-API.patch similarity index 100% rename from patches/server/0873-Block-Ticking-API.patch rename to patches/unapplied/server/0873-Block-Ticking-API.patch diff --git a/patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch b/patches/unapplied/server/0874-Add-Velocity-IP-Forwarding-Support.patch similarity index 100% rename from patches/server/0874-Add-Velocity-IP-Forwarding-Support.patch rename to patches/unapplied/server/0874-Add-Velocity-IP-Forwarding-Support.patch diff --git a/patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch b/patches/unapplied/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch similarity index 100% rename from patches/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch rename to patches/unapplied/server/0875-Use-thread-safe-random-in-ServerLoginPacketListenerI.patch diff --git a/patches/server/0876-Add-NamespacedKey-biome-methods.patch b/patches/unapplied/server/0876-Add-NamespacedKey-biome-methods.patch similarity index 100% rename from patches/server/0876-Add-NamespacedKey-biome-methods.patch rename to patches/unapplied/server/0876-Add-NamespacedKey-biome-methods.patch diff --git a/patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch b/patches/unapplied/server/0877-Fix-plugin-loggers-on-server-shutdown.patch similarity index 100% rename from patches/server/0877-Fix-plugin-loggers-on-server-shutdown.patch rename to patches/unapplied/server/0877-Fix-plugin-loggers-on-server-shutdown.patch diff --git a/patches/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch b/patches/unapplied/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch similarity index 100% rename from patches/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch rename to patches/unapplied/server/0878-Workaround-for-client-lag-spikes-MC-162253.patch diff --git a/patches/server/0879-Stop-large-look-changes-from-crashing-the-server.patch b/patches/unapplied/server/0879-Stop-large-look-changes-from-crashing-the-server.patch similarity index 100% rename from patches/server/0879-Stop-large-look-changes-from-crashing-the-server.patch rename to patches/unapplied/server/0879-Stop-large-look-changes-from-crashing-the-server.patch diff --git a/patches/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch b/patches/unapplied/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch similarity index 100% rename from patches/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch rename to patches/unapplied/server/0880-Fix-EndDragonFight-killed-statuses-should-be-false-f.patch diff --git a/patches/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/unapplied/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch similarity index 100% rename from patches/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch rename to patches/unapplied/server/0881-Fire-EntityChangeBlockEvent-in-more-places.patch diff --git a/patches/server/0882-Missing-eating-regain-reason.patch b/patches/unapplied/server/0882-Missing-eating-regain-reason.patch similarity index 100% rename from patches/server/0882-Missing-eating-regain-reason.patch rename to patches/unapplied/server/0882-Missing-eating-regain-reason.patch diff --git a/patches/server/0883-Missing-effect-cause.patch b/patches/unapplied/server/0883-Missing-effect-cause.patch similarity index 100% rename from patches/server/0883-Missing-effect-cause.patch rename to patches/unapplied/server/0883-Missing-effect-cause.patch diff --git a/patches/server/0884-Added-byte-array-serialization-deserialization-for-P.patch b/patches/unapplied/server/0884-Added-byte-array-serialization-deserialization-for-P.patch similarity index 100% rename from patches/server/0884-Added-byte-array-serialization-deserialization-for-P.patch rename to patches/unapplied/server/0884-Added-byte-array-serialization-deserialization-for-P.patch diff --git a/patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/unapplied/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch similarity index 100% rename from patches/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch rename to patches/unapplied/server/0885-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch diff --git a/patches/server/0886-Call-BlockPhysicsEvent-more-often.patch b/patches/unapplied/server/0886-Call-BlockPhysicsEvent-more-often.patch similarity index 100% rename from patches/server/0886-Call-BlockPhysicsEvent-more-often.patch rename to patches/unapplied/server/0886-Call-BlockPhysicsEvent-more-often.patch diff --git a/patches/server/0887-Configurable-chat-thread-limit.patch b/patches/unapplied/server/0887-Configurable-chat-thread-limit.patch similarity index 100% rename from patches/server/0887-Configurable-chat-thread-limit.patch rename to patches/unapplied/server/0887-Configurable-chat-thread-limit.patch diff --git a/patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/unapplied/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch similarity index 100% rename from patches/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch rename to patches/unapplied/server/0888-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch diff --git a/patches/server/0889-Set-position-before-player-sending-on-dimension-chan.patch b/patches/unapplied/server/0889-Set-position-before-player-sending-on-dimension-chan.patch similarity index 100% rename from patches/server/0889-Set-position-before-player-sending-on-dimension-chan.patch rename to patches/unapplied/server/0889-Set-position-before-player-sending-on-dimension-chan.patch diff --git a/patches/server/0890-fix-Jigsaw-block-kicking-user.patch b/patches/unapplied/server/0890-fix-Jigsaw-block-kicking-user.patch similarity index 100% rename from patches/server/0890-fix-Jigsaw-block-kicking-user.patch rename to patches/unapplied/server/0890-fix-Jigsaw-block-kicking-user.patch diff --git a/patches/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/unapplied/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch similarity index 100% rename from patches/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch rename to patches/unapplied/server/0891-use-BlockFormEvent-for-mud-converting-into-clay.patch diff --git a/patches/server/0892-Add-getDrops-to-BlockState.patch b/patches/unapplied/server/0892-Add-getDrops-to-BlockState.patch similarity index 100% rename from patches/server/0892-Add-getDrops-to-BlockState.patch rename to patches/unapplied/server/0892-Add-getDrops-to-BlockState.patch diff --git a/patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch b/patches/unapplied/server/0893-Fix-a-bunch-of-vanilla-bugs.patch similarity index 100% rename from patches/server/0893-Fix-a-bunch-of-vanilla-bugs.patch rename to patches/unapplied/server/0893-Fix-a-bunch-of-vanilla-bugs.patch diff --git a/patches/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/unapplied/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch similarity index 100% rename from patches/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch rename to patches/unapplied/server/0894-Remove-unnecessary-onTrackingStart-during-navigation.patch diff --git a/patches/server/0895-Fix-custom-piglin-loved-items.patch b/patches/unapplied/server/0895-Fix-custom-piglin-loved-items.patch similarity index 100% rename from patches/server/0895-Fix-custom-piglin-loved-items.patch rename to patches/unapplied/server/0895-Fix-custom-piglin-loved-items.patch diff --git a/patches/server/0896-EntityPickupItemEvent-fixes.patch b/patches/unapplied/server/0896-EntityPickupItemEvent-fixes.patch similarity index 100% rename from patches/server/0896-EntityPickupItemEvent-fixes.patch rename to patches/unapplied/server/0896-EntityPickupItemEvent-fixes.patch diff --git a/patches/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/unapplied/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch similarity index 100% rename from patches/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch rename to patches/unapplied/server/0897-Correctly-handle-interactions-with-items-on-cooldown.patch diff --git a/patches/server/0898-Add-PlayerInventorySlotChangeEvent.patch b/patches/unapplied/server/0898-Add-PlayerInventorySlotChangeEvent.patch similarity index 100% rename from patches/server/0898-Add-PlayerInventorySlotChangeEvent.patch rename to patches/unapplied/server/0898-Add-PlayerInventorySlotChangeEvent.patch diff --git a/patches/server/0899-Elder-Guardian-appearance-API.patch b/patches/unapplied/server/0899-Elder-Guardian-appearance-API.patch similarity index 100% rename from patches/server/0899-Elder-Guardian-appearance-API.patch rename to patches/unapplied/server/0899-Elder-Guardian-appearance-API.patch diff --git a/patches/server/0900-Allow-changing-bed-s-occupied-property.patch b/patches/unapplied/server/0900-Allow-changing-bed-s-occupied-property.patch similarity index 100% rename from patches/server/0900-Allow-changing-bed-s-occupied-property.patch rename to patches/unapplied/server/0900-Allow-changing-bed-s-occupied-property.patch diff --git a/patches/server/0901-Add-entity-knockback-API.patch b/patches/unapplied/server/0901-Add-entity-knockback-API.patch similarity index 100% rename from patches/server/0901-Add-entity-knockback-API.patch rename to patches/unapplied/server/0901-Add-entity-knockback-API.patch diff --git a/patches/server/0902-Detect-headless-JREs.patch b/patches/unapplied/server/0902-Detect-headless-JREs.patch similarity index 100% rename from patches/server/0902-Detect-headless-JREs.patch rename to patches/unapplied/server/0902-Detect-headless-JREs.patch diff --git a/patches/server/0903-fixed-entity-vehicle-collision-event-not-called.patch b/patches/unapplied/server/0903-fixed-entity-vehicle-collision-event-not-called.patch similarity index 100% rename from patches/server/0903-fixed-entity-vehicle-collision-event-not-called.patch rename to patches/unapplied/server/0903-fixed-entity-vehicle-collision-event-not-called.patch diff --git a/patches/server/0904-optimized-dirt-and-snow-spreading.patch b/patches/unapplied/server/0904-optimized-dirt-and-snow-spreading.patch similarity index 100% rename from patches/server/0904-optimized-dirt-and-snow-spreading.patch rename to patches/unapplied/server/0904-optimized-dirt-and-snow-spreading.patch diff --git a/patches/server/0905-Added-EntityToggleSitEvent.patch b/patches/unapplied/server/0905-Added-EntityToggleSitEvent.patch similarity index 100% rename from patches/server/0905-Added-EntityToggleSitEvent.patch rename to patches/unapplied/server/0905-Added-EntityToggleSitEvent.patch diff --git a/patches/server/0906-Add-fire-tick-delay-option.patch b/patches/unapplied/server/0906-Add-fire-tick-delay-option.patch similarity index 100% rename from patches/server/0906-Add-fire-tick-delay-option.patch rename to patches/unapplied/server/0906-Add-fire-tick-delay-option.patch diff --git a/patches/server/0907-Add-Moving-Piston-API.patch b/patches/unapplied/server/0907-Add-Moving-Piston-API.patch similarity index 100% rename from patches/server/0907-Add-Moving-Piston-API.patch rename to patches/unapplied/server/0907-Add-Moving-Piston-API.patch diff --git a/patches/server/0908-Ignore-impossible-spawn-tick.patch b/patches/unapplied/server/0908-Ignore-impossible-spawn-tick.patch similarity index 100% rename from patches/server/0908-Ignore-impossible-spawn-tick.patch rename to patches/unapplied/server/0908-Ignore-impossible-spawn-tick.patch diff --git a/patches/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch b/patches/unapplied/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch similarity index 100% rename from patches/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch rename to patches/unapplied/server/0909-Track-projectile-source-for-fireworks-from-dispenser.patch diff --git a/patches/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/unapplied/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch similarity index 100% rename from patches/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch rename to patches/unapplied/server/0910-Fix-EntityArgument-suggestion-permissions-to-align-w.patch diff --git a/patches/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/unapplied/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch similarity index 100% rename from patches/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch rename to patches/unapplied/server/0911-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch diff --git a/patches/server/0912-Prevent-compass-from-loading-chunks.patch b/patches/unapplied/server/0912-Prevent-compass-from-loading-chunks.patch similarity index 100% rename from patches/server/0912-Prevent-compass-from-loading-chunks.patch rename to patches/unapplied/server/0912-Prevent-compass-from-loading-chunks.patch diff --git a/patches/server/0913-Add-PrePlayerAttackEntityEvent.patch b/patches/unapplied/server/0913-Add-PrePlayerAttackEntityEvent.patch similarity index 100% rename from patches/server/0913-Add-PrePlayerAttackEntityEvent.patch rename to patches/unapplied/server/0913-Add-PrePlayerAttackEntityEvent.patch diff --git a/patches/server/0914-ensure-reset-EnderDragon-boss-event-name.patch b/patches/unapplied/server/0914-ensure-reset-EnderDragon-boss-event-name.patch similarity index 100% rename from patches/server/0914-ensure-reset-EnderDragon-boss-event-name.patch rename to patches/unapplied/server/0914-ensure-reset-EnderDragon-boss-event-name.patch diff --git a/patches/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/unapplied/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch similarity index 100% rename from patches/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch rename to patches/unapplied/server/0915-fix-MC-252817-green-map-markers-do-not-disappear.patch diff --git a/patches/server/0916-Add-Player-Warden-Warning-API.patch b/patches/unapplied/server/0916-Add-Player-Warden-Warning-API.patch similarity index 100% rename from patches/server/0916-Add-Player-Warden-Warning-API.patch rename to patches/unapplied/server/0916-Add-Player-Warden-Warning-API.patch diff --git a/patches/server/0917-More-vanilla-friendly-methods-to-update-trades.patch b/patches/unapplied/server/0917-More-vanilla-friendly-methods-to-update-trades.patch similarity index 100% rename from patches/server/0917-More-vanilla-friendly-methods-to-update-trades.patch rename to patches/unapplied/server/0917-More-vanilla-friendly-methods-to-update-trades.patch diff --git a/patches/server/0918-Add-paper-dumplisteners-command.patch b/patches/unapplied/server/0918-Add-paper-dumplisteners-command.patch similarity index 100% rename from patches/server/0918-Add-paper-dumplisteners-command.patch rename to patches/unapplied/server/0918-Add-paper-dumplisteners-command.patch diff --git a/patches/server/0919-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0919-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0919-check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/0919-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/unapplied/server/0920-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0921-ItemStack-damage-API.patch b/patches/unapplied/server/0921-ItemStack-damage-API.patch similarity index 100% rename from patches/server/0921-ItemStack-damage-API.patch rename to patches/unapplied/server/0921-ItemStack-damage-API.patch diff --git a/patches/server/0922-Friction-API.patch b/patches/unapplied/server/0922-Friction-API.patch similarity index 100% rename from patches/server/0922-Friction-API.patch rename to patches/unapplied/server/0922-Friction-API.patch diff --git a/patches/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/unapplied/server/0923-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0924-Fix-player-kick-on-shutdown.patch b/patches/unapplied/server/0924-Fix-player-kick-on-shutdown.patch similarity index 100% rename from patches/server/0924-Fix-player-kick-on-shutdown.patch rename to patches/unapplied/server/0924-Fix-player-kick-on-shutdown.patch diff --git a/patches/server/0925-Sync-offhand-slot-in-menus.patch b/patches/unapplied/server/0925-Sync-offhand-slot-in-menus.patch similarity index 100% rename from patches/server/0925-Sync-offhand-slot-in-menus.patch rename to patches/unapplied/server/0925-Sync-offhand-slot-in-menus.patch diff --git a/patches/server/0926-Player-Entity-Tracking-Events.patch b/patches/unapplied/server/0926-Player-Entity-Tracking-Events.patch similarity index 100% rename from patches/server/0926-Player-Entity-Tracking-Events.patch rename to patches/unapplied/server/0926-Player-Entity-Tracking-Events.patch diff --git a/patches/server/0927-Limit-pet-look-distance.patch b/patches/unapplied/server/0927-Limit-pet-look-distance.patch similarity index 100% rename from patches/server/0927-Limit-pet-look-distance.patch rename to patches/unapplied/server/0927-Limit-pet-look-distance.patch diff --git a/patches/server/0928-Properly-resend-entities.patch b/patches/unapplied/server/0928-Properly-resend-entities.patch similarity index 100% rename from patches/server/0928-Properly-resend-entities.patch rename to patches/unapplied/server/0928-Properly-resend-entities.patch diff --git a/patches/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/unapplied/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch similarity index 100% rename from patches/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch rename to patches/unapplied/server/0929-Fixes-and-additions-to-the-SpawnReason-API.patch diff --git a/patches/server/0930-fix-Instruments.patch b/patches/unapplied/server/0930-fix-Instruments.patch similarity index 100% rename from patches/server/0930-fix-Instruments.patch rename to patches/unapplied/server/0930-fix-Instruments.patch diff --git a/patches/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/unapplied/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch similarity index 100% rename from patches/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch rename to patches/unapplied/server/0931-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch diff --git a/patches/server/0932-Fix-MapLike-Codec-missing-key-selector.patch b/patches/unapplied/server/0932-Fix-MapLike-Codec-missing-key-selector.patch similarity index 100% rename from patches/server/0932-Fix-MapLike-Codec-missing-key-selector.patch rename to patches/unapplied/server/0932-Fix-MapLike-Codec-missing-key-selector.patch diff --git a/patches/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/unapplied/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch similarity index 100% rename from patches/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch rename to patches/unapplied/server/0933-Fix-inconsistencies-in-dispense-events-regarding-sta.patch diff --git a/patches/server/0934-Improve-logging-and-errors.patch b/patches/unapplied/server/0934-Improve-logging-and-errors.patch similarity index 100% rename from patches/server/0934-Improve-logging-and-errors.patch rename to patches/unapplied/server/0934-Improve-logging-and-errors.patch diff --git a/patches/server/0935-Add-BlockLockCheckEvent.patch b/patches/unapplied/server/0935-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/server/0935-Add-BlockLockCheckEvent.patch rename to patches/unapplied/server/0935-Add-BlockLockCheckEvent.patch diff --git a/patches/server/0936-Add-Sneaking-API-for-Entities.patch b/patches/unapplied/server/0936-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/server/0936-Add-Sneaking-API-for-Entities.patch rename to patches/unapplied/server/0936-Add-Sneaking-API-for-Entities.patch diff --git a/patches/server/0937-Improve-PortalEvents.patch b/patches/unapplied/server/0937-Improve-PortalEvents.patch similarity index 100% rename from patches/server/0937-Improve-PortalEvents.patch rename to patches/unapplied/server/0937-Improve-PortalEvents.patch diff --git a/patches/server/0938-Add-config-option-for-spider-worldborder-climbing.patch b/patches/unapplied/server/0938-Add-config-option-for-spider-worldborder-climbing.patch similarity index 100% rename from patches/server/0938-Add-config-option-for-spider-worldborder-climbing.patch rename to patches/unapplied/server/0938-Add-config-option-for-spider-worldborder-climbing.patch diff --git a/patches/server/0939-Add-missing-SpigotConfig-logCommands-check.patch b/patches/unapplied/server/0939-Add-missing-SpigotConfig-logCommands-check.patch similarity index 100% rename from patches/server/0939-Add-missing-SpigotConfig-logCommands-check.patch rename to patches/unapplied/server/0939-Add-missing-SpigotConfig-logCommands-check.patch diff --git a/patches/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/unapplied/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch similarity index 100% rename from patches/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch rename to patches/unapplied/server/0940-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch diff --git a/patches/server/0941-Flying-Fall-Damage.patch b/patches/unapplied/server/0941-Flying-Fall-Damage.patch similarity index 100% rename from patches/server/0941-Flying-Fall-Damage.patch rename to patches/unapplied/server/0941-Flying-Fall-Damage.patch diff --git a/patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/unapplied/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch similarity index 100% rename from patches/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch rename to patches/unapplied/server/0942-Add-exploded-block-state-to-BlockExplodeEvent.patch diff --git a/patches/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 100% rename from patches/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/unapplied/server/0943-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch diff --git a/patches/server/0944-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0944-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0944-config-for-disabling-entity-tag-tags.patch rename to patches/unapplied/server/0944-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0945-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0945-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0945-Use-single-player-info-update-packet-on-join.patch rename to patches/unapplied/server/0945-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 100% rename from patches/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/unapplied/server/0946-Correctly-shrink-items-during-EntityResurrectEvent.patch diff --git a/patches/server/0947-Win-Screen-API.patch b/patches/unapplied/server/0947-Win-Screen-API.patch similarity index 100% rename from patches/server/0947-Win-Screen-API.patch rename to patches/unapplied/server/0947-Win-Screen-API.patch diff --git a/patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 100% rename from patches/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/unapplied/server/0948-Remove-CraftItemStack-setAmount-null-assignment.patch diff --git a/patches/server/0949-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0949-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0949-Fix-force-opening-enchantment-tables.patch rename to patches/unapplied/server/0949-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0950-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0950-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/server/0950-Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/server/0950-Add-Entity-Body-Yaw-API.patch diff --git a/patches/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/unapplied/server/0951-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch b/patches/unapplied/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch similarity index 100% rename from patches/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch rename to patches/unapplied/server/0952-Update-the-flag-when-a-captured-block-state-is-outda.patch diff --git a/patches/server/0953-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0953-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0953-Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/server/0953-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/unapplied/server/0954-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/server/0955-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0956-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0956-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0956-Correctly-handle-ArmorStand-invisibility.patch rename to patches/unapplied/server/0956-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0957-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0957-Fix-advancement-triggers-for-entity-damage.patch rename to patches/unapplied/server/0957-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0958-Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/0958-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0958-Fix-text-display-error-on-spawn.patch rename to patches/unapplied/server/0958-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0959-Fix-certain-inventories-returning-null-Locations.patch b/patches/unapplied/server/0959-Fix-certain-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0959-Fix-certain-inventories-returning-null-Locations.patch rename to patches/unapplied/server/0959-Fix-certain-inventories-returning-null-Locations.patch diff --git a/patches/server/0960-Add-Shearable-API.patch b/patches/unapplied/server/0960-Add-Shearable-API.patch similarity index 100% rename from patches/server/0960-Add-Shearable-API.patch rename to patches/unapplied/server/0960-Add-Shearable-API.patch diff --git a/patches/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/unapplied/server/0961-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch b/patches/unapplied/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch similarity index 100% rename from patches/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch rename to patches/unapplied/server/0962-Fix-chiseled-bookshelf-and-jukebox-setItem-with-air.patch diff --git a/patches/server/0963-Optimize-Hoppers.patch b/patches/unapplied/server/0963-Optimize-Hoppers.patch similarity index 100% rename from patches/server/0963-Optimize-Hoppers.patch rename to patches/unapplied/server/0963-Optimize-Hoppers.patch diff --git a/patches/server/0964-Fix-beehives-generating-from-using-bonemeal.patch b/patches/unapplied/server/0964-Fix-beehives-generating-from-using-bonemeal.patch similarity index 100% rename from patches/server/0964-Fix-beehives-generating-from-using-bonemeal.patch rename to patches/unapplied/server/0964-Fix-beehives-generating-from-using-bonemeal.patch diff --git a/patches/server/0965-Fix-api-checking-banned-ips.patch b/patches/unapplied/server/0965-Fix-api-checking-banned-ips.patch similarity index 100% rename from patches/server/0965-Fix-api-checking-banned-ips.patch rename to patches/unapplied/server/0965-Fix-api-checking-banned-ips.patch diff --git a/patches/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/unapplied/server/0966-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0967-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0967-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0967-Treat-sequence-violations-like-they-should-be.patch rename to patches/unapplied/server/0967-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0968-remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/0968-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0968-remove-duplicate-animate-packet-for-records.patch rename to patches/unapplied/server/0968-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/unapplied/server/0969-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/unapplied/server/0970-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0971-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0971-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0971-Use-array-for-gamerule-storage.patch rename to patches/unapplied/server/0971-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0972-Fix-block-place-logic.patch b/patches/unapplied/server/0972-Fix-block-place-logic.patch similarity index 100% rename from patches/server/0972-Fix-block-place-logic.patch rename to patches/unapplied/server/0972-Fix-block-place-logic.patch diff --git a/patches/server/0973-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0973-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0973-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/unapplied/server/0973-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/unapplied/server/0974-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0975-Disable-allowListing-before-received-from-client.patch b/patches/unapplied/server/0975-Disable-allowListing-before-received-from-client.patch similarity index 100% rename from patches/server/0975-Disable-allowListing-before-received-from-client.patch rename to patches/unapplied/server/0975-Disable-allowListing-before-received-from-client.patch diff --git a/patches/server/0976-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0976-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0976-Add-Mob-Experience-reward-API.patch rename to patches/unapplied/server/0976-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0977-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0977-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0977-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/unapplied/server/0977-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0978-Fix-DamageCause-for-Falling-Blocks.patch b/patches/unapplied/server/0978-Fix-DamageCause-for-Falling-Blocks.patch similarity index 100% rename from patches/server/0978-Fix-DamageCause-for-Falling-Blocks.patch rename to patches/unapplied/server/0978-Fix-DamageCause-for-Falling-Blocks.patch diff --git a/patches/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/unapplied/server/0979-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0980-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0980-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0980-More-accurate-isInOpenWater-impl.patch rename to patches/unapplied/server/0980-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch b/patches/unapplied/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch similarity index 100% rename from patches/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch rename to patches/unapplied/server/0981-Fix-concurrenct-access-to-lookups-field-in-RegistryO.patch diff --git a/patches/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch b/patches/unapplied/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch similarity index 100% rename from patches/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch rename to patches/unapplied/server/0982-Optimise-recalcBlockCounts-for-empty-sections.patch diff --git a/patches/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch b/patches/unapplied/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch similarity index 100% rename from patches/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch rename to patches/unapplied/server/0983-Fix-destroying-beehive-without-any-players-nearby-th.patch diff --git a/patches/server/0984-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0984-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/server/0984-Expand-PlayerItemMendEvent.patch rename to patches/unapplied/server/0984-Expand-PlayerItemMendEvent.patch diff --git a/patches/server/0985-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0985-Refresh-ProjectileSource-for-projectiles.patch similarity index 100% rename from patches/server/0985-Refresh-ProjectileSource-for-projectiles.patch rename to patches/unapplied/server/0985-Refresh-ProjectileSource-for-projectiles.patch diff --git a/patches/server/0986-Add-transient-modifier-API.patch b/patches/unapplied/server/0986-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0986-Add-transient-modifier-API.patch rename to patches/unapplied/server/0986-Add-transient-modifier-API.patch diff --git a/work/BuildData b/work/BuildData index 4d9436f7b6..2881c6b6dd 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 4d9436f7b66190ad21fe4e3975b73a36b7ad2a7e +Subproject commit 2881c6b6dd146126596342d4025d37a9a84a0b03 diff --git a/work/Bukkit b/work/Bukkit index 5dbedae1cb..3635fe1a77 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 5dbedae1cbbc70791dcfc374c4c8da35db309a44 +Subproject commit 3635fe1a771a768acc67a9ab8b3ea184fc724bae diff --git a/work/CraftBukkit b/work/CraftBukkit index 2270366cdd..e1188ed3a2 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2270366cdd98ff02eaa62212b7881084feadd764 +Subproject commit e1188ed3a2f295cba417e59645ca22c97b4587a4 diff --git a/work/Spigot b/work/Spigot index 7d7b241e35..81b9def3c8 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 7d7b241e353e86ee90ad025dab0262b050a6fe4a +Subproject commit 81b9def3c89c26289118ed0e43ec4df167edd56c