From 7fbb8278e70c1904e09f2144f0e3897468a4906f Mon Sep 17 00:00:00 2001 From: Jake Potrebic Date: Thu, 13 Jun 2024 08:45:43 -0700 Subject: [PATCH] Finish API patches --- README.md | 4 +- gradle.properties | 6 +- .../api/0001-Convert-project-to-Gradle.patch | 4 +- patches/api/0004-Code-Generation.patch | 7 +- patches/api/0006-Adventure.patch | 159 +-- .../0008-Use-ASM-for-event-executors.patch | 2 +- patches/api/0011-Timings-v2.patch | 12 +- ...-option-to-load-extra-plugin-jars-no.patch | 8 +- .../0013-Player-affects-spawning-API.patch | 4 +- patches/api/0014-Add-getTPS-method.patch | 8 +- ...0015-Expose-server-build-information.patch | 12 +- patches/api/0018-Add-view-distance-API.patch | 4 +- .../api/0021-Expose-server-CommandMap.patch | 8 +- ...cord-chat-API-from-spigot-subclasses.patch | 12 +- .../0026-Player-Tab-List-and-Title-APIs.patch | 4 +- .../api/0028-Complete-resource-pack-API.patch | 4 +- ...eload-permissions.yml-and-require-co.patch | 8 +- patches/api/0039-Arrow-pickup-rule-API.patch | 4 +- patches/api/0041-LootTable-API.patch | 6 +- ...4-Allow-Reloading-of-Command-Aliases.patch | 8 +- ...0047-Add-String-based-Action-Bar-API.patch | 6 +- ...rovide-E-TE-Chunk-count-stat-methods.patch | 2 +- ...n-option-to-prevent-player-names-fro.patch | 8 +- patches/api/0056-Fix-upstream-javadocs.patch | 38 +- .../api/0060-Basic-PlayerProfile-API.patch | 8 +- patches/api/0076-AsyncTabCompleteEvent.patch | 2 +- ...nt-protocol-version-and-virtual-host.patch | 4 +- ...1-Ability-to-apply-mending-to-XP-API.patch | 6 +- .../api/0087-Add-ArmorStand-Item-Meta.patch | 4 +- .../0092-Player.setPlayerProfile-API.patch | 20 +- patches/api/0093-getPlayerUniqueId-API.patch | 8 +- ...5-Add-openSign-method-to-HumanEntity.patch | 4 +- ...96-Add-Ban-Methods-to-Player-Objects.patch | 4 +- ...ld.spawnParticle-API-and-add-Builder.patch | 4 +- ...hots-for-Timings-Tile-Entity-reports.patch | 2 +- ...Blocks-to-be-accessed-via-a-long-key.patch | 2 +- patches/api/0141-isChunkGenerated-API.patch | 4 +- ...e-attack-cooldown-methods-for-Player.patch | 4 +- patches/api/0151-Material-API-additions.patch | 6 +- patches/api/0152-Add-Material-Tags.patch | 2 +- ...ault-permission-message-configurable.patch | 8 +- ...-replace-OfflinePlayer-getLastPlayed.patch | 2 +- .../0171-Fix-Spigot-annotation-mistakes.patch | 58 +- patches/api/0174-Add-Heightmap-API.patch | 4 +- .../0176-Add-BlockSoundGroup-interface.patch | 2 +- ...179-Expose-the-internal-current-tick.patch | 8 +- ...180-Improve-Block-breakNaturally-API.patch | 2 +- patches/api/0183-Entity-Jump-API.patch | 2 +- patches/api/0185-Add-tick-times-API.patch | 8 +- ...186-Expose-MinecraftServer-isRunning.patch | 8 +- .../0188-Add-Player-Client-Options-API.patch | 4 +- patches/api/0192-Add-Mob-Goal-API.patch | 8 +- .../0198-Support-components-in-ItemMeta.patch | 10 +- patches/api/0203-Brand-support.patch | 4 +- ...yPickupItemAnimation-to-LivingEntity.patch | 2 +- ...-Add-methods-to-get-translation-keys.patch | 34 +- .../api/0213-Player-elytra-boost-API.patch | 4 +- ...-Add-getOfflinePlayerIfCached-String.patch | 8 +- patches/api/0219-Add-Destroy-Speed-API.patch | 2 +- ...220-Add-LivingEntity-clearActiveItem.patch | 2 +- ...5-Expose-LivingEntity-hurt-direction.patch | 2 +- ...0229-Additional-Block-Material-API-s.patch | 2 +- patches/api/0240-Add-sendOpLevel-API.patch | 4 +- ...gistryAccess-for-managing-registries.patch | 16 +- .../api/0242-Add-StructuresLocateEvent.patch | 4 +- patches/api/0257-Add-Block-isValidTool.patch | 2 +- patches/api/0258-Expand-world-key-API.patch | 8 +- .../api/0259-Improve-Item-Rarity-API.patch | 4 +- patches/api/0275-Add-basic-Datapack-API.patch | 22 +- patches/api/0278-More-Enchantment-API.patch | 6 +- ...2-Improve-item-default-attribute-API.patch | 10 +- .../api/0285-Add-PlayerKickEvent-causes.patch | 4 +- .../0289-Add-more-line-of-sight-methods.patch | 2 +- patches/api/0296-Stinger-API.patch | 2 +- .../api/0298-Add-PlayerSetSpawnEvent.patch | 7 +- .../0309-Get-entity-default-attributes.patch | 4 +- ...sCollision-methods-to-various-places.patch | 8 +- ...llow-delegation-to-vanilla-chunk-gen.patch | 8 +- patches/api/0331-Multi-Block-Change-API.patch | 4 +- .../api/0335-More-PotionEffectType-API.patch | 4 +- ...-command-sender-which-forwards-feedb.patch | 8 +- .../api/0337-Implement-regenerateChunk.patch | 2 +- patches/api/0338-Add-GameEvent-tags.patch | 4 +- patches/api/0342-Custom-Potion-Mixes.patch | 8 +- patches/api/0344-More-Projectile-API.patch | 6 +- .../api/0345-Add-getComputedBiome-API.patch | 2 +- ...Add-method-isTickingWorlds-to-Bukkit.patch | 12 +- patches/api/0359-More-Teleport-API.patch | 4 +- ...stom-Chat-Completion-Suggestions-API.patch | 4 +- patches/api/0363-Block-Ticking-API.patch | 2 +- .../0371-Elder-Guardian-appearance-API.patch | 4 +- ...-swingHand-EquipmentSlot-convenience.patch | 2 +- .../api/0375-Add-entity-knockback-API.patch | 2 +- .../0379-Add-Player-Warden-Warning-API.patch | 4 +- patches/api/0384-Friction-API.patch | 2 +- .../0389-Add-Sneaking-API-for-Entities.patch | 6 +- patches/api/0391-Flying-Fall-Damage-API.patch | 4 +- patches/api/0393-Win-Screen-API.patch | 4 +- .../api/0394-Add-Entity-Body-Yaw-API.patch | 2 +- patches/api/0398-Add-Shearable-API.patch | 6 +- ...the-experimental-smithing-inventory-.patch | 4 +- ...-to-remove-all-active-potion-effects.patch | 2 +- ...Folia-scheduler-and-owned-region-API.patch | 8 +- ...06-Add-event-for-player-editing-sign.patch | 5 +- patches/api/0408-Fix-BanList-API.patch | 10 +- ...-API-for-updating-recipes-on-clients.patch | 16 +- ...place-methods-with-old-StructureType.patch | 14 +- .../api/0416-Add-Listing-API-for-Player.patch | 4 +- .../0426-Add-OfflinePlayer-isConnected.patch | 2 +- .../0430-Add-player-idle-duration-API.patch | 4 +- .../api/0437-Add-Structure-check-API.patch | 2 +- ...add-missing-Experimental-annotations.patch | 998 +----------------- patches/api/0440-Improve-Registry.patch | 14 +- .../api/0441-Add-experience-points-API.patch | 4 +- .../api/0442-Add-missing-InventoryType.patch | 4 +- .../api/0444-Add-HiddenPotionEffect-API.patch | 2 +- patches/api/0456-improve-BanList-types.patch | 8 +- patches/api/0463-Item-Mutation-Fixes.patch | 4 +- .../0464-API-for-checking-sent-chunks.patch | 4 +- ...472-Expose-hasColor-to-leather-armor.patch | 2 +- ...-Add-missing-wind-charge-damage-type.patch | 6 +- ...d-API-to-get-player-ha-proxy-address.patch | 4 +- ...478-Fix-equipment-slot-and-group-API.patch | 4 +- .../server/0001-Setup-Gradle-project.patch | 0 .../server/0002-Remap-fixes.patch | 0 .../server/0003-Build-system-changes.patch | 0 .../server/0004-Test-changes.patch | 0 .../server/0005-Paper-config-files.patch | 0 .../server/0006-MC-Dev-fixes.patch | 2 +- .../server/0007-ConcurrentUtil.patch | 0 .../server/0008-CB-fixes.patch | 0 .../server/0009-MC-Utils.patch | 0 .../server/0010-Adventure.patch | 0 ...oleAppender-for-console-improvements.patch | 0 ...n-prefixes-using-Log4J-configuration.patch | 2 +- ...e-Log4J-Configuration-Plugin-Loggers.patch | 0 ...r-to-keep-logging-IO-off-main-thread.patch | 2 +- ...ktraces-in-log-messages-crash-report.patch | 2 +- ...s-to-contain-the-source-jars-in-stac.patch | 0 .../server/0017-Paper-command.patch | 0 .../server/0018-Paper-Metrics.patch | 0 .../server/0019-Paper-Plugins.patch | 0 .../server/0020-Plugin-remapping.patch | 0 .../0021-Hook-into-CB-plugin-rewrites.patch | 0 ...ion-calls-in-plugins-using-internals.patch | 0 .../server/0023-Timings-v2.patch | 0 .../server/0024-Add-TickThread.patch | 0 ...025-Further-improve-server-tick-loop.patch | 0 ...-option-to-load-extra-plugin-jars-no.patch | 0 .../0027-Support-components-in-ItemMeta.patch | 0 ...cactus-bamboo-and-reed-growth-height.patch | 0 ...figurable-baby-zombie-movement-speed.patch | 0 ...030-Configurable-fishing-time-ranges.patch | 2 +- .../0031-Allow-nerfed-mobs-to-jump.patch | 2 +- ...onfigurable-entity-despawn-distances.patch | 2 +- ...ck-and-tnt-entities-at-the-specified.patch | 0 ...0034-Expose-server-build-information.patch | 2 +- .../0035-Player-affects-spawning-API.patch | 0 ...036-Only-refresh-abilities-if-needed.patch | 2 +- .../server/0037-Entity-Origin-API.patch | 0 ...vent-block-entity-and-entity-crashes.patch | 2 +- ...nfigurable-top-of-nether-void-damage.patch | 0 ...e-before-converting-and-renaming-pla.patch | 0 ...ties-to-activation-range-ignore-list.patch | 0 .../0042-Configurable-end-credits.patch | 0 ...-explosions-processing-dead-entities.patch | 0 .../server/0044-Optimize-explosions.patch | 2 +- .../0045-Disable-explosion-knockback.patch | 0 .../server/0046-Disable-thunder.patch | 0 .../server/0047-Disable-ice-and-snow.patch | 0 ...8-Configurable-mob-spawner-tick-rate.patch | 0 ...49-Implement-PlayerLocaleChangeEvent.patch | 0 .../server/0050-Add-BeaconEffectEvent.patch | 0 ...figurable-container-update-tick-rate.patch | 0 .../0052-Use-UserCache-for-player-heads.patch | 2 +- .../0053-Disable-spigot-tick-limiters.patch | 0 .../0054-Add-PlayerInitialSpawnEvent.patch | 0 ...urable-Disabling-Cat-Chest-Detection.patch | 0 ...056-Improve-Player-chat-API-handling.patch | 0 ...chunks-are-slime-spawn-chunks-toggle.patch | 0 .../0058-Expose-server-CommandMap.patch | 0 ...e-informative-in-maxHealth-exception.patch | 0 .../0060-Player-Tab-List-and-Title-APIs.patch | 2 +- ...dd-configurable-portal-search-radius.patch | 0 .../server/0062-Add-velocity-warnings.patch | 0 ...ble-inter-world-teleportation-safety.patch | 2 +- .../0064-Add-exception-reporting-event.patch | 0 ...oreboards-for-non-players-by-default.patch | 2 +- ...working-with-arrows-stuck-in-living-.patch | 0 .../server/0067-Chunk-Save-Reattempt.patch | 0 .../0068-Complete-resource-pack-API.patch | 2 +- ...ading-permissions.yml-before-plugins.patch | 0 ...llow-Reloading-of-Custom-Permissions.patch | 0 .../0071-Remove-Metadata-on-reload.patch | 0 ...072-Handle-Item-Meta-Inconsistencies.patch | 0 ...urable-Non-Player-Arrow-Despawn-Rate.patch | 0 .../server/0074-Add-World-Util-Methods.patch | 0 ...5-Custom-replacement-for-eaten-items.patch | 0 ...th-absorb-values-and-repair-bad-data.patch | 2 +- ...077-Use-a-Shared-Random-for-Entities.patch | 0 ...le-spawn-chances-for-skeleton-horses.patch | 0 ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch | 2 +- ...Entity-AddTo-RemoveFrom-World-Events.patch | 0 ...81-Configurable-Chunk-Inhabited-Time.patch | 0 .../server/0082-EntityPathfindEvent.patch | 0 ...egionFileCache-and-make-configurable.patch | 0 ...4-Do-not-load-chunks-for-Pathfinding.patch | 0 ...0085-Add-PlayerUseUnknownEntityEvent.patch | 0 ...gurable-random-tick-rates-for-blocks.patch | 0 ...g-BlockPlaceEvent-triggering-physics.patch | 0 .../server/0088-Optimize-DataBits.patch | 0 ...nilla-per-world-scoreboard-coloring-.patch | 0 .../0090-Configurable-Player-Collision.patch | 2 +- ...ent-to-allow-plugins-to-handle-clien.patch | 0 .../0092-Configurable-RCON-IP-address.patch | 0 ...ityRegainHealthEvent-isFastRegen-API.patch | 2 +- ...-to-configure-frosted_ice-properties.patch | 0 ...-possibility-for-getServer-singleton.patch | 2 +- ...y-scoreboard-teams-to-scoreboard.dat.patch | 0 ...able-API-and-replenishable-lootables.patch | 0 ...tem-property-for-disabling-watchdoge.patch | 0 .../0099-Async-GameProfileCache-saving.patch | 4 +- ...0-Optional-TNT-doesn-t-move-in-water.patch | 0 ...r-redstone-torch-rapid-clock-removal.patch | 0 .../0102-Add-server-name-parameter.patch | 2 +- .../0103-Fix-global-sound-handling.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 | 2 +- ...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 | 2 +- .../0115-Add-ProjectileCollideEvent.patch | 0 ...vent-Pathfinding-out-of-World-Border.patch | 0 ...ize-Level.hasChunkAt-BlockPosition-Z.patch | 0 ...-Bound-Treasure-Maps-to-World-Border.patch | 0 ...figurable-Cartographer-Treasure-Maps.patch | 0 ...-to-control-if-armor-stands-can-move.patch | 0 .../0121-String-based-Action-Bar-API.patch | 2 +- ...22-Properly-fix-item-duplication-bug.patch | 0 .../server/0123-Firework-API-s.patch | 2 +- .../0124-PlayerTeleportEndGatewayEvent.patch | 0 ...rovide-E-TE-Chunk-count-stat-methods.patch | 2 +- .../0126-Enforce-Sync-Player-Saves.patch | 0 ...PI-for-Reason-Source-Triggering-play.patch | 4 +- .../server/0128-Cap-Entity-Collisions.patch | 0 ...e-CraftScheduler-Async-Task-Debugger.patch | 0 ...le-async-calls-to-restart-the-server.patch | 2 +- ...ke-parrots-stay-on-shoulders-despite.patch | 0 ...n-option-to-prevent-player-names-fro.patch | 0 ...urable-option-to-disable-creeper-lin.patch | 0 .../server/0134-Item-canEntityPickup.patch | 2 +- ...PlayerPickupItemEvent-setFlyAtPlayer.patch | 0 .../0136-PlayerAttemptPickupItemEvent.patch | 0 ...-profile-lookups-to-worldgen-threads.patch | 2 +- .../server/0138-Basic-PlayerProfile-API.patch | 0 .../server/0139-Add-UnknownCommandEvent.patch | 0 .../0140-Shoulder-Entities-Release-API.patch | 0 .../server/0141-Profile-Lookup-Events.patch | 0 ...player-logins-during-server-shutdown.patch | 0 .../server/0143-Entity-fromMobSpawner.patch | 0 ...44-Improve-the-Saddle-API-for-Horses.patch | 0 .../0145-ensureServerConversions-API.patch | 0 .../0146-Implement-getI18NDisplayName.patch | 0 .../0147-ProfileWhitelistVerifyEvent.patch | 0 .../0148-Fix-this-stupid-bullshit.patch | 0 .../server/0149-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 .../server/0153-Add-PlayerJumpEvent.patch | 0 ...dle-ServerboundKeepAlivePacket-async.patch | 0 ...nt-protocol-version-and-virtual-host.patch | 2 +- ...rt-serverside-behavior-of-keepalives.patch | 0 ...dEffects-only-to-players-who-can-see.patch | 0 .../0158-Add-PlayerArmorChangeEvent.patch | 0 ...rom-being-processed-when-the-player-.patch | 0 ...117075-Block-entity-unload-lag-spike.patch | 0 ...e-implementations-for-captured-block.patch | 0 ...-get-a-BlockState-without-a-snapshot.patch | 4 +- .../server/0163-AsyncTabCompleteEvent.patch | 0 .../0164-PlayerPickupExperienceEvent.patch | 2 +- ...5-Ability-to-apply-mending-to-XP-API.patch | 2 +- ...6-PlayerNaturallySpawnCreaturesEvent.patch | 2 +- ...-Add-setPlayerProfile-API-for-Skulls.patch | 0 .../server/0168-PreCreatureSpawnEvent.patch | 0 .../0169-Fill-Profile-Property-Events.patch | 0 ...PlayerAdvancementCriterionGrantEvent.patch | 0 .../0171-Add-ArmorStand-Item-Meta.patch | 0 ...-Extend-Player-Interact-cancellation.patch | 0 .../0173-Tameable-getOwnerUniqueId-API.patch | 0 .../server/0174-Toggleable-player-crits.patch | 0 ...le-Explicit-Network-Manager-Flushing.patch | 0 ...nt-extended-PaperServerListPingEvent.patch | 2 +- ...dd-more-fields-to-AsyncPreLoginEvent.patch | 0 .../0178-Player.setPlayerProfile-API.patch | 0 .../server/0179-getPlayerUniqueId-API.patch | 0 .../0180-Improved-Async-Task-Scheduler.patch | 0 ...ke-legacy-ping-handler-more-reliable.patch | 0 ...ServerListPingEvent-for-legacy-pings.patch | 0 ...83-Flag-to-disable-the-channel-limit.patch | 2 +- ...4-Add-openSign-method-to-HumanEntity.patch | 0 ...urable-sprint-interruption-on-attack.patch | 0 .../server/0186-EndermanEscapeEvent.patch | 0 .../0187-Enderman.teleportRandomly.patch | 0 ...0188-Block-Enderpearl-Travel-Exploit.patch | 0 ...ld.spawnParticle-API-and-add-Builder.patch | 0 ...-allowed-colored-signs-to-be-created.patch | 0 .../0191-EndermanAttackPlayerEvent.patch | 0 .../server/0192-WitchConsumePotionEvent.patch | 0 .../server/0193-WitchThrowPotionEvent.patch | 0 .../server/0194-WitchReadyPotionEvent.patch | 0 ...0195-ItemStack-getMaxItemUseDuration.patch | 2 +- ...96-Add-EntityTeleportEndGatewayEvent.patch | 0 ...ed-flag-on-cancel-of-Explosion-Event.patch | 0 .../0198-Fix-CraftEntity-hashCode.patch | 0 ...9-Configurable-LootPool-luck-formula.patch | 0 ...ils-when-failing-to-save-player-data.patch | 0 ...e-shield-blocking-delay-configurable.patch | 0 .../0202-Improve-EntityShootBowEvent.patch | 0 .../server/0203-PlayerReadyArrowEvent.patch | 0 .../0204-Add-entity-knockback-events.patch | 0 .../server/0205-Expand-Explosions-API.patch | 0 .../0206-LivingEntity-Active-Item-API.patch | 0 .../server/0207-RangedEntity-API.patch | 0 ...to-disable-ender-dragon-legacy-check.patch | 0 ...9-Implement-World.getEntity-UUID-API.patch | 0 .../0210-InventoryCloseEvent-Reason-API.patch | 6 +- .../server/0211-Vex-get-setSummoner-API.patch | 0 ...nventory-when-cancelling-PlayerInter.patch | 0 ...-more-information-to-Entity.toString.patch | 2 +- .../server/0214-EnderDragon-Events.patch | 0 .../server/0215-PlayerElytraBoostEvent.patch | 0 .../0216-PlayerLaunchProjectileEvent.patch | 0 .../0217-Improve-BlockPosition-inlining.patch | 0 ...t-armor-stands-from-doing-entity-loo.patch | 0 ...9-Vanished-players-don-t-have-rights.patch | 2 +- ...-Allow-disabling-armor-stand-ticking.patch | 0 .../server/0221-SkeletonHorse-Additions.patch | 0 .../server/0222-Expand-ArmorStand-API.patch | 0 .../server/0223-AnvilDamageEvent.patch | 0 .../server/0224-Add-TNTPrimeEvent.patch | 0 ...nd-make-tab-spam-limits-configurable.patch | 0 .../server/0226-Fix-NBT-type-issues.patch | 2 +- ...Remove-unnecessary-itemmeta-handling.patch | 2 +- ...ies-option-to-debug-dupe-uuid-issues.patch | 2 +- ...dd-Early-Warning-Feature-to-WatchDog.patch | 2 +- ...30-Use-ConcurrentHashMap-in-JsonList.patch | 0 ...31-Use-a-Queue-for-Queueing-Commands.patch | 2 +- ...lock-entities-from-a-chunk-without-s.patch | 0 ...ptimize-BlockPosition-helper-methods.patch | 0 ...default-mob-spawn-range-and-water-an.patch | 2 +- .../server/0235-Slime-Pathfinder-Events.patch | 0 ...le-speed-for-water-flowing-over-lava.patch | 0 ...237-Optimize-CraftBlockData-Creation.patch | 0 .../server/0238-Optimize-MappedRegistry.patch | 0 .../0239-Add-PhantomPreSpawnEvent.patch | 0 .../server/0240-Add-More-Creeper-API.patch | 0 .../0241-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/0245-Improve-death-events.patch | 8 +- ...ow-chests-to-be-placed-with-NBT-data.patch | 2 +- .../server/0247-Mob-Pathfinding-API.patch | 0 ...interactions-from-causing-chunk-load.patch | 0 ...wning-from-loading-generating-chunks.patch | 0 ...nt-furnace-cook-speed-multiplier-API.patch | 0 .../0251-Honor-EntityAgeable.ageLock.patch | 0 ...ble-connection-throttle-kick-message.patch | 0 ...ent-chunk-loading-from-Fluid-Flowing.patch | 0 .../server/0254-PreSpawnerSpawnEvent.patch | 0 ...255-Add-LivingEntity-getTargetEntity.patch | 0 .../server/0256-Add-sun-related-API.patch | 0 ...ParseException-in-block-entity-names.patch | 0 .../server/0258-Turtle-API.patch | 0 ...tator-target-events-and-improve-impl.patch | 0 .../server/0260-Add-more-Witch-API.patch | 0 ...owned-for-Villager-Aggression-Config.patch | 0 ...event-players-from-moving-into-unloa.patch | 0 ...63-Reset-players-airTicks-on-respawn.patch | 0 ...-after-profile-lookups-if-not-needed.patch | 0 ...er-Thread-Pool-and-Thread-Priorities.patch | 2 +- .../0266-Optimize-World-Time-Updates.patch | 2 +- ...store-custom-InventoryHolder-support.patch | 0 .../0268-Fix-SpongeAbsortEvent-handling.patch | 0 ...t-allow-digging-into-unloaded-chunks.patch | 2 +- ...ault-permission-message-configurable.patch | 2 +- ...entity-dismount-during-teleportation.patch | 0 .../server/0272-Add-more-Zombie-API.patch | 0 .../server/0273-Book-Size-Limits.patch | 0 .../0274-Add-PlayerConnectionCloseEvent.patch | 0 ...-Replace-OfflinePlayer-getLastPlayed.patch | 4 +- ...vehicle-tracking-issue-on-disconnect.patch | 2 +- ...r-remove-if-the-handle-is-a-custom-p.patch | 2 +- .../server/0278-BlockDestroyEvent.patch | 0 .../0279-Async-command-map-building.patch | 2 +- .../server/0280-Brigadier-Mojang-API.patch | 0 ...rove-exact-choice-recipe-ingredients.patch | 0 .../0282-Limit-Client-Sign-length-more.patch | 0 ...oggleEvent-when-whitelist-is-toggled.patch | 0 .../0284-Entity-getEntitySpawnReason.patch | 2 +- .../server/0285-Fire-event-on-GS4-query.patch | 0 .../0286-Add-PlayerPostRespawnEvent.patch | 0 ...-for-pickupDelay-breaks-picking-up-i.patch | 0 .../server/0288-Server-Tick-Events.patch | 2 +- ...0289-PlayerDeathEvent-getItemsToKeep.patch | 2 +- ...Optimize-Captured-BlockEntity-Lookup.patch | 0 .../server/0291-Add-Heightmap-API.patch | 2 +- .../0292-Mob-Spawner-API-Enhancements.patch | 0 ...l-to-changed-postToMainThread-method.patch | 0 ...n-item-frames-are-modified-MC-123450.patch | 0 .../0295-Implement-CraftBlockSoundGroup.patch | 0 ...296-Expose-the-internal-current-tick.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 .../0300-offset-item-frame-ticking.patch | 0 ...revent-consuming-the-wrong-itemstack.patch | 0 ...02-Dont-send-unnecessary-sign-update.patch | 0 ...d-option-to-disable-pillager-patrols.patch | 0 ...nk-loads-when-villagers-try-to-find-.patch | 0 ...5656-Fix-Follow-Range-Initial-Target.patch | 0 .../0306-Duplicate-UUID-Resolve-Option.patch | 0 ...layerDeathEvent-shouldDropExperience.patch | 2 +- ...oading-chunks-checking-hive-position.patch | 0 ...Chunks-from-Hoppers-and-other-things.patch | 0 ...ptimise-EntityGetter-getPlayerByUUID.patch | 0 ...0311-Fix-items-not-falling-correctly.patch | 0 ...mize-call-to-getFluid-for-explosions.patch | 2 +- ...rializing-mismatching-chunk-coordina.patch | 0 .../0314-Alternative-item-despawn-rate.patch | 0 .../0315-Tracking-Range-Improvements.patch | 0 ...get-gravity-in-void.-Fixes-MC-167279.patch | 0 ...317-Improve-Block-breakNaturally-API.patch | 0 ...e-getChunkAt-calls-for-loaded-chunks.patch | 2 +- .../0319-Add-debug-for-sync-chunk-loads.patch | 4 +- .../0320-Improve-java-version-check.patch | 2 +- .../server/0321-Add-ThrownEggHatchEvent.patch | 0 .../server/0322-Entity-Jump-API.patch | 0 ...n-to-nerf-pigmen-from-nether-portals.patch | 2 +- .../0324-Make-the-GUI-graph-fancier.patch | 0 ...325-add-hand-to-BlockMultiPlaceEvent.patch | 2 +- ...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/0329-Optimise-Chunk-getFluid.patch | 0 ...erbose-world-setting-to-false-by-def.patch | 2 +- ...-Add-tick-times-API-and-mspt-command.patch | 0 ...332-Expose-MinecraftServer-isRunning.patch | 0 ...Add-Raw-Byte-ItemStack-Serialization.patch | 0 ...spawn-settings-and-per-player-option.patch | 2 +- ...nnections-shouldn-t-hold-up-shutdown.patch | 2 +- ...low-bees-to-load-chunks-for-beehives.patch | 0 ...-PlayerChunkMap-adds-crashing-server.patch | 0 .../server/0338-Don-t-tick-dead-players.patch | 2 +- ...d-Player-s-shouldn-t-be-able-to-move.patch | 2 +- ...move-existing-players-to-world-spawn.patch | 2 +- .../server/0341-Optimize-Pathfinding.patch | 0 ...42-Reduce-Either-Optional-allocation.patch | 0 ...duce-memory-footprint-of-CompoundTag.patch | 0 ...vent-opening-inventories-when-frozen.patch | 2 +- ...-entity-collision-code-if-not-needed.patch | 0 ...-Implement-Player-Client-Options-API.patch | 4 +- ...layer-is-attempted-to-be-removed-fro.patch | 0 ...nEvent-when-Player-is-actually-ready.patch | 2 +- ...pawn-point-if-spawn-in-unloaded-worl.patch | 2 +- ...PlayerAttackEntityCooldownResetEvent.patch | 0 ...t-fire-BlockFade-on-worldgen-threads.patch | 0 ...ntom-creative-and-insomniac-controls.patch | 0 ...item-duplication-and-teleport-issues.patch | 6 +- .../server/0354-Villager-Restocks-API.patch | 0 ...PickItem-Packet-and-kick-for-invalid.patch | 0 ...-per-thread-native-byte-buffer-cache.patch | 2 +- .../server/0357-misc-debugging-dumps.patch | 0 ...58-Prevent-teleporting-dead-entities.patch | 0 .../server/0359-Implement-Mob-Goal-API.patch | 0 .../0360-Add-villager-reputation-API.patch | 0 ...ceOrb-merging-stacking-API-and-fixes.patch | 2 +- ...2-Fix-PotionEffect-ignores-icon-flag.patch | 0 .../server/0363-Potential-bed-API.patch | 0 ...Wait-for-Async-Tasks-during-shutdown.patch | 0 ...der-respects-game-and-entity-rules-f.patch | 0 .../0366-Ensure-safe-gateway-teleport.patch | 0 ...n-for-console-having-all-permissions.patch | 0 ...ix-villager-trading-demand-MC-163962.patch | 0 .../0369-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 ...ssing-chunks-due-to-integer-overflow.patch | 0 ...t-position-desync-causing-tp-exploit.patch | 0 ...Holder-method-without-block-snapshot.patch | 0 .../0376-Add-PlayerRecipeBookClickEvent.patch | 0 ...7-Hide-sync-chunk-writes-behind-flag.patch | 0 ...78-Add-permission-for-command-blocks.patch | 0 ...-position-and-AABB-are-never-invalid.patch | 2 +- ...ld-Difficulty-Remembering-Difficulty.patch | 2 +- .../server/0381-Paper-dumpitem-command.patch | 2 +- ...-Legacy-Component-serialization-size.patch | 0 ...-Plugin-Tickets-to-API-Chunk-Methods.patch | 0 ...4-Add-BlockStateMeta-clearBlockState.patch | 0 ...nvert-legacy-attributes-in-Item-Meta.patch | 0 ...o-not-accept-invalid-client-settings.patch | 0 ...ve-fix-EntityTargetLivingEntityEvent.patch | 0 .../server/0388-Add-entity-liquid-API.patch | 0 .../server/0389-Add-PrepareResultEvent.patch | 2 +- ...k-for-portal-on-world-gen-entity-add.patch | 0 ...ix-arrows-never-despawning-MC-125757.patch | 2 +- ...-Vanilla-Command-permission-checking.patch | 0 .../server/0393-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 ...ze-NetworkManager-Exception-Handling.patch | 0 ...Fix-some-rails-connecting-improperly.patch | 0 ...istake-in-CB-NBT-int-deserialization.patch | 0 .../server/0400-Brand-support.patch | 0 ...yPickupItemAnimation-to-LivingEntity.patch | 0 .../0402-Don-t-require-FACING-data.patch | 0 ...geEvent-not-firing-for-all-use-cases.patch | 2 +- .../server/0404-Add-moon-phase-API.patch | 0 ...erver-load-chunks-from-newer-version.patch | 0 ...-headless-pistons-from-being-created.patch | 2 +- .../server/0407-Add-BellRingEvent.patch | 2 +- ...Add-zombie-targets-turtle-egg-config.patch | 0 .../server/0409-Buffer-joins-to-world.patch | 0 ...rs-not-working-in-some-kick-messages.patch | 0 ...CreateEvent-needs-to-know-its-entity.patch | 2 +- .../server/0412-Add-more-Evoker-API.patch | 0 ...-Add-methods-to-get-translation-keys.patch | 0 ...ate-HoverEvent-from-ItemStack-Entity.patch | 0 .../0415-Cache-block-data-strings.patch | 2 +- ...ortation-and-cancel-velocity-if-tele.patch | 2 +- ...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/0422-Entity-isTicking.patch | 2 +- ...-non-whitelisted-player-when-white-l.patch | 2 +- ...x-Concurrency-issue-in-ShufflingList.patch | 0 ...Reset-Ender-Crystals-on-Dragon-Spawn.patch | 0 ...r-large-move-vectors-crashing-server.patch | 0 .../server/0427-Optimise-getType-calls.patch | 0 .../server/0428-Villager-resetOffers.patch | 0 ...ace-order-when-capturing-blockstates.patch | 0 ...tem-locations-dropped-from-campfires.patch | 0 ...31-Fix-bell-block-entity-memory-leak.patch | 0 ...ling-up-when-item-stack-is-empty-in-.patch | 2 +- ...-Add-getOfflinePlayerIfCached-String.patch | 0 .../0434-Add-ignore-discounts-API.patch | 0 ...-Toggle-for-removing-existing-dragon.patch | 0 ...ix-client-lag-on-advancement-loading.patch | 0 .../0437-Item-no-age-no-player-pickup.patch | 0 ...0438-Beacon-API-custom-effect-ranges.patch | 0 .../server/0439-Add-API-for-quit-reason.patch | 0 ...ing-Trader-spawn-rate-config-options.patch | 0 .../0441-Expose-world-spawn-angle.patch | 0 .../server/0442-Add-Destroy-Speed-API.patch | 0 ...r-spawnParticle-x-y-z-precision-loss.patch | 0 ...444-Add-LivingEntity-clearActiveItem.patch | 0 .../0445-Add-PlayerItemCooldownEvent.patch | 0 ...prove-performance-of-the-end-generat.patch | 0 .../server/0447-More-lightning-API.patch | 0 ...-should-not-bypass-cramming-gamerule.patch | 0 ...d-missing-default-perms-for-commands.patch | 0 .../0450-Add-PlayerShearBlockEvent.patch | 0 .../server/0451-Limit-recipe-packets.patch | 0 ...x-CraftSound-backwards-compatibility.patch | 0 ...0453-Player-Chunk-Load-Unload-Events.patch | 0 ...54-Optimize-Dynamic-get-Missing-Keys.patch | 0 ...5-Expose-LivingEntity-hurt-direction.patch | 2 +- ...-OBSTRUCTED-reason-to-BedEnterResult.patch | 2 +- ...nvalid-ingredient-lists-in-VillagerA.patch | 0 .../server/0458-Add-TargetHitEvent.patch | 0 .../0459-MC-4-Fix-item-position-desync.patch | 2 +- .../0460-Additional-Block-Material-API.patch | 0 .../server/0461-Fix-harming-potion-dupe.patch | 0 ...et-Material-from-Boats-and-Minecarts.patch | 0 ...mob-spawner-spawn-egg-transformation.patch | 0 ...Fix-Not-a-string-Map-Conversion-spam.patch | 0 ...5-Add-PlayerFlowerPotManipulateEvent.patch | 0 ...act-event-not-being-called-sometimes.patch | 0 .../0467-Zombie-API-breaking-doors.patch | 0 ...0468-Fix-nerfed-slime-when-splitting.patch | 0 .../0469-Add-EntityLoadCrossbowEvent.patch | 0 .../0470-Add-WorldGameRuleChangeEvent.patch | 0 ...471-Add-ServerResourcesReloadedEvent.patch | 2 +- ...ld-settings-for-mobs-picking-up-loot.patch | 0 .../0473-Add-BlockFailedDispenseEvent.patch | 0 ...474-Add-PlayerLecternPageChangeEvent.patch | 0 ...475-Add-PlayerLoomPatternSelectEvent.patch | 0 ...onfigurable-door-breaking-difficulty.patch | 0 ...pty-commands-shall-not-be-dispatched.patch | 0 .../server/0478-Remove-stale-POIs.patch | 0 .../0479-Fix-villager-boat-exploit.patch | 0 .../server/0480-Add-sendOpLevel-API.patch | 2 +- ...gistryAccess-for-managing-Registries.patch | 0 .../0482-Add-StructuresLocateEvent.patch | 0 ...n-for-requiring-a-player-participant.patch | 2 +- ...ileHitEvent-call-when-fireballs-dead.patch | 0 ...onent-with-empty-text-instead-of-thr.patch | 0 ...0486-Make-schedule-command-per-world.patch | 0 ...0487-Configurable-max-leash-distance.patch | 0 .../0488-Add-BlockPreDispenseEvent.patch | 0 ...89-Add-PlayerChangeBeaconEffectEvent.patch | 0 ...le-for-always-placing-the-dragon-egg.patch | 0 ...d-PlayerStonecutterRecipeSelectEvent.patch | 0 .../0492-Expand-EntityUnleashEvent.patch | 4 +- ...-shield-blocking-on-dimension-change.patch | 0 .../server/0494-Add-DragonEggFormEvent.patch | 0 .../server/0495-Add-EntityMoveEvent.patch | 2 +- ...disable-pathfinding-updates-on-block.patch | 0 .../0497-Inline-shift-direction-fields.patch | 0 ...w-adding-items-to-BlockDropItemEvent.patch | 2 +- ...ainThreadExecutor-to-BukkitScheduler.patch | 0 ...-entity-allow-attribute-registration.patch | 2 +- ...fix-dead-slime-setSize-invincibility.patch | 0 ...ipes-should-return-an-immutable-list.patch | 0 .../server/0503-Expose-Tracked-Players.patch | 0 .../server/0504-Improve-ServerGUI.patch | 0 ...0505-fix-converting-txt-to-json-file.patch | 2 +- .../server/0506-Add-worldborder-events.patch | 0 .../0507-Add-PlayerNameEntityEvent.patch | 0 .../0508-Add-recipe-to-cook-events.patch | 0 .../server/0509-Add-Block-isValidTool.patch | 0 ...-using-signs-inside-spawn-protection.patch | 0 .../server/0511-Expand-world-key-API.patch | 0 ...lternative-constructor-for-Rotations.patch | 0 ...ed-item-when-player-has-disconnected.patch | 0 ...telist-use-configurable-kick-message.patch | 2 +- ...ignore-result-of-PlayerEditBookEvent.patch | 0 .../server/0516-Expose-protocol-version.patch | 0 ...tab-completions-for-brigadier-comman.patch | 2 +- ...ItemConsumeEvent-cancelling-properly.patch | 0 .../server/0519-Add-bypass-host-check.patch | 0 .../0520-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 .../0526-Add-PlayerDeepSleepEvent.patch | 2 +- .../server/0527-More-World-API.patch | 0 .../0528-Add-PlayerBedFailEnterEvent.patch | 0 ...s-to-convert-between-Component-and-B.patch | 2 +- ...pawnEvent-fix-passed-parameter-issue.patch | 0 ...eacon-activation-deactivation-events.patch | 0 ...Add-Channel-initialization-listeners.patch | 0 ...mmands-if-tab-completion-is-disabled.patch | 0 .../0534-Add-more-WanderingTrader-API.patch | 0 ...Add-EntityBlockStorage-clearEntities.patch | 0 ...essage-to-PlayerAdvancementDoneEvent.patch | 0 .../0537-Add-HiddenPotionEffect-API.patch | 0 .../server/0538-Inventory-close.patch | 0 ...n-in-sunlight-API-for-Phantoms-and-S.patch | 0 .../server/0540-Add-basic-Datapack-API.patch | 0 ...nment-variable-to-disable-server-gui.patch | 0 ...542-Expand-PlayerGameModeChangeEvent.patch | 2 +- .../0543-ItemStack-repair-check-API.patch | 0 .../server/0544-More-Enchantment-API.patch | 0 ...ove-range-check-for-block-placing-up.patch | 0 .../server/0546-Add-Mob-lookAt-API.patch | 0 ...if-bucket-dispenses-will-succeed-for.patch | 0 .../0548-Add-Unix-domain-socket-support.patch | 2 +- .../0549-Add-EntityInsideBlockEvent.patch | 0 ...0-Improve-item-default-attribute-API.patch | 0 ...cause-to-Weather-ThunderChangeEvents.patch | 0 .../server/0552-More-Lidded-Block-API.patch | 0 ...553-Limit-item-frame-cursors-on-maps.patch | 0 .../0554-Add-PlayerKickEvent-causes.patch | 4 +- .../0555-Add-PufferFishStateChangeEvent.patch | 0 ...yerBucketEmptyEvent-result-itemstack.patch | 0 ...ttedContainer-instead-of-ThreadingDe.patch | 0 ...n-to-fix-items-merging-through-walls.patch | 0 .../0559-Add-BellRevealRaiderEvent.patch | 0 .../0560-Fix-invulnerable-end-crystals.patch | 0 ...561-Add-ElderGuardianAppearanceEvent.patch | 0 .../0562-Fix-dangerous-end-portal-logic.patch | 2 +- ...e-Biome-Mob-Lookups-for-Mob-Spawning.patch | 0 .../server/0564-Line-Of-Sight-Changes.patch | 0 .../0565-add-per-world-spawn-limits.patch | 2 +- .../0566-Fix-potions-splash-events.patch | 2 +- .../0567-Add-more-LimitedRegion-API.patch | 0 ...PlayerDropItemEvent-using-wrong-item.patch | 2 +- .../server/0569-Missing-Entity-API.patch | 2 +- ...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 .../server/0574-Add-PlayerArmSwingEvent.patch | 0 ...k-event-leave-message-not-being-sent.patch | 0 ...n-t-apply-cramming-damage-to-players.patch | 0 ...nd-timings-for-sensors-and-behaviors.patch | 0 .../0578-Add-missing-forceDrop-toggles.patch | 0 .../server/0579-Stinger-API.patch | 0 .../0580-Add-System.out-err-catcher.patch | 0 ...-AFK-kick-while-watching-end-credits.patch | 0 ...riting-of-comments-to-server.propert.patch | 0 .../server/0583-Add-PlayerSetSpawnEvent.patch | 2 +- ...ers-respect-inventory-max-stack-size.patch | 0 ...mize-entity-tracker-passenger-checks.patch | 0 ...g-option-for-Piglins-guarding-chests.patch | 0 .../0587-Add-EntityDamageItemEvent.patch | 2 +- ...ptimize-indirect-passenger-iteration.patch | 2 +- ...tem-frame-map-cursor-update-interval.patch | 0 ...0590-Clear-bucket-NBT-after-dispense.patch | 0 ...target-without-changing-other-things.patch | 0 .../0592-Add-BlockBreakBlockEvent.patch | 0 ...t-data-components-copy-in-smithing-r.patch | 0 .../server/0594-More-CommandBlock-API.patch | 0 ...d-missing-team-sidebar-display-slots.patch | 0 .../0596-Add-back-EntityPortalExitEvent.patch | 2 +- ...o-find-targets-for-lightning-strikes.patch | 0 .../0598-Get-entity-default-attributes.patch | 0 .../server/0599-Left-handed-API.patch | 0 .../0600-Add-more-advancement-API.patch | 0 ...0601-Add-ItemFactory-getSpawnEgg-API.patch | 0 .../server/0602-Add-critical-damage-API.patch | 0 .../0603-Fix-issues-with-mob-conversion.patch | 0 ...sCollision-methods-to-various-places.patch | 0 .../server/0605-Goat-ram-API.patch | 0 ...Add-API-for-resetting-a-single-score.patch | 0 ...07-Add-Raw-Byte-Entity-Serialization.patch | 0 ...608-Vanilla-command-permission-fixes.patch | 0 ...-logic-for-inventories-on-chunk-unlo.patch | 2 +- ...610-Fix-GameProfileCache-concurrency.patch | 0 ...0611-Improve-and-expand-AsyncCatcher.patch | 0 ...aper-mobcaps-and-paper-playermobcaps.patch | 2 +- ...itize-ResourceLocation-error-logging.patch | 0 ...ally-inline-methods-in-BlockPosition.patch | 0 ...uler-threads-according-to-the-plugin.patch | 0 ...d-getChunkAt-has-inlined-logic-for-l.patch | 0 ...bour-chunk-data-off-disk-when-conver.patch | 0 ...id-state-when-raytracing-skip-air-bl.patch | 0 .../server/0619-Time-scoreboard-search.patch | 0 ...primise-map-impl-for-tracked-players.patch | 0 .../0621-Add-missing-InventoryType.patch | 0 ...timise-BlockSoil-nearby-water-lookup.patch | 0 ...entory-not-closing-on-entity-removal.patch | 0 ...irement-before-suggesting-root-nodes.patch | 0 ...-ServerboundCommandSuggestionPacket-.patch | 0 .../0626-Add-packet-limiter-config.patch | 0 ...rnColor-on-tropical-fish-bucket-meta.patch | 0 .../0628-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 .../0633-Preserve-overstacked-loot.patch | 0 ...date-head-rotation-in-missing-places.patch | 2 +- ...-unintended-light-block-manipulation.patch | 0 .../0636-Fix-CraftCriteria-defaults-map.patch | 0 ...-Fix-upstreams-block-state-factories.patch | 2 +- .../0638-Configurable-feature-seeds.patch | 0 .../0639-Add-root-admin-user-detection.patch | 2 +- ...-t-attempt-to-teleport-dead-entities.patch | 2 +- ...sive-velocity-through-repeated-crits.patch | 0 ...de-code-using-deprecated-for-removal.patch | 0 .../0643-Fix-Spigot-growth-modifiers.patch | 2 +- ...rOpenersCounter-openCount-from-going.patch | 0 .../0645-Add-PlayerItemFrameChangeEvent.patch | 0 .../server/0646-Optimize-HashMapPalette.patch | 0 ...llow-delegation-to-vanilla-chunk-gen.patch | 0 ...t-isSectionEmpty-int-and-optimize-Pa.patch | 0 .../server/0649-Add-more-Campfire-API.patch | 0 ...-data-to-disk-if-it-serializes-witho.patch | 0 ...ward-CraftEntity-in-teleport-command.patch | 2 +- .../0652-Improve-scoreboard-entries.patch | 0 .../0653-Entity-powdered-snow-API.patch | 0 .../0654-Add-API-for-item-entity-health.patch | 0 ...max-block-light-for-monster-spawning.patch | 0 ...-pistons-and-BlockPistonRetractEvent.patch | 0 ...d-canSmelt-methods-to-FurnaceInvento.patch | 0 .../server/0658-Bucketable-API.patch | 0 .../server/0659-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 ...check-for-PersistentDataContainer-ha.patch | 0 ...64-Multiple-Entries-with-Scoreboards.patch | 0 ...0665-Reset-placed-block-on-exception.patch | 0 ...-configurable-height-for-slime-spawn.patch | 0 .../0667-Fix-xp-reward-for-baby-zombies.patch | 0 ...ulti-Block-Change-API-Implementation.patch | 2 +- .../server/0669-Fix-NotePlayEvent.patch | 0 .../server/0670-Freeze-Tick-Lock-API.patch | 0 .../0671-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 | 2 +- .../0675-Implement-regenerateChunk.patch | 2 +- ...elled-powdered-snow-bucket-placement.patch | 2 +- ...date-calls-to-CraftServer-getSpawnLi.patch | 0 .../server/0678-Add-GameEvent-tags.patch | 0 ...sks-fairly-for-worlds-while-waiting-.patch | 2 +- .../server/0680-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 | 2 +- ...o-worldlist-before-initing-the-world.patch | 0 .../0685-Fix-Entity-Position-Desync.patch | 0 .../server/0686-Custom-Potion-Mixes.patch | 0 ...687-Force-close-world-loading-screen.patch | 0 ...0688-Fix-falling-block-spawn-methods.patch | 0 ...-Expose-furnace-minecart-push-values.patch | 0 ...rojectileHitEvent-for-piercing-arrow.patch | 2 +- .../server/0691-More-Projectile-API.patch | 0 ...ix-swamp-hut-cat-generation-deadlock.patch | 0 ...cle-movement-from-players-while-tele.patch | 0 .../0694-Implement-getComputedBiome-API.patch | 2 +- .../0695-Make-some-itemstacks-nonnull.patch | 0 ...0696-Implement-enchantWithLevels-API.patch | 0 .../0697-Fix-saving-in-unloadWorld.patch | 0 .../0698-Buffer-OOB-setBlock-calls.patch | 0 .../0699-Add-TameableDeathMessageEvent.patch | 0 ...lock-data-for-EntityChangeBlockEvent.patch | 2 +- ...ables-running-when-mob-loot-gamerule.patch | 0 ...assenger-world-matches-ridden-entity.patch | 2 +- .../server/0703-cache-resource-keys.patch | 0 ...llow-changing-the-EnderDragon-podium.patch | 0 ...verriding-a-block-entity-during-worl.patch | 0 ...nt-tile-entity-copies-loading-chunks.patch | 0 ...tead-of-display-name-in-PlayerList-g.patch | 0 .../0708-Expand-PlayerItemDamageEvent.patch | 2 +- .../0709-WorldCreator-keepSpawnLoaded.patch | 0 ...E-in-CraftPersistentDataTypeRegistry.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 .../0715-Add-PlayerStopUsingItemEvent.patch | 0 .../server/0716-Don-t-tick-markers.patch | 2 +- .../server/0717-Expand-FallingBlock-API.patch | 0 .../0718-Add-support-for-Proxy-Protocol.patch | 0 ...ix-OfflinePlayer-getBedSpawnLocation.patch | 0 ...ntory-for-smokers-and-blast-furnaces.patch | 0 .../0721-Sanitize-sent-BlockEntity-NBT.patch | 2 +- ...t-selector-resolving-in-books-by-def.patch | 0 ...entity-loading-causing-async-lookups.patch | 2 +- ...n-on-world-create-while-being-ticked.patch | 0 ...725-Dont-resent-entity-on-art-update.patch | 0 .../0726-Add-WardenAngerChangeEvent.patch | 0 ...-strict-advancement-dimension-checks.patch | 0 ...rtant-BlockStateListPopulator-method.patch | 0 .../server/0729-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 .../server/0733-Add-Player-getFishHook.patch | 0 ...-chunk-for-dynamic-game-event-listen.patch | 0 ...us-missing-EntityDropItemEvent-calls.patch | 2 +- .../server/0736-Fix-Bee-flower-NPE.patch | 0 ...g-not-using-commands.spam-exclusions.patch | 0 .../server/0738-More-Teleport-API.patch | 2 +- .../0739-Add-EntityPortalReadyEvent.patch | 2 +- ...-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 | 2 +- ...-Add-and-fix-missing-BlockFadeEvents.patch | 0 .../server/0745-Collision-API.patch | 0 ...and-message-for-brigadier-syntax-exc.patch | 0 .../server/0747-Block-Ticking-API.patch | 0 ...8-Add-Velocity-IP-Forwarding-Support.patch | 2 +- ...0749-Add-NamespacedKey-biome-methods.patch | 0 ...ix-plugin-loggers-on-server-shutdown.patch | 4 +- ...ook-changes-from-crashing-the-server.patch | 0 ...ntityChangeBlockEvent-in-more-places.patch | 0 .../0753-Missing-eating-regain-reason.patch | 0 .../server/0754-Missing-effect-cause.patch | 0 ...-serialization-deserialization-for-P.patch | 0 ...arameter-to-ProjectileSource-launchP.patch | 0 ...57-Call-BlockPhysicsEvent-more-often.patch | 0 .../0758-Configurable-chat-thread-limit.patch | 0 ...-of-WorldCreator-keepSpawnLoaded-ret.patch | 0 .../0760-fix-Jigsaw-block-kicking-user.patch | 0 ...rmEvent-for-mud-converting-into-clay.patch | 0 .../0762-Add-getDrops-to-BlockState.patch | 0 .../0763-Fix-a-bunch-of-vanilla-bugs.patch | 0 ...ry-onTrackingStart-during-navigation.patch | 0 .../0765-Fix-custom-piglin-loved-items.patch | 0 .../0766-EntityPickupItemEvent-fixes.patch | 0 ...-interactions-with-items-on-cooldown.patch | 2 +- ...8-Add-PlayerInventorySlotChangeEvent.patch | 0 .../0769-Elder-Guardian-appearance-API.patch | 0 ...low-changing-bed-s-occupied-property.patch | 0 .../0771-Add-entity-knockback-API.patch | 0 .../server/0772-Detect-headless-JREs.patch | 0 ...y-vehicle-collision-event-not-called.patch | 0 .../0774-Add-EntityToggleSitEvent.patch | 0 .../0775-Add-fire-tick-delay-option.patch | 0 .../server/0776-Add-Moving-Piston-API.patch | 0 .../0777-Ignore-impossible-spawn-tick.patch | 0 ...nt-suggestion-permissions-to-align-w.patch | 0 ...tEvent-cancellation-cant-fully-preve.patch | 2 +- .../0780-Add-PrePlayerAttackEntityEvent.patch | 2 +- ...re-reset-EnderDragon-boss-event-name.patch | 0 ...7-green-map-markers-do-not-disappear.patch | 0 .../0783-Add-Player-Warden-Warning-API.patch | 0 ...la-friendly-methods-to-update-trades.patch | 0 ...0785-Add-paper-dumplisteners-command.patch | 2 +- ...global-player-list-where-appropriate.patch | 0 ...async-entity-add-due-to-fungus-trees.patch | 0 .../server/0788-ItemStack-damage-API.patch | 2 +- .../server/0789-Friction-API.patch | 2 +- ...ntrol-player-s-insomnia-and-phantoms.patch | 0 ...x-premature-player-kicks-on-shutdown.patch | 2 +- .../0792-Sync-offhand-slot-in-menus.patch | 0 .../0793-Player-Entity-Tracking-Events.patch | 2 +- .../server/0794-Limit-pet-look-distance.patch | 0 ...and-additions-to-the-SpawnReason-API.patch | 0 .../server/0796-fix-Instruments.patch | 2 +- ...-for-some-hot-BlockBehavior-and-Flui.patch | 0 ...ies-in-dispense-events-regarding-sta.patch | 0 .../server/0799-Add-BlockLockCheckEvent.patch | 0 .../0800-Add-Sneaking-API-for-Entities.patch | 0 .../0801-Improve-logging-and-errors.patch | 2 +- .../server/0802-Improve-PortalEvents.patch | 2 +- ...tion-for-spider-worldborder-climbing.patch | 0 ...ssing-SpigotConfig-logCommands-check.patch | 0 ...-Allay-stopDancing-while-not-dancing.patch | 0 .../server/0806-Flying-Fall-Damage.patch | 4 +- ...sion-moving-velocity-to-VehicleBlock.patch | 2 +- ...config-for-disabling-entity-tag-tags.patch | 0 ...le-player-info-update-packet-on-join.patch | 0 ...nk-items-during-EntityResurrectEvent.patch | 2 +- .../server/0811-Win-Screen-API.patch | 2 +- ...tItemStack-setAmount-null-assignment.patch | 2 +- ...Fix-force-opening-enchantment-tables.patch | 0 .../server/0814-Add-Entity-Body-Yaw-API.patch | 2 +- ...event-sleeping-villagers-moving-towa.patch | 0 .../0816-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 ...0821-Fix-text-display-error-on-spawn.patch | 0 ...inventories-returning-null-Locations.patch | 0 .../server/0823-Add-Shearable-API.patch | 0 ...-Fix-SpawnEggMeta-get-setSpawnedType.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 .../0830-Use-array-for-gamerule-storage.patch | 0 ...-Fix-a-couple-of-upstream-bed-issues.patch | 0 ...Fix-demo-flag-not-enabling-demo-mode.patch | 0 .../0833-Add-Mob-Experience-reward-API.patch | 0 ...-redstone-on-top-of-trap-doors-early.patch | 0 ...-Lazy-Initialization-for-Enum-Fields.patch | 0 ...836-More-accurate-isInOpenWater-impl.patch | 0 .../0837-Expand-PlayerItemMendEvent.patch | 6 +- ...esh-ProjectileSource-for-projectiles.patch | 2 +- .../0839-Add-transient-modifier-API.patch | 0 .../server/0840-Fix-block-place-logic.patch | 2 +- ...und-playing-for-BlockItem-ItemStacks.patch | 2 +- ...ll-BlockGrowEvent-for-missing-blocks.patch | 0 ...anhasbukkit-default-if-alias-block-e.patch | 0 ...apLike-spam-for-missing-key-selector.patch | 0 ...5-Fix-sniffer-removeExploredLocation.patch | 0 ...-to-remove-all-active-potion-effects.patch | 2 +- ...crafting-result-amount-for-fireworks.patch | 0 ...48-Add-event-for-player-editing-sign.patch | 2 +- ...ck-item-frames-if-players-can-see-it.patch | 0 ...permission-levels-for-command-blocks.patch | 0 ...-Add-option-to-disable-block-updates.patch | 0 ...0852-Call-missing-BlockDispenseEvent.patch | 0 ...d-chunks-for-supporting-block-checks.patch | 2 +- ...-Optimize-player-lookups-for-beacons.patch | 0 ...0855-Add-Sign-getInteractableSideFor.patch | 0 ...56-fix-item-meta-for-tadpole-buckets.patch | 0 .../server/0857-Fix-BanList-API.patch | 2 +- ...nd-water-fluid-explosion-resistance-.patch | 0 ...ix-possible-NPE-on-painting-creation.patch | 0 ...Timer-for-Wandering-Traders-spawned-.patch | 0 ...enceOrb-should-call-EntitySpawnEvent.patch | 2 +- ...st-throw-both-Spread-and-Grow-Events.patch | 0 .../server/0863-Add-whitelist-events.patch | 0 .../0864-Implement-PlayerFailMoveEvent.patch | 0 ...Folia-scheduler-and-owned-region-API.patch | 0 ...ase-allay-memory-on-non-item-targets.patch | 0 ...-API-for-updating-recipes-on-clients.patch | 0 ...ation-when-spawning-display-entities.patch | 0 ...0869-Only-capture-actual-tree-growth.patch | 2 +- ...urce-for-mushroom-block-spread-event.patch | 0 ...eData-on-more-entities-when-spawning.patch | 0 ...2-Use-correct-seed-on-api-world-load.patch | 0 ...ata-neighbour-ticks-outside-of-range.patch | 0 .../0874-Cache-map-ids-on-item-frames.patch | 0 ...x-custom-statistic-criteria-creation.patch | 0 .../server/0876-Bandaid-fix-for-Effect.patch | 0 .../server/0877-SculkCatalyst-bloom-API.patch | 0 ...-API-for-an-entity-s-scoreboard-name.patch | 0 ...place-methods-with-old-StructureType.patch | 0 ...te-namespaced-commands-if-send-names.patch | 0 ...y-handle-BlockBreakEvent-isDropItems.patch | 0 ...-entity-death-event-for-ender-dragon.patch | 0 ...ntity-tracking-range-by-Y-coordinate.patch | 0 .../0884-Add-Listing-API-for-Player.patch | 2 +- ...nfigurable-Region-Compression-Format.patch | 0 ...86-Add-BlockFace-to-BlockDamageEvent.patch | 2 +- .../0887-Fix-NPE-on-Boat-getStatus.patch | 0 .../server/0888-Expand-Pose-API.patch | 2 +- .../server/0889-More-DragonBattle-API.patch | 0 .../server/0890-Add-PlayerPickItemEvent.patch | 0 .../0891-Allow-trident-custom-damage.patch | 0 ...92-Expose-hand-in-BlockCanBuildEvent.patch | 0 ...e-nearest-structure-border-iteration.patch | 0 ...-Implement-OfflinePlayer-isConnected.patch | 2 +- .../server/0895-Fix-inventory-desync.patch | 2 +- ...-titleOverride-to-InventoryOpenEvent.patch | 2 +- ...897-Configure-sniffer-egg-hatch-time.patch | 0 ...l-proximity-check-before-entity-look.patch | 0 ...Skip-POI-finding-if-stuck-in-vehicle.patch | 0 ...ot-sanity-checks-in-container-clicks.patch | 0 ...all-BlockRedstoneEvents-for-lecterns.patch | 0 ...proper-checking-of-empty-item-stacks.patch | 2 +- ...Fix-silent-equipment-change-for-mobs.patch | 2 +- .../0904-Fix-spigot-s-Forced-Stats.patch | 0 ...sing-InventoryHolders-to-inventories.patch | 0 ...-entities-in-chunks-that-are-positio.patch | 0 ...ssing-logs-for-log-ips-config-option.patch | 0 ...on-on-UpgradeData.BlockFixers-class-.patch | 0 ...n-AdvancementProgress-getDateAwarded.patch | 0 ...sidebar-objectives-not-being-cleared.patch | 0 ...ix-missing-map-initialize-event-call.patch | 0 ...ta-when-attaching-firework-to-entity.patch | 0 ...913-Fix-UnsafeValues-loadAdvancement.patch | 0 .../0914-Add-player-idle-duration-API.patch | 0 ...k-if-we-can-see-non-visible-entities.patch | 0 ...-NPE-in-SculkBloomEvent-world-access.patch | 0 ...stack-for-Player-sendEquipmentChange.patch | 2 +- .../server/0918-Optimize-VarInts.patch | 0 ...he-collision-shape-of-a-block-before.patch | 0 ...predicate-for-blocks-when-raytracing.patch | 0 ...tem-packets-with-collector-as-source.patch | 0 .../0922-Expand-LingeringPotion-API.patch | 0 ...ingEffect-powers-lightning-rods-and-.patch | 0 ...sh-event-for-all-player-interactions.patch | 0 ...several-issues-with-EntityBreedEvent.patch | 0 ...0926-Add-UUID-attribute-modifier-API.patch | 0 ...g-event-call-for-entity-teleport-API.patch | 0 ...ly-create-LootContext-for-criterions.patch | 0 ...n-t-fire-sync-events-during-worldgen.patch | 4 +- .../server/0930-Add-Structure-check-API.patch | 2 +- ...m-getAttributeModifier-duplication-c.patch | 0 ...estore-vanilla-entity-drops-behavior.patch | 6 +- ...3-Dont-resend-blocks-on-interactions.patch | 2 +- .../server/0934-add-more-scoreboard-API.patch | 0 .../server/0935-Improve-Registry.patch | 0 ...-on-null-loc-for-EntityTeleportEvent.patch | 0 .../0937-Add-experience-points-API.patch | 4 +- .../0938-Add-drops-to-shear-events.patch | 4 +- .../0939-Add-PlayerShieldDisableEvent.patch | 2 +- ...date-ResourceLocation-in-NBT-reading.patch | 6 +- ...e-experience-dropping-on-block-break.patch | 0 .../0942-Fixup-NamespacedKey-handling.patch | 0 ...943-Expose-LootTable-of-DecoratedPot.patch | 0 ...llocation-of-Vec3D-by-entity-tracker.patch | 0 ...erTradeEvent-and-PlayerPurchaseEvent.patch | 0 .../0946-Add-ShulkerDuplicateEvent.patch | 0 ...Add-api-for-spawn-egg-texture-colors.patch | 0 .../0948-Add-Lifecycle-Event-system.patch | 0 .../server/0949-ItemStack-Tooltip-API.patch | 0 ...kSnapshot-includeLightData-parameter.patch | 0 .../server/0951-Add-FluidState-API.patch | 2 +- .../server/0952-add-number-format-api.patch | 0 .../server/0953-improve-BanList-types.patch | 0 .../server/0954-Expanded-Hopper-API.patch | 0 ...55-Add-BlockBreakProgressUpdateEvent.patch | 0 .../0956-Deprecate-ItemStack-setType.patch | 0 .../0957-Add-CartographyItemEvent.patch | 0 .../server/0958-More-Raid-API.patch | 0 ...ing-message-for-initial-server-start.patch | 2 +- ...0-Configurable-max-block-fluid-ticks.patch | 0 .../0961-Fix-bees-aging-inside-hives.patch | 0 ...62-Disable-memory-reserve-allocating.patch | 0 ...eByEntityEvent-for-unowned-wither-sk.patch | 0 .../server/0964-Fix-DamageSource-API.patch | 4 +- ...invalid-block-entity-during-world-ge.patch | 0 ...tackOverflowError-for-some-dispenses.patch | 0 .../0967-Improve-tag-parser-handling.patch | 0 .../server/0968-Item-Mutation-Fixes.patch | 0 ...9-Per-world-ticks-per-spawn-settings.patch | 0 ...he-changed-item-from-dispense-events.patch | 0 .../0971-Rewrite-dataconverter-system.patch | 0 .../0972-Suspicious-Effect-Entry-API.patch | 0 ...heck-if-itemstack-is-stackable-first.patch | 0 ...974-disable-forced-empty-world-ticks.patch | 0 .../server/0975-Starlight.patch | 4 +- .../server/0976-Rewrite-chunk-system.patch | 0 ...-incremental-chunk-and-player-saving.patch | 4 +- ...ldBounds-and-getBlockState-for-inlin.patch | 0 ...item-frames-performance-and-bug-fixe.patch | 2 +- ...cing-for-EntityLiving-hasLineOfSight.patch | 0 ...-Manager-and-add-advanced-packet-sup.patch | 0 ...982-Allow-Saving-of-Oversized-Chunks.patch | 0 ...983-Fix-World-isChunkGenerated-calls.patch | 0 ...0984-Flat-bedrock-generator-settings.patch | 0 .../0985-Entity-Activation-Range-2.0.patch | 6 +- .../0986-Optional-per-player-mob-spawns.patch | 2 +- .../server/0987-Anti-Xray.patch | 0 ...ng-PreCreatureSpawnEvent-with-per-pl.patch | 4 +- ...ptimize-Collision-to-not-load-chunks.patch | 2 +- ...oalSelector-Goal.Flag-Set-operations.patch | 0 ...991-Entity-load-save-limit-per-chunk.patch | 0 .../0992-Improved-Watchdog-Support.patch | 6 +- .../0993-Optimize-Voxel-Shape-Merging.patch | 0 ...and-End-Portal-Frames-from-being-des.patch | 2 +- ...tance-map-to-optimise-entity-tracker.patch | 2 +- ...-Optimize-Bit-Operations-by-inlining.patch | 0 .../0997-Remove-streams-from-hot-code.patch | 0 ...8-Eigencraft-redstone-implementation.patch | 0 ...der-Remove-Streams-Optimized-collect.patch | 0 ...0-Improve-boat-collision-performance.patch | 0 .../1001-Optimise-general-POI-access.patch | 0 ...lementation-for-blockstate-state-loo.patch | 0 .../1003-Execute-chunk-tasks-mid-tick.patch | 4 +- .../1004-Optimise-random-block-ticking.patch | 0 ...culate-regionfile-header-if-it-is-co.patch | 0 ...ocity-compression-and-cipher-natives.patch | 0 ...l-more-information-in-watchdog-dumps.patch | 2 +- .../server/1008-Collision-optimisations.patch | 2 +- ...on-checking-in-player-move-packet-ha.patch | 0 ...re-disarming-not-working-as-intended.patch | 0 ...y-type-tags-suggestions-in-selectors.patch | 0 ...nate-Current-redstone-implementation.patch | 0 ...013-optimize-dirt-and-snow-spreading.patch | 0 .../1014-Properly-resend-entities.patch | 0 .../server/1015-Optimize-Hoppers.patch | 4 +- ...6-Improve-performance-of-mass-crafts.patch | 0 .../1017-Actually-optimise-explosions.patch | 2 +- .../1018-Optimise-chunk-tick-iteration.patch | 2 +- .../server/1019-Lag-compensation-ticks.patch | 2 +- ...020-Optimise-nearby-player-retrieval.patch | 0 .../1021-Distance-manager-tick-timings.patch | 0 ...e-Oversized-block-entities-in-chunks.patch | 0 ...-packets-for-hard-colliding-entities.patch | 0 .../1024-API-for-checking-sent-chunks.patch | 0 ...g-for-mobs-immune-to-default-effects.patch | 0 .../1026-Deep-clone-nbt-tags-in-PDC.patch | 0 ...1027-Support-old-UUID-format-for-NBT.patch | 0 ...028-Fix-shield-disable-inconsistency.patch | 0 .../1029-Write-SavedData-IO-async.patch | 2 +- ...-removed-data-components-in-ItemMeta.patch | 0 ...d-experimental-improved-give-command.patch | 0 ...e-Large-Packets-disconnecting-client.patch | 0 .../server/1033-Fix-ItemFlags.patch | 0 ...met-damage-reduction-inconsistencies.patch | 2 +- ...a-handling-of-LivingEntity-actuallyH.patch | 0 ...ve-checking-handled-tags-in-itemmeta.patch | 0 .../server/1037-General-ItemMeta-fixes.patch | 2 +- ...038-Expose-hasColor-to-leather-armor.patch | 0 ...d-API-to-get-player-ha-proxy-address.patch | 2 +- .../server/1040-More-Chest-Block-API.patch | 0 ...ata-component-type-on-encoding-error.patch | 0 ...er-desync-when-new-players-are-added.patch | 0 .../1043-Brigadier-based-command-API.patch | 2 +- .../1044-Fix-issues-with-Recipe-API.patch | 0 ...045-Fix-equipment-slot-and-group-API.patch | 2 +- ...plugin-to-use-Paper-PluginLoader-API.patch | 0 ...oversized-item-data-in-equipment-and.patch | 0 ...ent-NPE-if-hooked-entity-was-cleared.patch | 0 ...ing-BlockPlaceEvent-calling-onRemove.patch | 2 +- ...1050-Add-missing-fishing-event-state.patch | 0 ...cate-InvAction-HOTBAR_MOVE_AND_READD.patch | 0 ...onnect-packet-in-phases-where-it-doe.patch | 0 .../server/1053-Adopt-MaterialRerouting.patch | 0 work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 1180 files changed, 747 insertions(+), 1717 deletions(-) rename patches/{ => unapplied}/server/0001-Setup-Gradle-project.patch (100%) rename patches/{ => unapplied}/server/0002-Remap-fixes.patch (100%) rename patches/{ => unapplied}/server/0003-Build-system-changes.patch (100%) rename patches/{ => unapplied}/server/0004-Test-changes.patch (100%) rename patches/{ => unapplied}/server/0005-Paper-config-files.patch (100%) rename patches/{ => unapplied}/server/0006-MC-Dev-fixes.patch (98%) rename patches/{ => unapplied}/server/0007-ConcurrentUtil.patch (100%) rename patches/{ => unapplied}/server/0008-CB-fixes.patch (100%) rename patches/{ => unapplied}/server/0009-MC-Utils.patch (100%) rename patches/{ => unapplied}/server/0010-Adventure.patch (100%) rename patches/{ => unapplied}/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch (100%) rename patches/{ => unapplied}/server/0012-Handle-plugin-prefixes-using-Log4J-configuration.patch (97%) rename patches/{ => unapplied}/server/0013-Improve-Log4J-Configuration-Plugin-Loggers.patch (100%) rename patches/{ => unapplied}/server/0014-Use-AsyncAppender-to-keep-logging-IO-off-main-thread.patch (94%) rename patches/{ => unapplied}/server/0015-Deobfuscate-stacktraces-in-log-messages-crash-report.patch (99%) rename patches/{ => unapplied}/server/0016-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch (100%) rename patches/{ => unapplied}/server/0017-Paper-command.patch (100%) rename patches/{ => unapplied}/server/0018-Paper-Metrics.patch (100%) rename patches/{ => unapplied}/server/0019-Paper-Plugins.patch (100%) rename patches/{ => unapplied}/server/0020-Plugin-remapping.patch (100%) rename patches/{ => unapplied}/server/0021-Hook-into-CB-plugin-rewrites.patch (100%) rename patches/{ => unapplied}/server/0022-Remap-reflection-calls-in-plugins-using-internals.patch (100%) rename patches/{ => unapplied}/server/0023-Timings-v2.patch (100%) rename patches/{ => unapplied}/server/0024-Add-TickThread.patch (100%) rename patches/{ => unapplied}/server/0025-Further-improve-server-tick-loop.patch (100%) rename patches/{ => unapplied}/server/0026-Add-command-line-option-to-load-extra-plugin-jars-no.patch (100%) rename patches/{ => unapplied}/server/0027-Support-components-in-ItemMeta.patch (100%) rename patches/{ => unapplied}/server/0028-Configurable-cactus-bamboo-and-reed-growth-height.patch (100%) rename patches/{ => unapplied}/server/0029-Configurable-baby-zombie-movement-speed.patch (100%) rename patches/{ => unapplied}/server/0030-Configurable-fishing-time-ranges.patch (94%) rename patches/{ => unapplied}/server/0031-Allow-nerfed-mobs-to-jump.patch (96%) rename patches/{ => unapplied}/server/0032-Add-configurable-entity-despawn-distances.patch (94%) rename patches/{ => unapplied}/server/0033-Drop-falling-block-and-tnt-entities-at-the-specified.patch (100%) rename patches/{ => unapplied}/server/0034-Expose-server-build-information.patch (99%) rename patches/{ => unapplied}/server/0035-Player-affects-spawning-API.patch (100%) rename patches/{ => unapplied}/server/0036-Only-refresh-abilities-if-needed.patch (92%) rename patches/{ => unapplied}/server/0037-Entity-Origin-API.patch (100%) rename patches/{ => unapplied}/server/0038-Prevent-block-entity-and-entity-crashes.patch (97%) rename patches/{ => unapplied}/server/0039-Configurable-top-of-nether-void-damage.patch (100%) rename patches/{ => unapplied}/server/0040-Check-online-mode-before-converting-and-renaming-pla.patch (100%) rename patches/{ => unapplied}/server/0041-Add-more-entities-to-activation-range-ignore-list.patch (100%) rename patches/{ => unapplied}/server/0042-Configurable-end-credits.patch (100%) rename patches/{ => unapplied}/server/0043-Fix-lag-from-explosions-processing-dead-entities.patch (100%) rename patches/{ => unapplied}/server/0044-Optimize-explosions.patch (98%) rename patches/{ => unapplied}/server/0045-Disable-explosion-knockback.patch (100%) rename patches/{ => unapplied}/server/0046-Disable-thunder.patch (100%) rename patches/{ => unapplied}/server/0047-Disable-ice-and-snow.patch (100%) rename patches/{ => unapplied}/server/0048-Configurable-mob-spawner-tick-rate.patch (100%) rename patches/{ => unapplied}/server/0049-Implement-PlayerLocaleChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0050-Add-BeaconEffectEvent.patch (100%) rename patches/{ => unapplied}/server/0051-Configurable-container-update-tick-rate.patch (100%) rename patches/{ => unapplied}/server/0052-Use-UserCache-for-player-heads.patch (92%) rename patches/{ => unapplied}/server/0053-Disable-spigot-tick-limiters.patch (100%) rename patches/{ => unapplied}/server/0054-Add-PlayerInitialSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0055-Configurable-Disabling-Cat-Chest-Detection.patch (100%) rename patches/{ => unapplied}/server/0056-Improve-Player-chat-API-handling.patch (100%) rename patches/{ => unapplied}/server/0057-All-chunks-are-slime-spawn-chunks-toggle.patch (100%) rename patches/{ => unapplied}/server/0058-Expose-server-CommandMap.patch (100%) rename patches/{ => unapplied}/server/0059-Be-a-bit-more-informative-in-maxHealth-exception.patch (100%) rename patches/{ => unapplied}/server/0060-Player-Tab-List-and-Title-APIs.patch (97%) rename patches/{ => unapplied}/server/0061-Add-configurable-portal-search-radius.patch (100%) rename patches/{ => unapplied}/server/0062-Add-velocity-warnings.patch (100%) rename patches/{ => unapplied}/server/0063-Configurable-inter-world-teleportation-safety.patch (94%) rename patches/{ => unapplied}/server/0064-Add-exception-reporting-event.patch (100%) rename patches/{ => unapplied}/server/0065-Disable-Scoreboards-for-non-players-by-default.patch (95%) rename patches/{ => unapplied}/server/0066-Add-methods-for-working-with-arrows-stuck-in-living-.patch (100%) rename patches/{ => unapplied}/server/0067-Chunk-Save-Reattempt.patch (100%) rename patches/{ => unapplied}/server/0068-Complete-resource-pack-API.patch (96%) rename patches/{ => unapplied}/server/0069-Default-loading-permissions.yml-before-plugins.patch (100%) rename patches/{ => unapplied}/server/0070-Allow-Reloading-of-Custom-Permissions.patch (100%) rename patches/{ => unapplied}/server/0071-Remove-Metadata-on-reload.patch (100%) rename patches/{ => unapplied}/server/0072-Handle-Item-Meta-Inconsistencies.patch (100%) rename patches/{ => unapplied}/server/0073-Configurable-Non-Player-Arrow-Despawn-Rate.patch (100%) rename patches/{ => unapplied}/server/0074-Add-World-Util-Methods.patch (100%) rename patches/{ => unapplied}/server/0075-Custom-replacement-for-eaten-items.patch (100%) rename patches/{ => unapplied}/server/0076-handle-NaN-health-absorb-values-and-repair-bad-data.patch (96%) rename patches/{ => unapplied}/server/0077-Use-a-Shared-Random-for-Entities.patch (100%) rename patches/{ => unapplied}/server/0078-Configurable-spawn-chances-for-skeleton-horses.patch (100%) rename patches/{ => unapplied}/server/0079-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch (98%) rename patches/{ => unapplied}/server/0080-Entity-AddTo-RemoveFrom-World-Events.patch (100%) rename patches/{ => unapplied}/server/0081-Configurable-Chunk-Inhabited-Time.patch (100%) rename patches/{ => unapplied}/server/0082-EntityPathfindEvent.patch (100%) rename patches/{ => unapplied}/server/0083-Sanitise-RegionFileCache-and-make-configurable.patch (100%) rename patches/{ => unapplied}/server/0084-Do-not-load-chunks-for-Pathfinding.patch (100%) rename patches/{ => unapplied}/server/0085-Add-PlayerUseUnknownEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0086-Configurable-random-tick-rates-for-blocks.patch (100%) rename patches/{ => unapplied}/server/0087-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch (100%) rename patches/{ => unapplied}/server/0088-Optimize-DataBits.patch (100%) rename patches/{ => unapplied}/server/0089-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch (100%) rename patches/{ => unapplied}/server/0090-Configurable-Player-Collision.patch (98%) rename patches/{ => unapplied}/server/0091-Add-handshake-event-to-allow-plugins-to-handle-clien.patch (100%) rename patches/{ => unapplied}/server/0092-Configurable-RCON-IP-address.patch (100%) rename patches/{ => unapplied}/server/0093-EntityRegainHealthEvent-isFastRegen-API.patch (96%) rename patches/{ => unapplied}/server/0094-Add-ability-to-configure-frosted_ice-properties.patch (100%) rename patches/{ => unapplied}/server/0095-remove-null-possibility-for-getServer-singleton.patch (95%) rename patches/{ => unapplied}/server/0096-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch (100%) rename patches/{ => unapplied}/server/0097-LootTable-API-and-replenishable-lootables.patch (100%) rename patches/{ => unapplied}/server/0098-System-property-for-disabling-watchdoge.patch (100%) rename patches/{ => unapplied}/server/0099-Async-GameProfileCache-saving.patch (95%) rename patches/{ => unapplied}/server/0100-Optional-TNT-doesn-t-move-in-water.patch (100%) rename patches/{ => unapplied}/server/0101-Faster-redstone-torch-rapid-clock-removal.patch (100%) rename patches/{ => unapplied}/server/0102-Add-server-name-parameter.patch (90%) rename patches/{ => unapplied}/server/0103-Fix-global-sound-handling.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 (97%) 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-block-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 (96%) 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-Level.hasChunkAt-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-Add-API-methods-to-control-if-armor-stands-can-move.patch (100%) rename patches/{ => unapplied}/server/0121-String-based-Action-Bar-API.patch (94%) rename patches/{ => unapplied}/server/0122-Properly-fix-item-duplication-bug.patch (100%) rename patches/{ => unapplied}/server/0123-Firework-API-s.patch (98%) rename patches/{ => unapplied}/server/0124-PlayerTeleportEndGatewayEvent.patch (100%) rename patches/{ => unapplied}/server/0125-Provide-E-TE-Chunk-count-stat-methods.patch (97%) rename patches/{ => unapplied}/server/0126-Enforce-Sync-Player-Saves.patch (100%) rename patches/{ => unapplied}/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch (99%) rename patches/{ => unapplied}/server/0128-Cap-Entity-Collisions.patch (100%) rename patches/{ => unapplied}/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch (100%) rename patches/{ => unapplied}/server/0130-Properly-handle-async-calls-to-restart-the-server.patch (99%) rename patches/{ => unapplied}/server/0131-Add-option-to-make-parrots-stay-on-shoulders-despite.patch (100%) rename patches/{ => unapplied}/server/0132-Add-configuration-option-to-prevent-player-names-fro.patch (100%) rename patches/{ => unapplied}/server/0133-provide-a-configurable-option-to-disable-creeper-lin.patch (100%) rename patches/{ => unapplied}/server/0134-Item-canEntityPickup.patch (96%) rename patches/{ => unapplied}/server/0135-PlayerPickupItemEvent-setFlyAtPlayer.patch (100%) rename patches/{ => unapplied}/server/0136-PlayerAttemptPickupItemEvent.patch (100%) rename patches/{ => unapplied}/server/0137-Do-not-submit-profile-lookups-to-worldgen-threads.patch (98%) rename patches/{ => unapplied}/server/0138-Basic-PlayerProfile-API.patch (100%) rename patches/{ => unapplied}/server/0139-Add-UnknownCommandEvent.patch (100%) rename patches/{ => unapplied}/server/0140-Shoulder-Entities-Release-API.patch (100%) rename patches/{ => unapplied}/server/0141-Profile-Lookup-Events.patch (100%) rename patches/{ => unapplied}/server/0142-Block-player-logins-during-server-shutdown.patch (100%) rename patches/{ => unapplied}/server/0143-Entity-fromMobSpawner.patch (100%) rename patches/{ => unapplied}/server/0144-Improve-the-Saddle-API-for-Horses.patch (100%) rename patches/{ => unapplied}/server/0145-ensureServerConversions-API.patch (100%) rename patches/{ => unapplied}/server/0146-Implement-getI18NDisplayName.patch (100%) rename patches/{ => unapplied}/server/0147-ProfileWhitelistVerifyEvent.patch (100%) rename patches/{ => unapplied}/server/0148-Fix-this-stupid-bullshit.patch (100%) rename patches/{ => unapplied}/server/0149-LivingEntity-setKiller.patch (100%) rename patches/{ => unapplied}/server/0150-Ocelot-despawns-should-honor-nametags-and-leash.patch (100%) rename patches/{ => unapplied}/server/0151-Reset-spawner-timer-when-spawner-event-is-cancelled.patch (100%) rename patches/{ => unapplied}/server/0152-Allow-specifying-a-custom-authentication-servers-dow.patch (100%) rename patches/{ => unapplied}/server/0153-Add-PlayerJumpEvent.patch (100%) rename patches/{ => unapplied}/server/0154-handle-ServerboundKeepAlivePacket-async.patch (100%) rename patches/{ => unapplied}/server/0155-Expose-client-protocol-version-and-virtual-host.patch (98%) rename patches/{ => unapplied}/server/0156-revert-serverside-behavior-of-keepalives.patch (100%) rename patches/{ => unapplied}/server/0157-Send-attack-SoundEffects-only-to-players-who-can-see.patch (100%) rename patches/{ => unapplied}/server/0158-Add-PlayerArmorChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0159-Prevent-logins-from-being-processed-when-the-player-.patch (100%) rename patches/{ => unapplied}/server/0160-Fix-MC-117075-Block-entity-unload-lag-spike.patch (100%) rename patches/{ => unapplied}/server/0161-use-CB-BlockState-implementations-for-captured-block.patch (100%) rename patches/{ => unapplied}/server/0162-API-to-get-a-BlockState-without-a-snapshot.patch (97%) rename patches/{ => unapplied}/server/0163-AsyncTabCompleteEvent.patch (100%) rename patches/{ => unapplied}/server/0164-PlayerPickupExperienceEvent.patch (93%) rename patches/{ => unapplied}/server/0165-Ability-to-apply-mending-to-XP-API.patch (96%) rename patches/{ => unapplied}/server/0166-PlayerNaturallySpawnCreaturesEvent.patch (98%) rename patches/{ => unapplied}/server/0167-Add-setPlayerProfile-API-for-Skulls.patch (100%) rename patches/{ => unapplied}/server/0168-PreCreatureSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0169-Fill-Profile-Property-Events.patch (100%) rename patches/{ => unapplied}/server/0170-Add-PlayerAdvancementCriterionGrantEvent.patch (100%) rename patches/{ => unapplied}/server/0171-Add-ArmorStand-Item-Meta.patch (100%) rename patches/{ => unapplied}/server/0172-Extend-Player-Interact-cancellation.patch (100%) rename patches/{ => unapplied}/server/0173-Tameable-getOwnerUniqueId-API.patch (100%) rename patches/{ => unapplied}/server/0174-Toggleable-player-crits.patch (100%) rename patches/{ => unapplied}/server/0175-Disable-Explicit-Network-Manager-Flushing.patch (100%) rename patches/{ => unapplied}/server/0176-Implement-extended-PaperServerListPingEvent.patch (99%) rename patches/{ => unapplied}/server/0177-Add-more-fields-to-AsyncPreLoginEvent.patch (100%) rename patches/{ => unapplied}/server/0178-Player.setPlayerProfile-API.patch (100%) rename patches/{ => unapplied}/server/0179-getPlayerUniqueId-API.patch (100%) rename patches/{ => unapplied}/server/0180-Improved-Async-Task-Scheduler.patch (100%) rename patches/{ => unapplied}/server/0181-Make-legacy-ping-handler-more-reliable.patch (100%) rename patches/{ => unapplied}/server/0182-Call-PaperServerListPingEvent-for-legacy-pings.patch (100%) rename patches/{ => unapplied}/server/0183-Flag-to-disable-the-channel-limit.patch (95%) rename patches/{ => unapplied}/server/0184-Add-openSign-method-to-HumanEntity.patch (100%) rename patches/{ => unapplied}/server/0185-Configurable-sprint-interruption-on-attack.patch (100%) rename patches/{ => unapplied}/server/0186-EndermanEscapeEvent.patch (100%) rename patches/{ => unapplied}/server/0187-Enderman.teleportRandomly.patch (100%) rename patches/{ => unapplied}/server/0188-Block-Enderpearl-Travel-Exploit.patch (100%) rename patches/{ => unapplied}/server/0189-Expand-World.spawnParticle-API-and-add-Builder.patch (100%) rename patches/{ => unapplied}/server/0190-Fix-exploit-that-allowed-colored-signs-to-be-created.patch (100%) rename patches/{ => unapplied}/server/0191-EndermanAttackPlayerEvent.patch (100%) rename patches/{ => unapplied}/server/0192-WitchConsumePotionEvent.patch (100%) rename patches/{ => unapplied}/server/0193-WitchThrowPotionEvent.patch (100%) rename patches/{ => unapplied}/server/0194-WitchReadyPotionEvent.patch (100%) rename patches/{ => unapplied}/server/0195-ItemStack-getMaxItemUseDuration.patch (91%) rename patches/{ => unapplied}/server/0196-Add-EntityTeleportEndGatewayEvent.patch (100%) rename patches/{ => unapplied}/server/0197-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch (100%) rename patches/{ => unapplied}/server/0198-Fix-CraftEntity-hashCode.patch (100%) rename patches/{ => unapplied}/server/0199-Configurable-LootPool-luck-formula.patch (100%) rename patches/{ => unapplied}/server/0200-Print-Error-details-when-failing-to-save-player-data.patch (100%) rename patches/{ => unapplied}/server/0201-Make-shield-blocking-delay-configurable.patch (100%) rename patches/{ => unapplied}/server/0202-Improve-EntityShootBowEvent.patch (100%) rename patches/{ => unapplied}/server/0203-PlayerReadyArrowEvent.patch (100%) rename patches/{ => unapplied}/server/0204-Add-entity-knockback-events.patch (100%) rename patches/{ => unapplied}/server/0205-Expand-Explosions-API.patch (100%) rename patches/{ => unapplied}/server/0206-LivingEntity-Active-Item-API.patch (100%) rename patches/{ => unapplied}/server/0207-RangedEntity-API.patch (100%) rename patches/{ => unapplied}/server/0208-Add-config-to-disable-ender-dragon-legacy-check.patch (100%) rename patches/{ => unapplied}/server/0209-Implement-World.getEntity-UUID-API.patch (100%) rename patches/{ => unapplied}/server/0210-InventoryCloseEvent-Reason-API.patch (97%) rename patches/{ => unapplied}/server/0211-Vex-get-setSummoner-API.patch (100%) rename patches/{ => unapplied}/server/0212-Refresh-player-inventory-when-cancelling-PlayerInter.patch (100%) rename patches/{ => unapplied}/server/0213-add-more-information-to-Entity.toString.patch (95%) rename patches/{ => unapplied}/server/0214-EnderDragon-Events.patch (100%) rename patches/{ => unapplied}/server/0215-PlayerElytraBoostEvent.patch (100%) rename patches/{ => unapplied}/server/0216-PlayerLaunchProjectileEvent.patch (100%) rename patches/{ => unapplied}/server/0217-Improve-BlockPosition-inlining.patch (100%) rename patches/{ => unapplied}/server/0218-Option-to-prevent-armor-stands-from-doing-entity-loo.patch (100%) rename patches/{ => unapplied}/server/0219-Vanished-players-don-t-have-rights.patch (98%) rename patches/{ => unapplied}/server/0220-Allow-disabling-armor-stand-ticking.patch (100%) rename patches/{ => unapplied}/server/0221-SkeletonHorse-Additions.patch (100%) rename patches/{ => unapplied}/server/0222-Expand-ArmorStand-API.patch (100%) rename patches/{ => unapplied}/server/0223-AnvilDamageEvent.patch (100%) rename patches/{ => unapplied}/server/0224-Add-TNTPrimeEvent.patch (100%) rename patches/{ => unapplied}/server/0225-Break-up-and-make-tab-spam-limits-configurable.patch (100%) rename patches/{ => unapplied}/server/0226-Fix-NBT-type-issues.patch (95%) rename patches/{ => unapplied}/server/0227-Remove-unnecessary-itemmeta-handling.patch (94%) rename patches/{ => unapplied}/server/0228-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch (97%) rename patches/{ => unapplied}/server/0229-Add-Early-Warning-Feature-to-WatchDog.patch (99%) rename patches/{ => unapplied}/server/0230-Use-ConcurrentHashMap-in-JsonList.patch (100%) rename patches/{ => unapplied}/server/0231-Use-a-Queue-for-Queueing-Commands.patch (95%) rename patches/{ => unapplied}/server/0232-Ability-to-get-block-entities-from-a-chunk-without-s.patch (100%) rename patches/{ => unapplied}/server/0233-Optimize-BlockPosition-helper-methods.patch (100%) rename patches/{ => unapplied}/server/0234-Restore-vanilla-default-mob-spawn-range-and-water-an.patch (89%) rename patches/{ => unapplied}/server/0235-Slime-Pathfinder-Events.patch (100%) rename patches/{ => unapplied}/server/0236-Configurable-speed-for-water-flowing-over-lava.patch (100%) rename patches/{ => unapplied}/server/0237-Optimize-CraftBlockData-Creation.patch (100%) rename patches/{ => unapplied}/server/0238-Optimize-MappedRegistry.patch (100%) rename patches/{ => unapplied}/server/0239-Add-PhantomPreSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0240-Add-More-Creeper-API.patch (100%) rename patches/{ => unapplied}/server/0241-Inventory-removeItemAnySlot.patch (100%) rename patches/{ => unapplied}/server/0242-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch (100%) rename patches/{ => unapplied}/server/0243-Add-ray-tracing-methods-to-LivingEntity.patch (100%) rename patches/{ => unapplied}/server/0244-Expose-attack-cooldown-methods-for-Player.patch (100%) rename patches/{ => unapplied}/server/0245-Improve-death-events.patch (98%) rename patches/{ => unapplied}/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch (95%) rename patches/{ => unapplied}/server/0247-Mob-Pathfinding-API.patch (100%) rename patches/{ => unapplied}/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch (100%) rename patches/{ => unapplied}/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch (100%) rename patches/{ => unapplied}/server/0250-Implement-furnace-cook-speed-multiplier-API.patch (100%) rename patches/{ => unapplied}/server/0251-Honor-EntityAgeable.ageLock.patch (100%) rename patches/{ => unapplied}/server/0252-Configurable-connection-throttle-kick-message.patch (100%) rename patches/{ => unapplied}/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch (100%) rename patches/{ => unapplied}/server/0254-PreSpawnerSpawnEvent.patch (100%) rename patches/{ => unapplied}/server/0255-Add-LivingEntity-getTargetEntity.patch (100%) rename patches/{ => unapplied}/server/0256-Add-sun-related-API.patch (100%) rename patches/{ => unapplied}/server/0257-Catch-JsonParseException-in-block-entity-names.patch (100%) rename patches/{ => unapplied}/server/0258-Turtle-API.patch (100%) rename patches/{ => unapplied}/server/0259-Call-player-spectator-target-events-and-improve-impl.patch (100%) rename patches/{ => unapplied}/server/0260-Add-more-Witch-API.patch (100%) rename patches/{ => unapplied}/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch (100%) rename patches/{ => unapplied}/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch (100%) rename patches/{ => unapplied}/server/0263-Reset-players-airTicks-on-respawn.patch (100%) rename patches/{ => unapplied}/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch (100%) rename patches/{ => unapplied}/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch (98%) rename patches/{ => unapplied}/server/0266-Optimize-World-Time-Updates.patch (96%) rename patches/{ => unapplied}/server/0267-Restore-custom-InventoryHolder-support.patch (100%) rename patches/{ => unapplied}/server/0268-Fix-SpongeAbsortEvent-handling.patch (100%) rename patches/{ => unapplied}/server/0269-Don-t-allow-digging-into-unloaded-chunks.patch (98%) rename patches/{ => unapplied}/server/0270-Make-the-default-permission-message-configurable.patch (95%) rename patches/{ => unapplied}/server/0271-force-entity-dismount-during-teleportation.patch (100%) rename patches/{ => unapplied}/server/0272-Add-more-Zombie-API.patch (100%) rename patches/{ => unapplied}/server/0273-Book-Size-Limits.patch (100%) rename patches/{ => unapplied}/server/0274-Add-PlayerConnectionCloseEvent.patch (100%) rename patches/{ => unapplied}/server/0275-Replace-OfflinePlayer-getLastPlayed.patch (97%) rename patches/{ => unapplied}/server/0276-Workaround-for-vehicle-tracking-issue-on-disconnect.patch (91%) rename patches/{ => unapplied}/server/0277-Dont-block-Player-remove-if-the-handle-is-a-custom-p.patch (92%) rename patches/{ => unapplied}/server/0278-BlockDestroyEvent.patch (100%) rename patches/{ => unapplied}/server/0279-Async-command-map-building.patch (97%) rename patches/{ => unapplied}/server/0280-Brigadier-Mojang-API.patch (100%) rename patches/{ => unapplied}/server/0281-Improve-exact-choice-recipe-ingredients.patch (100%) rename patches/{ => unapplied}/server/0282-Limit-Client-Sign-length-more.patch (100%) rename patches/{ => unapplied}/server/0283-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch (100%) rename patches/{ => unapplied}/server/0284-Entity-getEntitySpawnReason.patch (98%) rename patches/{ => unapplied}/server/0285-Fire-event-on-GS4-query.patch (100%) rename patches/{ => unapplied}/server/0286-Add-PlayerPostRespawnEvent.patch (100%) rename patches/{ => unapplied}/server/0287-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch (100%) rename patches/{ => unapplied}/server/0288-Server-Tick-Events.patch (94%) rename patches/{ => unapplied}/server/0289-PlayerDeathEvent-getItemsToKeep.patch (97%) rename patches/{ => unapplied}/server/0290-Optimize-Captured-BlockEntity-Lookup.patch (100%) rename patches/{ => unapplied}/server/0291-Add-Heightmap-API.patch (95%) rename patches/{ => unapplied}/server/0292-Mob-Spawner-API-Enhancements.patch (100%) rename patches/{ => unapplied}/server/0293-Fix-CB-call-to-changed-postToMainThread-method.patch (100%) rename patches/{ => unapplied}/server/0294-Fix-sounds-when-item-frames-are-modified-MC-123450.patch (100%) rename patches/{ => unapplied}/server/0295-Implement-CraftBlockSoundGroup.patch (100%) rename patches/{ => unapplied}/server/0296-Expose-the-internal-current-tick.patch (100%) rename patches/{ => unapplied}/server/0297-Show-blockstate-location-if-we-failed-to-read-it.patch (100%) rename patches/{ => unapplied}/server/0298-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch (100%) rename patches/{ => unapplied}/server/0299-Configurable-projectile-relative-velocity.patch (100%) rename patches/{ => unapplied}/server/0300-offset-item-frame-ticking.patch (100%) rename patches/{ => unapplied}/server/0301-Prevent-consuming-the-wrong-itemstack.patch (100%) rename patches/{ => unapplied}/server/0302-Dont-send-unnecessary-sign-update.patch (100%) rename patches/{ => unapplied}/server/0303-Add-option-to-disable-pillager-patrols.patch (100%) rename patches/{ => unapplied}/server/0304-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch (100%) rename patches/{ => unapplied}/server/0305-MC-145656-Fix-Follow-Range-Initial-Target.patch (100%) rename patches/{ => unapplied}/server/0306-Duplicate-UUID-Resolve-Option.patch (100%) rename patches/{ => unapplied}/server/0307-PlayerDeathEvent-shouldDropExperience.patch (91%) rename patches/{ => unapplied}/server/0308-Prevent-bees-loading-chunks-checking-hive-position.patch (100%) rename patches/{ => unapplied}/server/0309-Don-t-load-Chunks-from-Hoppers-and-other-things.patch (100%) rename patches/{ => unapplied}/server/0310-Optimise-EntityGetter-getPlayerByUUID.patch (100%) rename patches/{ => unapplied}/server/0311-Fix-items-not-falling-correctly.patch (100%) rename patches/{ => unapplied}/server/0312-Optimize-call-to-getFluid-for-explosions.patch (92%) rename patches/{ => unapplied}/server/0313-Guard-against-serializing-mismatching-chunk-coordina.patch (100%) rename patches/{ => unapplied}/server/0314-Alternative-item-despawn-rate.patch (100%) rename patches/{ => unapplied}/server/0315-Tracking-Range-Improvements.patch (100%) rename patches/{ => unapplied}/server/0316-Bees-get-gravity-in-void.-Fixes-MC-167279.patch (100%) rename patches/{ => unapplied}/server/0317-Improve-Block-breakNaturally-API.patch (100%) rename patches/{ => unapplied}/server/0318-Optimise-getChunkAt-calls-for-loaded-chunks.patch (96%) rename patches/{ => unapplied}/server/0319-Add-debug-for-sync-chunk-loads.patch (98%) rename patches/{ => unapplied}/server/0320-Improve-java-version-check.patch (96%) rename patches/{ => unapplied}/server/0321-Add-ThrownEggHatchEvent.patch (100%) rename patches/{ => unapplied}/server/0322-Entity-Jump-API.patch (100%) rename patches/{ => unapplied}/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch (96%) rename patches/{ => unapplied}/server/0324-Make-the-GUI-graph-fancier.patch (100%) rename patches/{ => unapplied}/server/0325-add-hand-to-BlockMultiPlaceEvent.patch (93%) rename patches/{ => unapplied}/server/0326-Validate-tripwire-hook-placement-before-update.patch (100%) rename patches/{ => unapplied}/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch (100%) rename patches/{ => unapplied}/server/0328-Configurable-chance-of-villager-zombie-infection.patch (100%) rename patches/{ => unapplied}/server/0329-Optimise-Chunk-getFluid.patch (100%) rename patches/{ => unapplied}/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch (89%) rename patches/{ => unapplied}/server/0331-Add-tick-times-API-and-mspt-command.patch (100%) rename patches/{ => unapplied}/server/0332-Expose-MinecraftServer-isRunning.patch (100%) rename patches/{ => unapplied}/server/0333-Add-Raw-Byte-ItemStack-Serialization.patch (100%) rename patches/{ => unapplied}/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch (98%) rename patches/{ => unapplied}/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch (95%) rename patches/{ => unapplied}/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch (100%) rename patches/{ => unapplied}/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch (100%) rename patches/{ => unapplied}/server/0338-Don-t-tick-dead-players.patch (91%) rename patches/{ => unapplied}/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch (90%) rename patches/{ => unapplied}/server/0340-Don-t-move-existing-players-to-world-spawn.patch (96%) rename patches/{ => unapplied}/server/0341-Optimize-Pathfinding.patch (100%) rename patches/{ => unapplied}/server/0342-Reduce-Either-Optional-allocation.patch (100%) rename patches/{ => unapplied}/server/0343-Reduce-memory-footprint-of-CompoundTag.patch (100%) rename patches/{ => unapplied}/server/0344-Prevent-opening-inventories-when-frozen.patch (97%) rename patches/{ => unapplied}/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch (100%) rename patches/{ => unapplied}/server/0346-Implement-Player-Client-Options-API.patch (98%) rename patches/{ => unapplied}/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch (100%) rename patches/{ => unapplied}/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch (98%) rename patches/{ => unapplied}/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch (98%) rename patches/{ => unapplied}/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch (100%) rename patches/{ => unapplied}/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch (100%) rename patches/{ => unapplied}/server/0352-Add-phantom-creative-and-insomniac-controls.patch (100%) rename patches/{ => unapplied}/server/0353-Fix-item-duplication-and-teleport-issues.patch (97%) rename patches/{ => unapplied}/server/0354-Villager-Restocks-API.patch (100%) rename patches/{ => unapplied}/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch (100%) rename patches/{ => unapplied}/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch (93%) rename patches/{ => unapplied}/server/0357-misc-debugging-dumps.patch (100%) rename patches/{ => unapplied}/server/0358-Prevent-teleporting-dead-entities.patch (100%) rename patches/{ => unapplied}/server/0359-Implement-Mob-Goal-API.patch (100%) rename patches/{ => unapplied}/server/0360-Add-villager-reputation-API.patch (100%) rename patches/{ => unapplied}/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch (98%) rename patches/{ => unapplied}/server/0362-Fix-PotionEffect-ignores-icon-flag.patch (100%) rename patches/{ => unapplied}/server/0363-Potential-bed-API.patch (100%) rename patches/{ => unapplied}/server/0364-Wait-for-Async-Tasks-during-shutdown.patch (100%) rename patches/{ => unapplied}/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch (100%) rename patches/{ => unapplied}/server/0366-Ensure-safe-gateway-teleport.patch (100%) rename patches/{ => unapplied}/server/0367-Add-option-for-console-having-all-permissions.patch (100%) rename patches/{ => unapplied}/server/0368-Fix-villager-trading-demand-MC-163962.patch (100%) rename patches/{ => unapplied}/server/0369-Maps-shouldn-t-load-chunks.patch (100%) rename patches/{ => unapplied}/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch (100%) rename patches/{ => unapplied}/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch (100%) rename patches/{ => unapplied}/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch (100%) rename patches/{ => unapplied}/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch (100%) rename patches/{ => unapplied}/server/0374-Prevent-position-desync-causing-tp-exploit.patch (100%) rename patches/{ => unapplied}/server/0375-Inventory-getHolder-method-without-block-snapshot.patch (100%) rename patches/{ => unapplied}/server/0376-Add-PlayerRecipeBookClickEvent.patch (100%) rename patches/{ => unapplied}/server/0377-Hide-sync-chunk-writes-behind-flag.patch (100%) rename patches/{ => unapplied}/server/0378-Add-permission-for-command-blocks.patch (100%) rename patches/{ => unapplied}/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch (97%) rename patches/{ => unapplied}/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch (98%) rename patches/{ => unapplied}/server/0381-Paper-dumpitem-command.patch (98%) rename patches/{ => unapplied}/server/0382-Improve-Legacy-Component-serialization-size.patch (100%) rename patches/{ => unapplied}/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch (100%) rename patches/{ => unapplied}/server/0384-Add-BlockStateMeta-clearBlockState.patch (100%) rename patches/{ => unapplied}/server/0385-Convert-legacy-attributes-in-Item-Meta.patch (100%) rename patches/{ => unapplied}/server/0386-Do-not-accept-invalid-client-settings.patch (100%) rename patches/{ => unapplied}/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0388-Add-entity-liquid-API.patch (100%) rename patches/{ => unapplied}/server/0389-Add-PrepareResultEvent.patch (99%) rename patches/{ => unapplied}/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch (100%) rename patches/{ => unapplied}/server/0391-Fix-arrows-never-despawning-MC-125757.patch (91%) rename patches/{ => unapplied}/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch (100%) rename patches/{ => unapplied}/server/0393-Fix-SPIGOT-5989.patch (100%) rename patches/{ => unapplied}/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch (100%) rename patches/{ => unapplied}/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch (100%) rename patches/{ => unapplied}/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch (100%) rename patches/{ => unapplied}/server/0397-Optimize-NetworkManager-Exception-Handling.patch (100%) rename patches/{ => unapplied}/server/0398-Fix-some-rails-connecting-improperly.patch (100%) rename patches/{ => unapplied}/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch (100%) rename patches/{ => unapplied}/server/0400-Brand-support.patch (100%) rename patches/{ => unapplied}/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch (100%) rename patches/{ => unapplied}/server/0402-Don-t-require-FACING-data.patch (100%) rename patches/{ => unapplied}/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch (96%) rename patches/{ => unapplied}/server/0404-Add-moon-phase-API.patch (100%) rename patches/{ => unapplied}/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch (100%) rename patches/{ => unapplied}/server/0406-Prevent-headless-pistons-from-being-created.patch (95%) rename patches/{ => unapplied}/server/0407-Add-BellRingEvent.patch (93%) rename patches/{ => unapplied}/server/0408-Add-zombie-targets-turtle-egg-config.patch (100%) rename patches/{ => unapplied}/server/0409-Buffer-joins-to-world.patch (100%) rename patches/{ => unapplied}/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch (100%) rename patches/{ => unapplied}/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch (98%) rename patches/{ => unapplied}/server/0412-Add-more-Evoker-API.patch (100%) rename patches/{ => unapplied}/server/0413-Add-methods-to-get-translation-keys.patch (100%) rename patches/{ => unapplied}/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch (100%) rename patches/{ => unapplied}/server/0415-Cache-block-data-strings.patch (97%) rename patches/{ => unapplied}/server/0416-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch (98%) rename patches/{ => unapplied}/server/0417-Add-additional-open-container-api-to-HumanEntity.patch (100%) rename patches/{ => unapplied}/server/0418-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch (100%) rename patches/{ => unapplied}/server/0419-Extend-block-drop-capture-to-capture-all-items-added.patch (100%) rename patches/{ => unapplied}/server/0420-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch (100%) rename patches/{ => unapplied}/server/0421-Lazily-track-plugin-scoreboards-by-default.patch (100%) rename patches/{ => unapplied}/server/0422-Entity-isTicking.patch (94%) rename patches/{ => unapplied}/server/0423-Fix-deop-kicking-non-whitelisted-player-when-white-l.patch (94%) rename patches/{ => unapplied}/server/0424-Fix-Concurrency-issue-in-ShufflingList.patch (100%) rename patches/{ => unapplied}/server/0425-Reset-Ender-Crystals-on-Dragon-Spawn.patch (100%) rename patches/{ => unapplied}/server/0426-Fix-for-large-move-vectors-crashing-server.patch (100%) rename patches/{ => unapplied}/server/0427-Optimise-getType-calls.patch (100%) rename patches/{ => unapplied}/server/0428-Villager-resetOffers.patch (100%) rename patches/{ => unapplied}/server/0429-Retain-block-place-order-when-capturing-blockstates.patch (100%) rename patches/{ => unapplied}/server/0430-Fix-item-locations-dropped-from-campfires.patch (100%) rename patches/{ => unapplied}/server/0431-Fix-bell-block-entity-memory-leak.patch (100%) rename patches/{ => unapplied}/server/0432-Avoid-error-bubbling-up-when-item-stack-is-empty-in-.patch (97%) rename patches/{ => unapplied}/server/0433-Add-getOfflinePlayerIfCached-String.patch (100%) rename patches/{ => unapplied}/server/0434-Add-ignore-discounts-API.patch (100%) rename patches/{ => unapplied}/server/0435-Toggle-for-removing-existing-dragon.patch (100%) rename patches/{ => unapplied}/server/0436-Fix-client-lag-on-advancement-loading.patch (100%) rename patches/{ => unapplied}/server/0437-Item-no-age-no-player-pickup.patch (100%) rename patches/{ => unapplied}/server/0438-Beacon-API-custom-effect-ranges.patch (100%) rename patches/{ => unapplied}/server/0439-Add-API-for-quit-reason.patch (100%) rename patches/{ => unapplied}/server/0440-Add-Wandering-Trader-spawn-rate-config-options.patch (100%) rename patches/{ => unapplied}/server/0441-Expose-world-spawn-angle.patch (100%) rename patches/{ => unapplied}/server/0442-Add-Destroy-Speed-API.patch (100%) rename patches/{ => unapplied}/server/0443-Fix-Player-spawnParticle-x-y-z-precision-loss.patch (100%) rename patches/{ => unapplied}/server/0444-Add-LivingEntity-clearActiveItem.patch (100%) rename patches/{ => unapplied}/server/0445-Add-PlayerItemCooldownEvent.patch (100%) rename patches/{ => unapplied}/server/0446-Significantly-improve-performance-of-the-end-generat.patch (100%) rename patches/{ => unapplied}/server/0447-More-lightning-API.patch (100%) rename patches/{ => unapplied}/server/0448-Climbing-should-not-bypass-cramming-gamerule.patch (100%) rename patches/{ => unapplied}/server/0449-Add-missing-default-perms-for-commands.patch (100%) rename patches/{ => unapplied}/server/0450-Add-PlayerShearBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0451-Limit-recipe-packets.patch (100%) rename patches/{ => unapplied}/server/0452-Fix-CraftSound-backwards-compatibility.patch (100%) rename patches/{ => unapplied}/server/0453-Player-Chunk-Load-Unload-Events.patch (100%) rename patches/{ => unapplied}/server/0454-Optimize-Dynamic-get-Missing-Keys.patch (100%) rename patches/{ => unapplied}/server/0455-Expose-LivingEntity-hurt-direction.patch (96%) rename patches/{ => unapplied}/server/0456-Add-OBSTRUCTED-reason-to-BedEnterResult.patch (91%) rename patches/{ => unapplied}/server/0457-Fix-crash-from-invalid-ingredient-lists-in-VillagerA.patch (100%) rename patches/{ => unapplied}/server/0458-Add-TargetHitEvent.patch (100%) rename patches/{ => unapplied}/server/0459-MC-4-Fix-item-position-desync.patch (96%) rename patches/{ => unapplied}/server/0460-Additional-Block-Material-API.patch (100%) rename patches/{ => unapplied}/server/0461-Fix-harming-potion-dupe.patch (100%) rename patches/{ => unapplied}/server/0462-API-to-get-Material-from-Boats-and-Minecarts.patch (100%) rename patches/{ => unapplied}/server/0463-Allow-disabling-mob-spawner-spawn-egg-transformation.patch (100%) rename patches/{ => unapplied}/server/0464-Fix-Not-a-string-Map-Conversion-spam.patch (100%) rename patches/{ => unapplied}/server/0465-Add-PlayerFlowerPotManipulateEvent.patch (100%) rename patches/{ => unapplied}/server/0466-Fix-interact-event-not-being-called-sometimes.patch (100%) rename patches/{ => unapplied}/server/0467-Zombie-API-breaking-doors.patch (100%) rename patches/{ => unapplied}/server/0468-Fix-nerfed-slime-when-splitting.patch (100%) rename patches/{ => unapplied}/server/0469-Add-EntityLoadCrossbowEvent.patch (100%) rename patches/{ => unapplied}/server/0470-Add-WorldGameRuleChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0471-Add-ServerResourcesReloadedEvent.patch (97%) rename patches/{ => unapplied}/server/0472-Add-world-settings-for-mobs-picking-up-loot.patch (100%) rename patches/{ => unapplied}/server/0473-Add-BlockFailedDispenseEvent.patch (100%) rename patches/{ => unapplied}/server/0474-Add-PlayerLecternPageChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0475-Add-PlayerLoomPatternSelectEvent.patch (100%) rename patches/{ => unapplied}/server/0476-Configurable-door-breaking-difficulty.patch (100%) rename patches/{ => unapplied}/server/0477-Empty-commands-shall-not-be-dispatched.patch (100%) rename patches/{ => unapplied}/server/0478-Remove-stale-POIs.patch (100%) rename patches/{ => unapplied}/server/0479-Fix-villager-boat-exploit.patch (100%) rename patches/{ => unapplied}/server/0480-Add-sendOpLevel-API.patch (96%) rename patches/{ => unapplied}/server/0481-Add-RegistryAccess-for-managing-Registries.patch (100%) rename patches/{ => unapplied}/server/0482-Add-StructuresLocateEvent.patch (100%) rename patches/{ => unapplied}/server/0483-Collision-option-for-requiring-a-player-participant.patch (97%) rename patches/{ => unapplied}/server/0484-Remove-ProjectileHitEvent-call-when-fireballs-dead.patch (100%) rename patches/{ => unapplied}/server/0485-Return-chat-component-with-empty-text-instead-of-thr.patch (100%) rename patches/{ => unapplied}/server/0486-Make-schedule-command-per-world.patch (100%) rename patches/{ => unapplied}/server/0487-Configurable-max-leash-distance.patch (100%) rename patches/{ => unapplied}/server/0488-Add-BlockPreDispenseEvent.patch (100%) rename patches/{ => unapplied}/server/0489-Add-PlayerChangeBeaconEffectEvent.patch (100%) rename patches/{ => unapplied}/server/0490-Add-toggle-for-always-placing-the-dragon-egg.patch (100%) rename patches/{ => unapplied}/server/0491-Add-PlayerStonecutterRecipeSelectEvent.patch (100%) rename patches/{ => unapplied}/server/0492-Expand-EntityUnleashEvent.patch (98%) rename patches/{ => unapplied}/server/0493-Reset-shield-blocking-on-dimension-change.patch (100%) rename patches/{ => unapplied}/server/0494-Add-DragonEggFormEvent.patch (100%) rename patches/{ => unapplied}/server/0495-Add-EntityMoveEvent.patch (97%) rename patches/{ => unapplied}/server/0496-added-option-to-disable-pathfinding-updates-on-block.patch (100%) rename patches/{ => unapplied}/server/0497-Inline-shift-direction-fields.patch (100%) rename patches/{ => unapplied}/server/0498-Allow-adding-items-to-BlockDropItemEvent.patch (95%) rename patches/{ => unapplied}/server/0499-Add-getMainThreadExecutor-to-BukkitScheduler.patch (100%) rename patches/{ => unapplied}/server/0500-living-entity-allow-attribute-registration.patch (96%) rename patches/{ => unapplied}/server/0501-fix-dead-slime-setSize-invincibility.patch (100%) rename patches/{ => unapplied}/server/0502-Merchant-getRecipes-should-return-an-immutable-list.patch (100%) rename patches/{ => unapplied}/server/0503-Expose-Tracked-Players.patch (100%) rename patches/{ => unapplied}/server/0504-Improve-ServerGUI.patch (100%) rename patches/{ => unapplied}/server/0505-fix-converting-txt-to-json-file.patch (97%) rename patches/{ => unapplied}/server/0506-Add-worldborder-events.patch (100%) rename patches/{ => unapplied}/server/0507-Add-PlayerNameEntityEvent.patch (100%) rename patches/{ => unapplied}/server/0508-Add-recipe-to-cook-events.patch (100%) rename patches/{ => unapplied}/server/0509-Add-Block-isValidTool.patch (100%) rename patches/{ => unapplied}/server/0510-Allow-using-signs-inside-spawn-protection.patch (100%) rename patches/{ => unapplied}/server/0511-Expand-world-key-API.patch (100%) rename patches/{ => unapplied}/server/0512-Add-fast-alternative-constructor-for-Rotations.patch (100%) rename patches/{ => unapplied}/server/0513-Drop-carried-item-when-player-has-disconnected.patch (100%) rename patches/{ => unapplied}/server/0514-forced-whitelist-use-configurable-kick-message.patch (92%) rename patches/{ => unapplied}/server/0515-Don-t-ignore-result-of-PlayerEditBookEvent.patch (100%) rename patches/{ => unapplied}/server/0516-Expose-protocol-version.patch (100%) rename patches/{ => unapplied}/server/0517-Enhance-console-tab-completions-for-brigadier-comman.patch (99%) rename patches/{ => unapplied}/server/0518-Fix-PlayerItemConsumeEvent-cancelling-properly.patch (100%) rename patches/{ => unapplied}/server/0519-Add-bypass-host-check.patch (100%) rename patches/{ => unapplied}/server/0520-Set-area-affect-cloud-rotation.patch (100%) rename patches/{ => unapplied}/server/0521-add-isDeeplySleeping-to-HumanEntity.patch (100%) rename patches/{ => unapplied}/server/0522-add-consumeFuel-to-FurnaceBurnEvent.patch (100%) rename patches/{ => unapplied}/server/0523-add-get-set-drop-chance-to-EntityEquipment.patch (100%) rename patches/{ => unapplied}/server/0524-fix-PigZombieAngerEvent-cancellation.patch (100%) rename patches/{ => unapplied}/server/0525-fix-PlayerItemHeldEvent-firing-twice.patch (100%) rename patches/{ => unapplied}/server/0526-Add-PlayerDeepSleepEvent.patch (92%) rename patches/{ => unapplied}/server/0527-More-World-API.patch (100%) rename patches/{ => unapplied}/server/0528-Add-PlayerBedFailEnterEvent.patch (100%) rename patches/{ => unapplied}/server/0529-Implement-methods-to-convert-between-Component-and-B.patch (96%) rename patches/{ => unapplied}/server/0530-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch (100%) rename patches/{ => unapplied}/server/0531-Introduce-beacon-activation-deactivation-events.patch (100%) rename patches/{ => unapplied}/server/0532-Add-Channel-initialization-listeners.patch (100%) rename patches/{ => unapplied}/server/0533-Send-empty-commands-if-tab-completion-is-disabled.patch (100%) rename patches/{ => unapplied}/server/0534-Add-more-WanderingTrader-API.patch (100%) rename patches/{ => unapplied}/server/0535-Add-EntityBlockStorage-clearEntities.patch (100%) rename patches/{ => unapplied}/server/0536-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch (100%) rename patches/{ => unapplied}/server/0537-Add-HiddenPotionEffect-API.patch (100%) rename patches/{ => unapplied}/server/0538-Inventory-close.patch (100%) rename patches/{ => unapplied}/server/0539-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch (100%) rename patches/{ => unapplied}/server/0540-Add-basic-Datapack-API.patch (100%) rename patches/{ => unapplied}/server/0541-Add-environment-variable-to-disable-server-gui.patch (100%) rename patches/{ => unapplied}/server/0542-Expand-PlayerGameModeChangeEvent.patch (99%) rename patches/{ => unapplied}/server/0543-ItemStack-repair-check-API.patch (100%) rename patches/{ => unapplied}/server/0544-More-Enchantment-API.patch (100%) rename patches/{ => unapplied}/server/0545-Move-range-check-for-block-placing-up.patch (100%) rename patches/{ => unapplied}/server/0546-Add-Mob-lookAt-API.patch (100%) rename patches/{ => unapplied}/server/0547-Correctly-check-if-bucket-dispenses-will-succeed-for.patch (100%) rename patches/{ => unapplied}/server/0548-Add-Unix-domain-socket-support.patch (98%) rename patches/{ => unapplied}/server/0549-Add-EntityInsideBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0550-Improve-item-default-attribute-API.patch (100%) rename patches/{ => unapplied}/server/0551-Add-cause-to-Weather-ThunderChangeEvents.patch (100%) rename patches/{ => unapplied}/server/0552-More-Lidded-Block-API.patch (100%) rename patches/{ => unapplied}/server/0553-Limit-item-frame-cursors-on-maps.patch (100%) rename patches/{ => unapplied}/server/0554-Add-PlayerKickEvent-causes.patch (99%) rename patches/{ => unapplied}/server/0555-Add-PufferFishStateChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0556-Fix-PlayerBucketEmptyEvent-result-itemstack.patch (100%) rename patches/{ => unapplied}/server/0557-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch (100%) rename patches/{ => unapplied}/server/0558-Add-option-to-fix-items-merging-through-walls.patch (100%) rename patches/{ => unapplied}/server/0559-Add-BellRevealRaiderEvent.patch (100%) rename patches/{ => unapplied}/server/0560-Fix-invulnerable-end-crystals.patch (100%) rename patches/{ => unapplied}/server/0561-Add-ElderGuardianAppearanceEvent.patch (100%) rename patches/{ => unapplied}/server/0562-Fix-dangerous-end-portal-logic.patch (97%) rename patches/{ => unapplied}/server/0563-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch (100%) rename patches/{ => unapplied}/server/0564-Line-Of-Sight-Changes.patch (100%) rename patches/{ => unapplied}/server/0565-add-per-world-spawn-limits.patch (91%) rename patches/{ => unapplied}/server/0566-Fix-potions-splash-events.patch (99%) rename patches/{ => unapplied}/server/0567-Add-more-LimitedRegion-API.patch (100%) rename patches/{ => unapplied}/server/0568-Fix-PlayerDropItemEvent-using-wrong-item.patch (97%) rename patches/{ => unapplied}/server/0569-Missing-Entity-API.patch (99%) rename patches/{ => unapplied}/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch (100%) rename patches/{ => unapplied}/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch (100%) rename patches/{ => unapplied}/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch (100%) rename patches/{ => unapplied}/server/0573-Fix-commands-from-signs-not-firing-command-events.patch (100%) rename patches/{ => unapplied}/server/0574-Add-PlayerArmSwingEvent.patch (100%) rename patches/{ => unapplied}/server/0575-Fix-kick-event-leave-message-not-being-sent.patch (100%) rename patches/{ => unapplied}/server/0576-Don-t-apply-cramming-damage-to-players.patch (100%) rename patches/{ => unapplied}/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch (100%) rename patches/{ => unapplied}/server/0578-Add-missing-forceDrop-toggles.patch (100%) rename patches/{ => unapplied}/server/0579-Stinger-API.patch (100%) rename patches/{ => unapplied}/server/0580-Add-System.out-err-catcher.patch (100%) rename patches/{ => unapplied}/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch (100%) rename patches/{ => unapplied}/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch (100%) rename patches/{ => unapplied}/server/0583-Add-PlayerSetSpawnEvent.patch (99%) rename patches/{ => unapplied}/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch (100%) rename patches/{ => unapplied}/server/0585-Optimize-entity-tracker-passenger-checks.patch (100%) rename patches/{ => unapplied}/server/0586-Config-option-for-Piglins-guarding-chests.patch (100%) rename patches/{ => unapplied}/server/0587-Add-EntityDamageItemEvent.patch (97%) rename patches/{ => unapplied}/server/0588-Optimize-indirect-passenger-iteration.patch (96%) rename patches/{ => unapplied}/server/0589-Configurable-item-frame-map-cursor-update-interval.patch (100%) rename patches/{ => unapplied}/server/0590-Clear-bucket-NBT-after-dispense.patch (100%) rename patches/{ => unapplied}/server/0591-Change-EnderEye-target-without-changing-other-things.patch (100%) rename patches/{ => unapplied}/server/0592-Add-BlockBreakBlockEvent.patch (100%) rename patches/{ => unapplied}/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch (100%) rename patches/{ => unapplied}/server/0594-More-CommandBlock-API.patch (100%) rename patches/{ => unapplied}/server/0595-Add-missing-team-sidebar-display-slots.patch (100%) rename patches/{ => unapplied}/server/0596-Add-back-EntityPortalExitEvent.patch (97%) rename patches/{ => unapplied}/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch (100%) rename patches/{ => unapplied}/server/0598-Get-entity-default-attributes.patch (100%) rename patches/{ => unapplied}/server/0599-Left-handed-API.patch (100%) rename patches/{ => unapplied}/server/0600-Add-more-advancement-API.patch (100%) rename patches/{ => unapplied}/server/0601-Add-ItemFactory-getSpawnEgg-API.patch (100%) rename patches/{ => unapplied}/server/0602-Add-critical-damage-API.patch (100%) rename patches/{ => unapplied}/server/0603-Fix-issues-with-mob-conversion.patch (100%) rename patches/{ => unapplied}/server/0604-Add-hasCollision-methods-to-various-places.patch (100%) rename patches/{ => unapplied}/server/0605-Goat-ram-API.patch (100%) rename patches/{ => unapplied}/server/0606-Add-API-for-resetting-a-single-score.patch (100%) rename patches/{ => unapplied}/server/0607-Add-Raw-Byte-Entity-Serialization.patch (100%) rename patches/{ => unapplied}/server/0608-Vanilla-command-permission-fixes.patch (100%) rename patches/{ => unapplied}/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch (97%) rename patches/{ => unapplied}/server/0610-Fix-GameProfileCache-concurrency.patch (100%) rename patches/{ => unapplied}/server/0611-Improve-and-expand-AsyncCatcher.patch (100%) rename patches/{ => unapplied}/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch (99%) rename patches/{ => unapplied}/server/0613-Sanitize-ResourceLocation-error-logging.patch (100%) rename patches/{ => unapplied}/server/0614-Manually-inline-methods-in-BlockPosition.patch (100%) rename patches/{ => unapplied}/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch (100%) rename patches/{ => unapplied}/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch (100%) rename patches/{ => unapplied}/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch (100%) rename patches/{ => unapplied}/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch (100%) rename patches/{ => unapplied}/server/0619-Time-scoreboard-search.patch (100%) rename patches/{ => unapplied}/server/0620-Oprimise-map-impl-for-tracked-players.patch (100%) rename patches/{ => unapplied}/server/0621-Add-missing-InventoryType.patch (100%) rename patches/{ => unapplied}/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch (100%) rename patches/{ => unapplied}/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch (100%) rename patches/{ => unapplied}/server/0624-Check-requirement-before-suggesting-root-nodes.patch (100%) rename patches/{ => unapplied}/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch (100%) rename patches/{ => unapplied}/server/0626-Add-packet-limiter-config.patch (100%) rename patches/{ => unapplied}/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch (100%) rename patches/{ => unapplied}/server/0628-Ensure-valid-vehicle-status.patch (100%) rename patches/{ => unapplied}/server/0629-Prevent-softlocked-end-exit-portal-generation.patch (100%) rename patches/{ => unapplied}/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch (100%) rename patches/{ => unapplied}/server/0631-Don-t-log-debug-logging-being-disabled.patch (100%) rename patches/{ => unapplied}/server/0632-fix-various-menus-with-empty-level-accesses.patch (100%) rename patches/{ => unapplied}/server/0633-Preserve-overstacked-loot.patch (100%) rename patches/{ => unapplied}/server/0634-Update-head-rotation-in-missing-places.patch (93%) rename patches/{ => unapplied}/server/0635-prevent-unintended-light-block-manipulation.patch (100%) rename patches/{ => unapplied}/server/0636-Fix-CraftCriteria-defaults-map.patch (100%) rename patches/{ => unapplied}/server/0637-Fix-upstreams-block-state-factories.patch (99%) rename patches/{ => unapplied}/server/0638-Configurable-feature-seeds.patch (100%) rename patches/{ => unapplied}/server/0639-Add-root-admin-user-detection.patch (97%) rename patches/{ => unapplied}/server/0640-don-t-attempt-to-teleport-dead-entities.patch (91%) rename patches/{ => unapplied}/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch (100%) rename patches/{ => unapplied}/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch (100%) rename patches/{ => unapplied}/server/0643-Fix-Spigot-growth-modifiers.patch (98%) rename patches/{ => unapplied}/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch (100%) rename patches/{ => unapplied}/server/0645-Add-PlayerItemFrameChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0646-Optimize-HashMapPalette.patch (100%) rename patches/{ => unapplied}/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch (100%) rename patches/{ => unapplied}/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch (100%) rename patches/{ => unapplied}/server/0649-Add-more-Campfire-API.patch (100%) rename patches/{ => unapplied}/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch (100%) rename patches/{ => unapplied}/server/0651-Forward-CraftEntity-in-teleport-command.patch (95%) rename patches/{ => unapplied}/server/0652-Improve-scoreboard-entries.patch (100%) rename patches/{ => unapplied}/server/0653-Entity-powdered-snow-API.patch (100%) rename patches/{ => unapplied}/server/0654-Add-API-for-item-entity-health.patch (100%) rename patches/{ => unapplied}/server/0655-Configurable-max-block-light-for-monster-spawning.patch (100%) rename patches/{ => unapplied}/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch (100%) rename patches/{ => unapplied}/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch (100%) rename patches/{ => unapplied}/server/0658-Bucketable-API.patch (100%) rename patches/{ => unapplied}/server/0659-Validate-usernames.patch (100%) rename patches/{ => unapplied}/server/0660-Make-water-animal-spawn-height-configurable.patch (100%) rename patches/{ => unapplied}/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch (100%) rename patches/{ => unapplied}/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch (100%) rename patches/{ => unapplied}/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch (100%) rename patches/{ => unapplied}/server/0664-Multiple-Entries-with-Scoreboards.patch (100%) rename patches/{ => unapplied}/server/0665-Reset-placed-block-on-exception.patch (100%) rename patches/{ => unapplied}/server/0666-Add-configurable-height-for-slime-spawn.patch (100%) rename patches/{ => unapplied}/server/0667-Fix-xp-reward-for-baby-zombies.patch (100%) rename patches/{ => unapplied}/server/0668-Multi-Block-Change-API-Implementation.patch (97%) rename patches/{ => unapplied}/server/0669-Fix-NotePlayEvent.patch (100%) rename patches/{ => unapplied}/server/0670-Freeze-Tick-Lock-API.patch (100%) rename patches/{ => unapplied}/server/0671-More-PotionEffectType-API.patch (100%) rename patches/{ => unapplied}/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch (100%) rename patches/{ => unapplied}/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch (100%) rename patches/{ => unapplied}/server/0674-Add-missing-structure-set-seed-configs.patch (99%) rename patches/{ => unapplied}/server/0675-Implement-regenerateChunk.patch (98%) rename patches/{ => unapplied}/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch (95%) rename patches/{ => unapplied}/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch (100%) rename patches/{ => unapplied}/server/0678-Add-GameEvent-tags.patch (100%) rename patches/{ => unapplied}/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch (94%) rename patches/{ => unapplied}/server/0680-Furnace-RecipesUsed-API.patch (100%) rename patches/{ => unapplied}/server/0681-Configurable-sculk-sensor-listener-range.patch (100%) rename patches/{ => unapplied}/server/0682-Add-missing-block-data-mins-and-maxes.patch (100%) rename patches/{ => unapplied}/server/0683-Option-to-have-default-CustomSpawners-in-custom-worl.patch (96%) rename patches/{ => unapplied}/server/0684-Put-world-into-worldlist-before-initing-the-world.patch (100%) rename patches/{ => unapplied}/server/0685-Fix-Entity-Position-Desync.patch (100%) rename patches/{ => unapplied}/server/0686-Custom-Potion-Mixes.patch (100%) rename patches/{ => unapplied}/server/0687-Force-close-world-loading-screen.patch (100%) rename patches/{ => unapplied}/server/0688-Fix-falling-block-spawn-methods.patch (100%) rename patches/{ => unapplied}/server/0689-Expose-furnace-minecart-push-values.patch (100%) rename patches/{ => unapplied}/server/0690-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch (95%) rename patches/{ => unapplied}/server/0691-More-Projectile-API.patch (100%) rename patches/{ => unapplied}/server/0692-Fix-swamp-hut-cat-generation-deadlock.patch (100%) rename patches/{ => unapplied}/server/0693-Don-t-allow-vehicle-movement-from-players-while-tele.patch (100%) rename patches/{ => unapplied}/server/0694-Implement-getComputedBiome-API.patch (96%) rename patches/{ => unapplied}/server/0695-Make-some-itemstacks-nonnull.patch (100%) rename patches/{ => unapplied}/server/0696-Implement-enchantWithLevels-API.patch (100%) rename patches/{ => unapplied}/server/0697-Fix-saving-in-unloadWorld.patch (100%) rename patches/{ => unapplied}/server/0698-Buffer-OOB-setBlock-calls.patch (100%) rename patches/{ => unapplied}/server/0699-Add-TameableDeathMessageEvent.patch (100%) rename patches/{ => unapplied}/server/0700-Fix-new-block-data-for-EntityChangeBlockEvent.patch (99%) rename patches/{ => unapplied}/server/0701-fix-player-loottables-running-when-mob-loot-gamerule.patch (100%) rename patches/{ => unapplied}/server/0702-Ensure-entity-passenger-world-matches-ridden-entity.patch (91%) rename patches/{ => unapplied}/server/0703-cache-resource-keys.patch (100%) rename patches/{ => unapplied}/server/0704-Allow-changing-the-EnderDragon-podium.patch (100%) rename patches/{ => unapplied}/server/0705-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch (100%) rename patches/{ => unapplied}/server/0706-Prevent-tile-entity-copies-loading-chunks.patch (100%) rename patches/{ => unapplied}/server/0707-Use-username-instead-of-display-name-in-PlayerList-g.patch (100%) rename patches/{ => unapplied}/server/0708-Expand-PlayerItemDamageEvent.patch (93%) rename patches/{ => unapplied}/server/0709-WorldCreator-keepSpawnLoaded.patch (100%) rename patches/{ => unapplied}/server/0710-Fix-CME-in-CraftPersistentDataTypeRegistry.patch (100%) rename patches/{ => unapplied}/server/0711-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch (100%) rename patches/{ => unapplied}/server/0712-Add-EntityDyeEvent-and-CollarColorable-interface.patch (100%) rename patches/{ => unapplied}/server/0713-Fire-CauldronLevelChange-on-initial-fill.patch (100%) rename patches/{ => unapplied}/server/0714-fix-powder-snow-cauldrons-not-turning-to-water.patch (100%) rename patches/{ => unapplied}/server/0715-Add-PlayerStopUsingItemEvent.patch (100%) rename patches/{ => unapplied}/server/0716-Don-t-tick-markers.patch (95%) rename patches/{ => unapplied}/server/0717-Expand-FallingBlock-API.patch (100%) rename patches/{ => unapplied}/server/0718-Add-support-for-Proxy-Protocol.patch (100%) rename patches/{ => unapplied}/server/0719-Fix-OfflinePlayer-getBedSpawnLocation.patch (100%) rename patches/{ => unapplied}/server/0720-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch (100%) rename patches/{ => unapplied}/server/0721-Sanitize-sent-BlockEntity-NBT.patch (97%) rename patches/{ => unapplied}/server/0722-Disable-component-selector-resolving-in-books-by-def.patch (100%) rename patches/{ => unapplied}/server/0723-Prevent-entity-loading-causing-async-lookups.patch (97%) rename patches/{ => unapplied}/server/0724-Throw-exception-on-world-create-while-being-ticked.patch (100%) rename patches/{ => unapplied}/server/0725-Dont-resent-entity-on-art-update.patch (100%) rename patches/{ => unapplied}/server/0726-Add-WardenAngerChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0727-Add-option-for-strict-advancement-dimension-checks.patch (100%) rename patches/{ => unapplied}/server/0728-Add-missing-important-BlockStateListPopulator-method.patch (100%) rename patches/{ => unapplied}/server/0729-Nameable-Banner-API.patch (100%) rename patches/{ => unapplied}/server/0730-Don-t-broadcast-messages-to-command-blocks.patch (100%) rename patches/{ => unapplied}/server/0731-Prevent-empty-items-from-being-added-to-world.patch (100%) rename patches/{ => unapplied}/server/0732-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch (100%) rename patches/{ => unapplied}/server/0733-Add-Player-getFishHook.patch (100%) rename patches/{ => unapplied}/server/0734-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch (100%) rename patches/{ => unapplied}/server/0735-Add-various-missing-EntityDropItemEvent-calls.patch (98%) rename patches/{ => unapplied}/server/0736-Fix-Bee-flower-NPE.patch (100%) rename patches/{ => unapplied}/server/0737-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch (100%) rename patches/{ => unapplied}/server/0738-More-Teleport-API.patch (99%) rename patches/{ => unapplied}/server/0739-Add-EntityPortalReadyEvent.patch (95%) rename patches/{ => unapplied}/server/0740-Don-t-use-level-random-in-entity-constructors.patch (100%) rename patches/{ => unapplied}/server/0741-Send-block-entities-after-destroy-prediction.patch (100%) rename patches/{ => unapplied}/server/0742-Warn-on-plugins-accessing-faraway-chunks.patch (100%) rename patches/{ => unapplied}/server/0743-Custom-Chat-Completion-Suggestions-API.patch (94%) rename patches/{ => unapplied}/server/0744-Add-and-fix-missing-BlockFadeEvents.patch (100%) rename patches/{ => unapplied}/server/0745-Collision-API.patch (100%) rename patches/{ => unapplied}/server/0746-Fix-suggest-command-message-for-brigadier-syntax-exc.patch (100%) rename patches/{ => unapplied}/server/0747-Block-Ticking-API.patch (100%) rename patches/{ => unapplied}/server/0748-Add-Velocity-IP-Forwarding-Support.patch (99%) rename patches/{ => unapplied}/server/0749-Add-NamespacedKey-biome-methods.patch (100%) rename patches/{ => unapplied}/server/0750-Fix-plugin-loggers-on-server-shutdown.patch (92%) rename patches/{ => unapplied}/server/0751-Stop-large-look-changes-from-crashing-the-server.patch (100%) rename patches/{ => unapplied}/server/0752-Fire-EntityChangeBlockEvent-in-more-places.patch (100%) rename patches/{ => unapplied}/server/0753-Missing-eating-regain-reason.patch (100%) rename patches/{ => unapplied}/server/0754-Missing-effect-cause.patch (100%) rename patches/{ => unapplied}/server/0755-Added-byte-array-serialization-deserialization-for-P.patch (100%) rename patches/{ => unapplied}/server/0756-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch (100%) rename patches/{ => unapplied}/server/0757-Call-BlockPhysicsEvent-more-often.patch (100%) rename patches/{ => unapplied}/server/0758-Configurable-chat-thread-limit.patch (100%) rename patches/{ => unapplied}/server/0759-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch (100%) rename patches/{ => unapplied}/server/0760-fix-Jigsaw-block-kicking-user.patch (100%) rename patches/{ => unapplied}/server/0761-use-BlockFormEvent-for-mud-converting-into-clay.patch (100%) rename patches/{ => unapplied}/server/0762-Add-getDrops-to-BlockState.patch (100%) rename patches/{ => unapplied}/server/0763-Fix-a-bunch-of-vanilla-bugs.patch (100%) rename patches/{ => unapplied}/server/0764-Remove-unnecessary-onTrackingStart-during-navigation.patch (100%) rename patches/{ => unapplied}/server/0765-Fix-custom-piglin-loved-items.patch (100%) rename patches/{ => unapplied}/server/0766-EntityPickupItemEvent-fixes.patch (100%) rename patches/{ => unapplied}/server/0767-Correctly-handle-interactions-with-items-on-cooldown.patch (97%) rename patches/{ => unapplied}/server/0768-Add-PlayerInventorySlotChangeEvent.patch (100%) rename patches/{ => unapplied}/server/0769-Elder-Guardian-appearance-API.patch (100%) rename patches/{ => unapplied}/server/0770-Allow-changing-bed-s-occupied-property.patch (100%) rename patches/{ => unapplied}/server/0771-Add-entity-knockback-API.patch (100%) rename patches/{ => unapplied}/server/0772-Detect-headless-JREs.patch (100%) rename patches/{ => unapplied}/server/0773-fix-entity-vehicle-collision-event-not-called.patch (100%) rename patches/{ => unapplied}/server/0774-Add-EntityToggleSitEvent.patch (100%) rename patches/{ => unapplied}/server/0775-Add-fire-tick-delay-option.patch (100%) rename patches/{ => unapplied}/server/0776-Add-Moving-Piston-API.patch (100%) rename patches/{ => unapplied}/server/0777-Ignore-impossible-spawn-tick.patch (100%) rename patches/{ => unapplied}/server/0778-Fix-EntityArgument-suggestion-permissions-to-align-w.patch (100%) rename patches/{ => unapplied}/server/0779-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch (95%) rename patches/{ => unapplied}/server/0780-Add-PrePlayerAttackEntityEvent.patch (94%) rename patches/{ => unapplied}/server/0781-ensure-reset-EnderDragon-boss-event-name.patch (100%) rename patches/{ => unapplied}/server/0782-fix-MC-252817-green-map-markers-do-not-disappear.patch (100%) rename patches/{ => unapplied}/server/0783-Add-Player-Warden-Warning-API.patch (100%) rename patches/{ => unapplied}/server/0784-More-vanilla-friendly-methods-to-update-trades.patch (100%) rename patches/{ => unapplied}/server/0785-Add-paper-dumplisteners-command.patch (98%) rename patches/{ => unapplied}/server/0786-check-global-player-list-where-appropriate.patch (100%) rename patches/{ => unapplied}/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch (100%) rename patches/{ => unapplied}/server/0788-ItemStack-damage-API.patch (98%) rename patches/{ => unapplied}/server/0789-Friction-API.patch (98%) rename patches/{ => unapplied}/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch (100%) rename patches/{ => unapplied}/server/0791-Fix-premature-player-kicks-on-shutdown.patch (97%) rename patches/{ => unapplied}/server/0792-Sync-offhand-slot-in-menus.patch (100%) rename patches/{ => unapplied}/server/0793-Player-Entity-Tracking-Events.patch (96%) rename patches/{ => unapplied}/server/0794-Limit-pet-look-distance.patch (100%) rename patches/{ => unapplied}/server/0795-Fixes-and-additions-to-the-SpawnReason-API.patch (100%) rename patches/{ => unapplied}/server/0796-fix-Instruments.patch (96%) rename patches/{ => unapplied}/server/0797-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch (100%) rename patches/{ => unapplied}/server/0798-Fix-inconsistencies-in-dispense-events-regarding-sta.patch (100%) rename patches/{ => unapplied}/server/0799-Add-BlockLockCheckEvent.patch (100%) rename patches/{ => unapplied}/server/0800-Add-Sneaking-API-for-Entities.patch (100%) rename patches/{ => unapplied}/server/0801-Improve-logging-and-errors.patch (98%) rename patches/{ => unapplied}/server/0802-Improve-PortalEvents.patch (93%) rename patches/{ => unapplied}/server/0803-Add-config-option-for-spider-worldborder-climbing.patch (100%) rename patches/{ => unapplied}/server/0804-Add-missing-SpigotConfig-logCommands-check.patch (100%) rename patches/{ => unapplied}/server/0805-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch (100%) rename patches/{ => unapplied}/server/0806-Flying-Fall-Damage.patch (92%) rename patches/{ => unapplied}/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch (94%) rename patches/{ => unapplied}/server/0808-config-for-disabling-entity-tag-tags.patch (100%) rename patches/{ => unapplied}/server/0809-Use-single-player-info-update-packet-on-join.patch (100%) rename patches/{ => unapplied}/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch (95%) rename patches/{ => unapplied}/server/0811-Win-Screen-API.patch (93%) rename patches/{ => unapplied}/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch (93%) rename patches/{ => unapplied}/server/0813-Fix-force-opening-enchantment-tables.patch (100%) rename patches/{ => unapplied}/server/0814-Add-Entity-Body-Yaw-API.patch (95%) rename patches/{ => unapplied}/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch (100%) rename patches/{ => unapplied}/server/0816-Add-EntityFertilizeEggEvent.patch (100%) rename patches/{ => unapplied}/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch (100%) rename patches/{ => unapplied}/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch (100%) rename patches/{ => unapplied}/server/0819-Correctly-handle-ArmorStand-invisibility.patch (100%) rename patches/{ => unapplied}/server/0820-Fix-advancement-triggers-for-entity-damage.patch (100%) rename patches/{ => unapplied}/server/0821-Fix-text-display-error-on-spawn.patch (100%) rename patches/{ => unapplied}/server/0822-Fix-inventories-returning-null-Locations.patch (100%) rename patches/{ => unapplied}/server/0823-Add-Shearable-API.patch (100%) rename patches/{ => unapplied}/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch (100%) rename patches/{ => unapplied}/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch (100%) rename patches/{ => unapplied}/server/0826-Treat-sequence-violations-like-they-should-be.patch (100%) rename patches/{ => unapplied}/server/0827-remove-duplicate-animate-packet-for-records.patch (100%) rename patches/{ => unapplied}/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch (100%) rename patches/{ => unapplied}/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch (100%) rename patches/{ => unapplied}/server/0830-Use-array-for-gamerule-storage.patch (100%) rename patches/{ => unapplied}/server/0831-Fix-a-couple-of-upstream-bed-issues.patch (100%) rename patches/{ => unapplied}/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch (100%) rename patches/{ => unapplied}/server/0833-Add-Mob-Experience-reward-API.patch (100%) rename patches/{ => unapplied}/server/0834-Break-redstone-on-top-of-trap-doors-early.patch (100%) rename patches/{ => unapplied}/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch (100%) rename patches/{ => unapplied}/server/0836-More-accurate-isInOpenWater-impl.patch (100%) rename patches/{ => unapplied}/server/0837-Expand-PlayerItemMendEvent.patch (94%) rename patches/{ => unapplied}/server/0838-Refresh-ProjectileSource-for-projectiles.patch (97%) rename patches/{ => unapplied}/server/0839-Add-transient-modifier-API.patch (100%) rename patches/{ => unapplied}/server/0840-Fix-block-place-logic.patch (97%) rename patches/{ => unapplied}/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch (94%) rename patches/{ => unapplied}/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch (100%) rename patches/{ => unapplied}/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch (100%) rename patches/{ => unapplied}/server/0844-fix-MapLike-spam-for-missing-key-selector.patch (100%) rename patches/{ => unapplied}/server/0845-Fix-sniffer-removeExploredLocation.patch (100%) rename patches/{ => unapplied}/server/0846-Add-method-to-remove-all-active-potion-effects.patch (91%) rename patches/{ => unapplied}/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch (100%) rename patches/{ => unapplied}/server/0848-Add-event-for-player-editing-sign.patch (98%) rename patches/{ => unapplied}/server/0849-Only-tick-item-frames-if-players-can-see-it.patch (100%) rename patches/{ => unapplied}/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch (100%) rename patches/{ => unapplied}/server/0851-Add-option-to-disable-block-updates.patch (100%) rename patches/{ => unapplied}/server/0852-Call-missing-BlockDispenseEvent.patch (100%) rename patches/{ => unapplied}/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch (90%) rename patches/{ => unapplied}/server/0854-Optimize-player-lookups-for-beacons.patch (100%) rename patches/{ => unapplied}/server/0855-Add-Sign-getInteractableSideFor.patch (100%) rename patches/{ => unapplied}/server/0856-fix-item-meta-for-tadpole-buckets.patch (100%) rename patches/{ => unapplied}/server/0857-Fix-BanList-API.patch (99%) rename patches/{ => unapplied}/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch (100%) rename patches/{ => unapplied}/server/0859-Fix-possible-NPE-on-painting-creation.patch (100%) rename patches/{ => unapplied}/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch (100%) rename patches/{ => unapplied}/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch (93%) rename patches/{ => unapplied}/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch (100%) rename patches/{ => unapplied}/server/0863-Add-whitelist-events.patch (100%) rename patches/{ => unapplied}/server/0864-Implement-PlayerFailMoveEvent.patch (100%) rename patches/{ => unapplied}/server/0865-Folia-scheduler-and-owned-region-API.patch (100%) rename patches/{ => unapplied}/server/0866-Only-erase-allay-memory-on-non-item-targets.patch (100%) rename patches/{ => unapplied}/server/0867-API-for-updating-recipes-on-clients.patch (100%) rename patches/{ => unapplied}/server/0868-Fix-rotation-when-spawning-display-entities.patch (100%) rename patches/{ => unapplied}/server/0869-Only-capture-actual-tree-growth.patch (98%) rename patches/{ => unapplied}/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch (100%) rename patches/{ => unapplied}/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch (100%) rename patches/{ => unapplied}/server/0872-Use-correct-seed-on-api-world-load.patch (100%) rename patches/{ => unapplied}/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch (100%) rename patches/{ => unapplied}/server/0874-Cache-map-ids-on-item-frames.patch (100%) rename patches/{ => unapplied}/server/0875-Fix-custom-statistic-criteria-creation.patch (100%) rename patches/{ => unapplied}/server/0876-Bandaid-fix-for-Effect.patch (100%) rename patches/{ => unapplied}/server/0877-SculkCatalyst-bloom-API.patch (100%) rename patches/{ => unapplied}/server/0878-API-for-an-entity-s-scoreboard-name.patch (100%) rename patches/{ => unapplied}/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch (100%) rename patches/{ => unapplied}/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch (100%) rename patches/{ => unapplied}/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch (100%) rename patches/{ => unapplied}/server/0882-Fire-entity-death-event-for-ender-dragon.patch (100%) rename patches/{ => unapplied}/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch (100%) rename patches/{ => unapplied}/server/0884-Add-Listing-API-for-Player.patch (99%) rename patches/{ => unapplied}/server/0885-Configurable-Region-Compression-Format.patch (100%) rename patches/{ => unapplied}/server/0886-Add-BlockFace-to-BlockDamageEvent.patch (96%) rename patches/{ => unapplied}/server/0887-Fix-NPE-on-Boat-getStatus.patch (100%) rename patches/{ => unapplied}/server/0888-Expand-Pose-API.patch (95%) rename patches/{ => unapplied}/server/0889-More-DragonBattle-API.patch (100%) rename patches/{ => unapplied}/server/0890-Add-PlayerPickItemEvent.patch (100%) rename patches/{ => unapplied}/server/0891-Allow-trident-custom-damage.patch (100%) rename patches/{ => unapplied}/server/0892-Expose-hand-in-BlockCanBuildEvent.patch (100%) rename patches/{ => unapplied}/server/0893-Optimize-nearest-structure-border-iteration.patch (100%) rename patches/{ => unapplied}/server/0894-Implement-OfflinePlayer-isConnected.patch (94%) rename patches/{ => unapplied}/server/0895-Fix-inventory-desync.patch (98%) rename patches/{ => unapplied}/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch (98%) rename patches/{ => unapplied}/server/0897-Configure-sniffer-egg-hatch-time.patch (100%) rename patches/{ => unapplied}/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch (100%) rename patches/{ => unapplied}/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch (100%) rename patches/{ => unapplied}/server/0900-Add-slot-sanity-checks-in-container-clicks.patch (100%) rename patches/{ => unapplied}/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch (100%) rename patches/{ => unapplied}/server/0902-Allow-proper-checking-of-empty-item-stacks.patch (93%) rename patches/{ => unapplied}/server/0903-Fix-silent-equipment-change-for-mobs.patch (98%) rename patches/{ => unapplied}/server/0904-Fix-spigot-s-Forced-Stats.patch (100%) rename patches/{ => unapplied}/server/0905-Add-missing-InventoryHolders-to-inventories.patch (100%) rename patches/{ => unapplied}/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch (100%) rename patches/{ => unapplied}/server/0907-Add-missing-logs-for-log-ips-config-option.patch (100%) rename patches/{ => unapplied}/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch (100%) rename patches/{ => unapplied}/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch (100%) rename patches/{ => unapplied}/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch (100%) rename patches/{ => unapplied}/server/0911-Fix-missing-map-initialize-event-call.patch (100%) rename patches/{ => unapplied}/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch (100%) rename patches/{ => unapplied}/server/0913-Fix-UnsafeValues-loadAdvancement.patch (100%) rename patches/{ => unapplied}/server/0914-Add-player-idle-duration-API.patch (100%) rename patches/{ => unapplied}/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch (100%) rename patches/{ => unapplied}/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch (100%) rename patches/{ => unapplied}/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch (90%) rename patches/{ => unapplied}/server/0918-Optimize-VarInts.patch (100%) rename patches/{ => unapplied}/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch (100%) rename patches/{ => unapplied}/server/0920-Add-predicate-for-blocks-when-raytracing.patch (100%) rename patches/{ => unapplied}/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch (100%) rename patches/{ => unapplied}/server/0922-Expand-LingeringPotion-API.patch (100%) rename patches/{ => unapplied}/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch (100%) rename patches/{ => unapplied}/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch (100%) rename patches/{ => unapplied}/server/0925-Fix-several-issues-with-EntityBreedEvent.patch (100%) rename patches/{ => unapplied}/server/0926-Add-UUID-attribute-modifier-API.patch (100%) rename patches/{ => unapplied}/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch (100%) rename patches/{ => unapplied}/server/0928-Lazily-create-LootContext-for-criterions.patch (100%) rename patches/{ => unapplied}/server/0929-Don-t-fire-sync-events-during-worldgen.patch (98%) rename patches/{ => unapplied}/server/0930-Add-Structure-check-API.patch (93%) rename patches/{ => unapplied}/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch (100%) rename patches/{ => unapplied}/server/0932-Restore-vanilla-entity-drops-behavior.patch (98%) rename patches/{ => unapplied}/server/0933-Dont-resend-blocks-on-interactions.patch (99%) rename patches/{ => unapplied}/server/0934-add-more-scoreboard-API.patch (100%) rename patches/{ => unapplied}/server/0935-Improve-Registry.patch (100%) rename patches/{ => unapplied}/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch (100%) rename patches/{ => unapplied}/server/0937-Add-experience-points-API.patch (95%) rename patches/{ => unapplied}/server/0938-Add-drops-to-shear-events.patch (99%) rename patches/{ => unapplied}/server/0939-Add-PlayerShieldDisableEvent.patch (96%) rename patches/{ => unapplied}/server/0940-Validate-ResourceLocation-in-NBT-reading.patch (97%) rename patches/{ => unapplied}/server/0941-Properly-handle-experience-dropping-on-block-break.patch (100%) rename patches/{ => unapplied}/server/0942-Fixup-NamespacedKey-handling.patch (100%) rename patches/{ => unapplied}/server/0943-Expose-LootTable-of-DecoratedPot.patch (100%) rename patches/{ => unapplied}/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch (100%) rename patches/{ => unapplied}/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch (100%) rename patches/{ => unapplied}/server/0946-Add-ShulkerDuplicateEvent.patch (100%) rename patches/{ => unapplied}/server/0947-Add-api-for-spawn-egg-texture-colors.patch (100%) rename patches/{ => unapplied}/server/0948-Add-Lifecycle-Event-system.patch (100%) rename patches/{ => unapplied}/server/0949-ItemStack-Tooltip-API.patch (100%) rename patches/{ => unapplied}/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch (100%) rename patches/{ => unapplied}/server/0951-Add-FluidState-API.patch (98%) rename patches/{ => unapplied}/server/0952-add-number-format-api.patch (100%) rename patches/{ => unapplied}/server/0953-improve-BanList-types.patch (100%) rename patches/{ => unapplied}/server/0954-Expanded-Hopper-API.patch (100%) rename patches/{ => unapplied}/server/0955-Add-BlockBreakProgressUpdateEvent.patch (100%) rename patches/{ => unapplied}/server/0956-Deprecate-ItemStack-setType.patch (100%) rename patches/{ => unapplied}/server/0957-Add-CartographyItemEvent.patch (100%) rename patches/{ => unapplied}/server/0958-More-Raid-API.patch (100%) rename patches/{ => unapplied}/server/0959-Add-onboarding-message-for-initial-server-start.patch (98%) rename patches/{ => unapplied}/server/0960-Configurable-max-block-fluid-ticks.patch (100%) rename patches/{ => unapplied}/server/0961-Fix-bees-aging-inside-hives.patch (100%) rename patches/{ => unapplied}/server/0962-Disable-memory-reserve-allocating.patch (100%) rename patches/{ => unapplied}/server/0963-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch (100%) rename patches/{ => unapplied}/server/0964-Fix-DamageSource-API.patch (98%) rename patches/{ => unapplied}/server/0965-Fix-creation-of-invalid-block-entity-during-world-ge.patch (100%) rename patches/{ => unapplied}/server/0966-Fix-possible-StackOverflowError-for-some-dispenses.patch (100%) rename patches/{ => unapplied}/server/0967-Improve-tag-parser-handling.patch (100%) rename patches/{ => unapplied}/server/0968-Item-Mutation-Fixes.patch (100%) rename patches/{ => unapplied}/server/0969-Per-world-ticks-per-spawn-settings.patch (100%) rename patches/{ => unapplied}/server/0970-Properly-track-the-changed-item-from-dispense-events.patch (100%) rename patches/{ => unapplied}/server/0971-Rewrite-dataconverter-system.patch (100%) rename patches/{ => unapplied}/server/0972-Suspicious-Effect-Entry-API.patch (100%) rename patches/{ => unapplied}/server/0973-check-if-itemstack-is-stackable-first.patch (100%) rename patches/{ => unapplied}/server/0974-disable-forced-empty-world-ticks.patch (100%) rename patches/{ => unapplied}/server/0975-Starlight.patch (99%) rename patches/{ => unapplied}/server/0976-Rewrite-chunk-system.patch (100%) rename patches/{ => unapplied}/server/0977-incremental-chunk-and-player-saving.patch (97%) rename patches/{ => unapplied}/server/0978-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch (100%) rename patches/{ => unapplied}/server/0979-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch (98%) rename patches/{ => unapplied}/server/0980-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch (100%) rename patches/{ => unapplied}/server/0981-Optimize-Network-Manager-and-add-advanced-packet-sup.patch (100%) rename patches/{ => unapplied}/server/0982-Allow-Saving-of-Oversized-Chunks.patch (100%) rename patches/{ => unapplied}/server/0983-Fix-World-isChunkGenerated-calls.patch (100%) rename patches/{ => unapplied}/server/0984-Flat-bedrock-generator-settings.patch (100%) rename patches/{ => unapplied}/server/0985-Entity-Activation-Range-2.0.patch (99%) rename patches/{ => unapplied}/server/0986-Optional-per-player-mob-spawns.patch (99%) rename patches/{ => unapplied}/server/0987-Anti-Xray.patch (100%) rename patches/{ => unapplied}/server/0988-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch (96%) rename patches/{ => unapplied}/server/0989-Optimize-Collision-to-not-load-chunks.patch (98%) rename patches/{ => unapplied}/server/0990-Optimize-GoalSelector-Goal.Flag-Set-operations.patch (100%) rename patches/{ => unapplied}/server/0991-Entity-load-save-limit-per-chunk.patch (100%) rename patches/{ => unapplied}/server/0992-Improved-Watchdog-Support.patch (99%) rename patches/{ => unapplied}/server/0993-Optimize-Voxel-Shape-Merging.patch (100%) rename patches/{ => unapplied}/server/0994-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch (99%) rename patches/{ => unapplied}/server/0995-Use-distance-map-to-optimise-entity-tracker.patch (99%) rename patches/{ => unapplied}/server/0996-Optimize-Bit-Operations-by-inlining.patch (100%) rename patches/{ => unapplied}/server/0997-Remove-streams-from-hot-code.patch (100%) rename patches/{ => unapplied}/server/0998-Eigencraft-redstone-implementation.patch (100%) rename patches/{ => unapplied}/server/0999-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch (100%) rename patches/{ => unapplied}/server/1000-Improve-boat-collision-performance.patch (100%) rename patches/{ => unapplied}/server/1001-Optimise-general-POI-access.patch (100%) rename patches/{ => unapplied}/server/1002-Custom-table-implementation-for-blockstate-state-loo.patch (100%) rename patches/{ => unapplied}/server/1003-Execute-chunk-tasks-mid-tick.patch (97%) rename patches/{ => unapplied}/server/1004-Optimise-random-block-ticking.patch (100%) rename patches/{ => unapplied}/server/1005-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch (100%) rename patches/{ => unapplied}/server/1006-Use-Velocity-compression-and-cipher-natives.patch (100%) rename patches/{ => unapplied}/server/1007-Detail-more-information-in-watchdog-dumps.patch (99%) rename patches/{ => unapplied}/server/1008-Collision-optimisations.patch (99%) rename patches/{ => unapplied}/server/1009-Optimise-collision-checking-in-player-move-packet-ha.patch (100%) rename patches/{ => unapplied}/server/1010-Fix-tripwire-disarming-not-working-as-intended.patch (100%) rename patches/{ => unapplied}/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch (100%) rename patches/{ => unapplied}/server/1012-Add-Alternate-Current-redstone-implementation.patch (100%) rename patches/{ => unapplied}/server/1013-optimize-dirt-and-snow-spreading.patch (100%) rename patches/{ => unapplied}/server/1014-Properly-resend-entities.patch (100%) rename patches/{ => unapplied}/server/1015-Optimize-Hoppers.patch (99%) rename patches/{ => unapplied}/server/1016-Improve-performance-of-mass-crafts.patch (100%) rename patches/{ => unapplied}/server/1017-Actually-optimise-explosions.patch (99%) rename patches/{ => unapplied}/server/1018-Optimise-chunk-tick-iteration.patch (99%) rename patches/{ => unapplied}/server/1019-Lag-compensation-ticks.patch (98%) rename patches/{ => unapplied}/server/1020-Optimise-nearby-player-retrieval.patch (100%) rename patches/{ => unapplied}/server/1021-Distance-manager-tick-timings.patch (100%) rename patches/{ => unapplied}/server/1022-Handle-Oversized-block-entities-in-chunks.patch (100%) rename patches/{ => unapplied}/server/1023-Send-full-pos-packets-for-hard-colliding-entities.patch (100%) rename patches/{ => unapplied}/server/1024-API-for-checking-sent-chunks.patch (100%) rename patches/{ => unapplied}/server/1025-Add-config-for-mobs-immune-to-default-effects.patch (100%) rename patches/{ => unapplied}/server/1026-Deep-clone-nbt-tags-in-PDC.patch (100%) rename patches/{ => unapplied}/server/1027-Support-old-UUID-format-for-NBT.patch (100%) rename patches/{ => unapplied}/server/1028-Fix-shield-disable-inconsistency.patch (100%) rename patches/{ => unapplied}/server/1029-Write-SavedData-IO-async.patch (98%) rename patches/{ => unapplied}/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch (100%) rename patches/{ => unapplied}/server/1031-Add-experimental-improved-give-command.patch (100%) rename patches/{ => unapplied}/server/1032-Handle-Large-Packets-disconnecting-client.patch (100%) rename patches/{ => unapplied}/server/1033-Fix-ItemFlags.patch (100%) rename patches/{ => unapplied}/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch (92%) rename patches/{ => unapplied}/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch (100%) rename patches/{ => unapplied}/server/1036-improve-checking-handled-tags-in-itemmeta.patch (100%) rename patches/{ => unapplied}/server/1037-General-ItemMeta-fixes.patch (99%) rename patches/{ => unapplied}/server/1038-Expose-hasColor-to-leather-armor.patch (100%) rename patches/{ => unapplied}/server/1039-Added-API-to-get-player-ha-proxy-address.patch (97%) rename patches/{ => unapplied}/server/1040-More-Chest-Block-API.patch (100%) rename patches/{ => unapplied}/server/1041-Print-data-component-type-on-encoding-error.patch (100%) rename patches/{ => unapplied}/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch (100%) rename patches/{ => unapplied}/server/1043-Brigadier-based-command-API.patch (99%) rename patches/{ => unapplied}/server/1044-Fix-issues-with-Recipe-API.patch (100%) rename patches/{ => unapplied}/server/1045-Fix-equipment-slot-and-group-API.patch (98%) rename patches/{ => unapplied}/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch (100%) rename patches/{ => unapplied}/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch (100%) rename patches/{ => unapplied}/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch (100%) rename patches/{ => unapplied}/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch (97%) rename patches/{ => unapplied}/server/1050-Add-missing-fishing-event-state.patch (100%) rename patches/{ => unapplied}/server/1051-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch (100%) rename patches/{ => unapplied}/server/1052-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch (100%) rename patches/{ => unapplied}/server/1053-Adopt-MaterialRerouting.patch (100%) diff --git a/README.md b/README.md index 8277f968cb..0da22f4faa 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ How To (Plugin Developers) io.papermc.paper paper-api - 1.20.6-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT provided ``` @@ -53,7 +53,7 @@ repositories { } dependencies { - compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT") } java { diff --git a/gradle.properties b/gradle.properties index cd64968334..067fcc6c85 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ group=io.papermc.paper -version=1.20.6-R0.1-SNAPSHOT -mcVersion=1.20.6 +version=1.21-R0.1-SNAPSHOT +mcVersion=1.21 # Set to true while updating Minecraft version -updatingMinecraft=false +updatingMinecraft=true 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 68949cde0c..aa54057aba 100644 --- a/patches/api/0001-Convert-project-to-Gradle.patch +++ b/patches/api/0001-Convert-project-to-Gradle.patch @@ -124,7 +124,7 @@ index 0000000000000000000000000000000000000000..6271e2bad0ed937c2c46a8c8fdf186c4 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index bea9ac450de7ec05f9752d253743e95d79c1cd14..0000000000000000000000000000000000000000 +index 86628114c1d111f6d256186ca739ba8a44b3412a..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null @@ -1,267 +0,0 @@ @@ -135,7 +135,7 @@ index bea9ac450de7ec05f9752d253743e95d79c1cd14..00000000000000000000000000000000 - - org.spigotmc - spigot-api -- 1.20.6-R0.1-SNAPSHOT +- 1.21-R0.1-SNAPSHOT - jar - - Spigot-API diff --git a/patches/api/0004-Code-Generation.patch b/patches/api/0004-Code-Generation.patch index 464836b995..dc253118c4 100644 --- a/patches/api/0004-Code-Generation.patch +++ b/patches/api/0004-Code-Generation.patch @@ -325,14 +325,13 @@ index 0000000000000000000000000000000000000000..1a97b3359c4ece5c29131da7c3f208aa +record TypedKeyImpl(@NotNull Key key, @NotNull RegistryKey registryKey) implements TypedKey { +} diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java -index b6f4810e387c22c4a70609ea1d605130245689a5..03824ae54e1bdb8b14f79b3c5e0294ae725e43f8 100644 +index a86b87e4c3332202e40e484c3f9c6562b419c70f..305532968f9f7dd497c77259ed147ea2f081bc74 100644 --- a/src/main/java/org/bukkit/MinecraftExperimental.java +++ b/src/main/java/org/bukkit/MinecraftExperimental.java -@@ -47,6 +47,6 @@ public @interface MinecraftExperimental { +@@ -47,5 +47,6 @@ public @interface MinecraftExperimental { @ApiStatus.Internal public enum Requires { -- UPDATE_1_21 -+ UPDATE_1_21, BUNDLE, TRADE_REBALANCE // Paper ++ BUNDLE, TRADE_REBALANCE // Paper } } diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch index a02df6f955..d82022467e 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0006-Adventure.patch @@ -778,10 +778,10 @@ index 0000000000000000000000000000000000000000..1a11cfde07db55194cd26757863a268b + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172efa1864648 100644 +index 4a6b495a4c21b631380b6decac8207ab026a1e21..87948f6c3b55bbf115561292544e8cf146cd1830 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -422,7 +422,9 @@ public final class Bukkit { +@@ -423,7 +423,9 @@ public final class Bukkit { * * @param message the message * @return the number of players @@ -791,7 +791,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef public static int broadcastMessage(@NotNull String message) { return server.broadcastMessage(message); } -@@ -1223,6 +1225,19 @@ public final class Bukkit { +@@ -1224,6 +1226,19 @@ public final class Bukkit { server.shutdown(); } @@ -811,7 +811,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef /** * Broadcasts the specified message to every user with the given * permission name. -@@ -1232,6 +1247,21 @@ public final class Bukkit { +@@ -1233,6 +1248,21 @@ public final class Bukkit { * permissibles} must have to receive the broadcast * @return number of message recipients */ @@ -833,7 +833,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef public static int broadcast(@NotNull String message, @NotNull String permission) { return server.broadcast(message, permission); } -@@ -1493,6 +1523,7 @@ public final class Bukkit { +@@ -1494,6 +1524,7 @@ public final class Bukkit { return server.createInventory(owner, type); } @@ -841,7 +841,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef /** * Creates an empty inventory with the specified type and title. If the type * is {@link InventoryType#CHEST}, the new inventory has a size of 27; -@@ -1518,6 +1549,38 @@ public final class Bukkit { +@@ -1519,6 +1550,38 @@ public final class Bukkit { * @see InventoryType#isCreatable() */ @NotNull @@ -880,7 +880,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { return server.createInventory(owner, type, title); } -@@ -1536,6 +1599,7 @@ public final class Bukkit { +@@ -1537,6 +1600,7 @@ public final class Bukkit { return server.createInventory(owner, size); } @@ -888,7 +888,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef /** * Creates an empty inventory of type {@link InventoryType#CHEST} with the * specified size and title. -@@ -1548,10 +1612,30 @@ public final class Bukkit { +@@ -1549,10 +1613,30 @@ public final class Bukkit { * @throws IllegalArgumentException if the size is not a multiple of 9 */ @NotNull @@ -919,7 +919,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef /** * Creates an empty merchant. * -@@ -1559,7 +1643,20 @@ public final class Bukkit { +@@ -1560,7 +1644,20 @@ public final class Bukkit { * when the merchant inventory is viewed * @return a new merchant */ @@ -940,7 +940,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef public static Merchant createMerchant(@Nullable String title) { return server.createMerchant(title); } -@@ -1676,12 +1773,43 @@ public final class Bukkit { +@@ -1677,12 +1774,43 @@ public final class Bukkit { return server.isPrimaryThread(); } @@ -984,7 +984,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef public static String getMotd() { return server.getMotd(); } -@@ -1690,7 +1818,9 @@ public final class Bukkit { +@@ -1691,7 +1819,9 @@ public final class Bukkit { * Set the message that is displayed on the server list. * * @param motd The message to be displayed @@ -994,7 +994,7 @@ index b101827cb752c38d1f38b1c0efa83cca8062f7f7..6425151b7003a1376977717dca6172ef public static void setMotd(@NotNull String motd) { server.setMotd(motd); } -@@ -1699,8 +1829,10 @@ public final class Bukkit { +@@ -1711,8 +1841,10 @@ public final class Bukkit { * Gets the default message that is displayed when the server is stopped. * * @return the shutdown message @@ -1176,10 +1176,10 @@ index 9562fcd522b2e2b24ec57fbf18ddeebba3e50abf..9b61129c3ef83d0bfceba54aba2effa1 + // Paper end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b 100644 +index 7ffbf7e72275b3111ecb87824fa68f44d4300799..ddbaa7fb174e05533023a2523d67c3d3a6b1b443 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -65,13 +65,13 @@ import org.jetbrains.annotations.Nullable; +@@ -66,13 +66,13 @@ import org.jetbrains.annotations.Nullable; /** * Represents a server implementation. */ @@ -1195,7 +1195,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 */ public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin"; -@@ -79,7 +79,7 @@ public interface Server extends PluginMessageRecipient { +@@ -80,7 +80,7 @@ public interface Server extends PluginMessageRecipient { * Used for all announcement messages, such as informing users that a * player has joined. *

@@ -1204,7 +1204,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 */ public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user"; -@@ -355,7 +355,9 @@ public interface Server extends PluginMessageRecipient { +@@ -356,7 +356,9 @@ public interface Server extends PluginMessageRecipient { * * @param message the message * @return the number of players @@ -1214,7 +1214,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 public int broadcastMessage(@NotNull String message); /** -@@ -1049,8 +1051,33 @@ public interface Server extends PluginMessageRecipient { +@@ -1050,8 +1052,33 @@ public interface Server extends PluginMessageRecipient { * @param permission the required permission {@link Permissible * permissibles} must have to receive the broadcast * @return number of message recipients @@ -1248,7 +1248,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 /** * Gets the player by the given name, regardless if they are offline or -@@ -1267,6 +1294,35 @@ public interface Server extends PluginMessageRecipient { +@@ -1268,6 +1295,35 @@ public interface Server extends PluginMessageRecipient { @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type); @@ -1284,7 +1284,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 /** * Creates an empty inventory with the specified type and title. If the type * is {@link InventoryType#CHEST}, the new inventory has a size of 27; -@@ -1288,9 +1344,11 @@ public interface Server extends PluginMessageRecipient { +@@ -1289,9 +1345,11 @@ public interface Server extends PluginMessageRecipient { * @return The new inventory. * @throws IllegalArgumentException if the {@link InventoryType} cannot be * viewed. @@ -1296,7 +1296,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); -@@ -1306,6 +1364,22 @@ public interface Server extends PluginMessageRecipient { +@@ -1307,6 +1365,22 @@ public interface Server extends PluginMessageRecipient { @NotNull Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException; @@ -1319,7 +1319,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 /** * Creates an empty inventory of type {@link InventoryType#CHEST} with the * specified size and title. -@@ -1316,18 +1390,32 @@ public interface Server extends PluginMessageRecipient { +@@ -1317,18 +1391,32 @@ public interface Server extends PluginMessageRecipient { * viewed * @return a new inventory * @throws IllegalArgumentException if the size is not a multiple of 9 @@ -1352,7 +1352,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 Merchant createMerchant(@Nullable String title); /** -@@ -1423,27 +1511,56 @@ public interface Server extends PluginMessageRecipient { +@@ -1424,19 +1512,46 @@ public interface Server extends PluginMessageRecipient { */ boolean isPrimaryThread(); @@ -1399,6 +1399,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 void setMotd(@NotNull String motd); /** +@@ -1452,8 +1567,10 @@ public interface Server extends PluginMessageRecipient { * Gets the default message that is displayed when the server is stopped. * * @return the shutdown message @@ -1409,7 +1410,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 String getShutdownMessage(); /** -@@ -1834,7 +1951,9 @@ public interface Server extends PluginMessageRecipient { +@@ -1844,7 +1961,9 @@ public interface Server extends PluginMessageRecipient { * Sends the component to the player * * @param component the components to send @@ -1419,7 +1420,7 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1843,7 +1962,9 @@ public interface Server extends PluginMessageRecipient { +@@ -1853,7 +1972,9 @@ public interface Server extends PluginMessageRecipient { * Sends an array of components as a single message to the player * * @param components the components to send @@ -1430,10 +1431,10 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 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 72260e6284e3f5ce1813635aa07518c47dbf0899..375172e05a78611deb3003f780867516cb6cd1a4 100644 +index f4d7efee38c3b1381fdbcd47ab1f59fb02728cf2..b2ff1da3386223a544ab5fc363a90c66c8869242 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. */ @@ -1442,7 +1443,7 @@ index 72260e6284e3f5ce1813635aa07518c47dbf0899..375172e05a78611deb3003f780867516 AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"), AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"), -@@ -1725,4 +1725,11 @@ public enum Sound implements Keyed { +@@ -1635,4 +1635,11 @@ public enum Sound implements Keyed { public NamespacedKey getKey() { return key; } @@ -2182,10 +2183,10 @@ index b7d8dd30360a38dbdc7bbce40c8e6ced7261f833..0817f2395c2b18828565435568ce651f public void sendRawMessage(@Nullable UUID sender, @NotNull String message); } diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index f52cff3abcded891f6002a5fe4d5229ab551fe73..9db24da6836de45b7aff8d89782e6b0e1bc5391b 100644 +index 80fb27d6c54988e53857fb330f45bbf32227aee8..c7a901707048e9dc82b8f17f3285727460173c72 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -319,6 +319,19 @@ public abstract class Enchantment implements Keyed, Translatable { +@@ -316,6 +316,19 @@ public abstract class Enchantment implements Keyed, Translatable { * @return True if the enchantment may be applied, otherwise False */ public abstract boolean canEnchantItem(@NotNull ItemStack item); @@ -2256,10 +2257,10 @@ index 558fe6e23f562ee873fc84112f930c6ea19a09f4..c78fb359bd28b8dc1ba242642ec612e8 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689c58fbe12 100644 +index fb976b3f5e92016373b83b1ab70032fb910f60d3..5bcec42a91859002409cab9756999e5adc4c867f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -56,7 +56,41 @@ import org.jetbrains.annotations.Nullable; +@@ -57,7 +57,41 @@ import org.jetbrains.annotations.Nullable; /** * Represents a player, connected or not */ @@ -2302,7 +2303,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * {@inheritDoc} -@@ -73,7 +107,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -74,7 +108,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * places defined by plugins. * * @return the friendly name @@ -2312,7 +2313,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 @NotNull public String getDisplayName(); -@@ -85,15 +121,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -86,15 +122,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * places defined by plugins. * * @param name The new display name. @@ -2363,7 +2364,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public String getPlayerListName(); /** -@@ -102,14 +173,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -103,14 +174,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * If the value is null, the name will be identical to {@link #getName()}. * * @param name new player list name @@ -2382,7 +2383,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 @Nullable public String getPlayerListHeader(); -@@ -117,7 +192,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -118,7 +193,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Gets the currently displayed player list footer for this player. * * @return player list header or null @@ -2392,7 +2393,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 @Nullable public String getPlayerListFooter(); -@@ -125,14 +202,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -126,14 +203,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Sets the currently displayed player list header for this player. * * @param header player list header, null for empty @@ -2411,7 +2412,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void setPlayerListFooter(@Nullable String footer); /** -@@ -141,7 +222,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -142,7 +223,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param header player list header, null for empty * @param footer player list footer, null for empty @@ -2421,7 +2422,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer); /** -@@ -221,9 +304,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -219,9 +302,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * Kicks player with custom kick message. * * @param message kick message @@ -2447,7 +2448,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will * update the entry. -@@ -886,6 +985,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -884,6 +983,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map items); @@ -2554,7 +2555,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * 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. -@@ -903,7 +1102,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -901,7 +1100,11 @@ 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 @@ -2566,7 +2567,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; /** -@@ -925,7 +1128,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -923,7 +1126,11 @@ 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 @@ -2578,7 +2579,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; /** -@@ -948,7 +1155,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -946,7 +1153,11 @@ 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 @@ -2590,7 +2591,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException; /** -@@ -1416,7 +1627,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1421,7 +1632,7 @@ 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. * @deprecated Minecraft no longer uses textures packs. Instead you @@ -2599,7 +2600,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 */ @Deprecated public void setTexturePack(@NotNull String url); -@@ -1452,7 +1663,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1457,7 +1668,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. @@ -2609,7 +2610,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void setResourcePack(@NotNull String url); /** -@@ -1484,6 +1697,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1489,6 +1702,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * pack correctly. * * @@ -2617,7 +2618,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 * @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. -@@ -1496,6 +1710,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1501,6 +1715,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2625,7 +2626,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void setResourcePack(@NotNull String url, @Nullable byte[] hash); /** -@@ -1520,12 +1735,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1525,12 +1740,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! *

  • To remove a resource pack you can use @@ -2640,7 +2641,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 * @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. -@@ -1539,8 +1755,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1544,8 +1760,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. */ @@ -2651,7 +2652,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * Request that the player's client download and switch resource packs. *

    -@@ -1563,7 +1781,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1568,7 +1786,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! *

  • To remove a resource pack you can use @@ -2707,7 +2708,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 *
  • The request is sent with empty string as the hash when the hash is * not provided. This might result in newer versions not loading the * pack correctly. -@@ -1582,7 +1847,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1587,7 +1852,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * length restriction is an implementation specific arbitrary value. * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. @@ -2717,7 +2718,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void setResourcePack(@NotNull String url, @Nullable byte[] hash, boolean force); /** -@@ -1607,7 +1874,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1612,7 +1879,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! *
  • To remove a resource pack you can use @@ -2726,7 +2727,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 *
  • The request is sent with empty string as the hash when the hash is * not provided. This might result in newer versions not loading the * pack correctly. -@@ -1627,9 +1894,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1632,9 +1899,61 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * length restriction is an implementation specific arbitrary value. * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. @@ -2788,7 +2789,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * Request that the player's client download and switch resource packs. *

    -@@ -1652,7 +1971,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1657,7 +1976,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! *

  • To remove a resource pack you can use @@ -2797,7 +2798,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 *
  • The request is sent with empty string as the hash when the hash is * not provided. This might result in newer versions not loading the * pack correctly. -@@ -1673,9 +1992,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1678,9 +1997,60 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * length restriction is an implementation specific arbitrary value. * @throws IllegalArgumentException Thrown if the hash is not 20 bytes * long. @@ -2858,7 +2859,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * Request that the player's client download and include another resource pack. *

    -@@ -1728,12 +2098,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1733,12 +2103,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param id the id of the resource pack. * @throws IllegalArgumentException If the ID is null. @@ -2873,7 +2874,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 */ public void removeResourcePacks(); -@@ -1871,7 +2243,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1876,7 +2248,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param title Title text * @param subtitle Subtitle text @@ -2882,7 +2883,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 */ @Deprecated public void sendTitle(@Nullable String title, @Nullable String subtitle); -@@ -1890,7 +2262,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1895,7 +2267,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. @@ -2892,7 +2893,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut); /** -@@ -2165,6 +2539,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2170,6 +2544,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public int getClientViewDistance(); @@ -2907,7 +2908,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 /** * Gets the player's estimated ping in milliseconds. * -@@ -2190,8 +2572,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2195,8 +2577,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * they wish. * * @return the player's locale @@ -2918,7 +2919,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 public String getLocale(); /** -@@ -2243,6 +2627,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2248,6 +2632,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public boolean isAllowingServerListings(); @@ -2933,7 +2934,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 // Spigot start public class Spigot extends Entity.Spigot { -@@ -2274,11 +2666,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2279,11 +2671,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM throw new UnsupportedOperationException("Not supported yet."); } @@ -2947,7 +2948,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 @Override public void sendMessage(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); -@@ -2289,7 +2683,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2294,7 +2688,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param component the components to send @@ -2957,7 +2958,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 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."); } -@@ -2299,7 +2695,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2304,7 +2700,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param position the screen position * @param components the components to send @@ -2967,7 +2968,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 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."); } -@@ -2310,7 +2708,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2315,7 +2713,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 @@ -2977,7 +2978,7 @@ index 3cec942c2fb46a8fa0b8bc63cbc353ebd23a93ba..c7d3d938534ac11fe420418655dae689 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."); } -@@ -2321,7 +2721,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2326,7 +2726,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 @@ -3279,10 +3280,10 @@ index 133760be6c73436512ba684a3ac77a514b2d8765..9473303bd8ab1f6b63b6999a5f5ff3ec * Gets how much EXP the Player should have at respawn. *

    diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772d2ab1a1b 100644 +index c5734d66686e68080f55034754d43ae55030c3eb..32cd8ee2e849df602a7e10aa5d0a218007faa0ac 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -164,6 +164,18 @@ public enum InventoryType { +@@ -161,6 +161,18 @@ public enum InventoryType { private final String title; private final boolean isCreatable; @@ -3301,7 +3302,7 @@ index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772 private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) { this(defaultSize, defaultTitle, true); } -@@ -172,6 +184,7 @@ public enum InventoryType { +@@ -169,6 +181,7 @@ public enum InventoryType { size = defaultSize; title = defaultTitle; this.isCreatable = isCreatable; @@ -3309,7 +3310,7 @@ index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772 } public int getDefaultSize() { -@@ -179,6 +192,7 @@ public enum InventoryType { +@@ -176,6 +189,7 @@ public enum InventoryType { } @NotNull @@ -4596,10 +4597,10 @@ index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..f0c6943da3f783101ca647b75b3230fa throw new UnsupportedOperationException("Not supported yet."); } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe256d6286c 100644 +index 9fb9f00f39d68777cde660b06beaa58b25cd4470..014c1a0379e532a5c924694a8e0715eb0ba50ec2 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -@@ -36,6 +36,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -37,6 +37,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste */ boolean hasDisplayName(); @@ -4624,7 +4625,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 /** * Gets the display name that is set. *

    -@@ -43,7 +61,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -44,7 +62,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * before calling this method. * * @return the display name that is set @@ -4634,7 +4635,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 @NotNull String getDisplayName(); -@@ -51,7 +71,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -52,7 +72,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * Sets the display name. * * @param name the name to set @@ -4644,7 +4645,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 void setDisplayName(@Nullable String name); /** -@@ -64,6 +86,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -65,6 +87,32 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste */ boolean hasItemName(); @@ -4677,7 +4678,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 /** * Gets the item name that is set. *
    -@@ -74,7 +122,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -75,7 +123,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * calling this method. * * @return the item name that is set @@ -4687,7 +4688,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 @NotNull String getItemName(); -@@ -85,7 +135,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -86,7 +136,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * anvil, is not styled with italics, and does not show labels. * * @param name the name to set @@ -4697,7 +4698,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 void setItemName(@Nullable String name); /** -@@ -126,6 +178,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -127,6 +179,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste */ boolean hasLore(); @@ -4722,7 +4723,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 /** * Gets the lore that is set. *

    -@@ -133,7 +203,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -134,7 +204,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * calling this method. * * @return a list of lore that is set @@ -4732,7 +4733,7 @@ index 556df980d235e0ce09c227419e1c70fed68313bc..bc065cc78b69d26ac07941b8485fabe2 @Nullable List getLore(); -@@ -142,7 +214,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -143,7 +215,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * Removes lore when given null. * * @param lore the lore that will be set diff --git a/patches/api/0008-Use-ASM-for-event-executors.patch b/patches/api/0008-Use-ASM-for-event-executors.patch index df38da57a2..7d9fc54359 100644 --- a/patches/api/0008-Use-ASM-for-event-executors.patch +++ b/patches/api/0008-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ 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 106d4d5756dc579c446699106f52462085ea9a52..d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0 100644 +index bae542d05c059d53199b9171bee505de818df349..a0c6f2c36fa4c16787616a79b5d996523c274fe0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,6 +47,9 @@ dependencies { diff --git a/patches/api/0011-Timings-v2.patch b/patches/api/0011-Timings-v2.patch index a22b422a6f..87905001f4 100644 --- a/patches/api/0011-Timings-v2.patch +++ b/patches/api/0011-Timings-v2.patch @@ -2851,10 +2851,10 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b 100644 +index 87948f6c3b55bbf115561292544e8cf146cd1830..6ecab28705afc0e3652677b516d8a5398e8b2666 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -866,7 +866,6 @@ public final class Bukkit { +@@ -867,7 +867,6 @@ public final class Bukkit { */ public static void reload() { server.reload(); @@ -2863,10 +2863,10 @@ index 6425151b7003a1376977717dca6172efa1864648..e23be80c0ee7d7979b7c62ebce97ed0b /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 3bf7db7eac81e3cc6f5c6700637d10d1b4b7a47b..77f8b0889cd7039bf041fc052fba33b60aa77e17 100644 +index ddbaa7fb174e05533023a2523d67c3d3a6b1b443..f4b2ad91c7a46af5fc16f31369d155e4e3ab3aae 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1947,6 +1947,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1957,6 +1957,26 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi throw new UnsupportedOperationException("Not supported yet."); } @@ -3452,10 +3452,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 c7d3d938534ac11fe420418655dae689c58fbe12..776a3ce9a6c106fbe96cc6399b9ee2cd81b10c76 100644 +index 5bcec42a91859002409cab9756999e5adc4c867f..3594b0eb4068c83c93efe948a8ef4ba217edce17 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2726,7 +2726,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2731,7 +2731,19 @@ 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-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch index bc6d702f76..8dc512dfb3 100644 --- a/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch +++ b/patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch @@ -7,10 +7,10 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744 100644 +index 6ecab28705afc0e3652677b516d8a5398e8b2666..db51751d2dc1ac419e8fac32466ad3a7727fa2fe 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -82,6 +82,20 @@ public final class Bukkit { +@@ -83,6 +83,20 @@ public final class Bukkit { return server; } @@ -32,10 +32,10 @@ index e23be80c0ee7d7979b7c62ebce97ed0b2a0e146b..336c0fb1fcde9efb7cb8d15a9fad8c4c * Attempts to set the {@link Server} singleton. *

    diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 77f8b0889cd7039bf041fc052fba33b60aa77e17..09012ce27344c60730b9c5fcde85712a8e7a69fb 100644 +index f4b2ad91c7a46af5fc16f31369d155e4e3ab3aae..638e98416fdf7ac065abe058d625b1c924be5abb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -67,6 +67,18 @@ import org.jetbrains.annotations.Nullable; +@@ -68,6 +68,18 @@ import org.jetbrains.annotations.Nullable; */ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audience.ForwardingAudience { // Paper diff --git a/patches/api/0013-Player-affects-spawning-API.patch b/patches/api/0013-Player-affects-spawning-API.patch index 6447071753..fff702d958 100644 --- a/patches/api/0013-Player-affects-spawning-API.patch +++ b/patches/api/0013-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 776a3ce9a6c106fbe96cc6399b9ee2cd81b10c76..966a5626eac9305c88b1fe35d12c5fc6e28348d4 100644 +index 3594b0eb4068c83c93efe948a8ef4ba217edce17..1ba2f706a62ee6962451305b1895654453b485cd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2578,6 +2578,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2583,6 +2583,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Deprecated // Paper public String getLocale(); diff --git a/patches/api/0014-Add-getTPS-method.patch b/patches/api/0014-Add-getTPS-method.patch index dc2c6a1882..e7bac768c2 100644 --- a/patches/api/0014-Add-getTPS-method.patch +++ b/patches/api/0014-Add-getTPS-method.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7 100644 +index db51751d2dc1ac419e8fac32466ad3a7727fa2fe..99ad0667f4e7e03c2754d9c39f1ebb23c81be5ef 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2093,6 +2093,17 @@ public final class Bukkit { +@@ -2105,6 +2105,17 @@ public final class Bukkit { return server.getEntity(uuid); } @@ -27,10 +27,10 @@ index 336c0fb1fcde9efb7cb8d15a9fad8c4cbcf28744..ea5f1b4085fd2ec355c4c8036f3bc729 * Get the advancement specified by this key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 09012ce27344c60730b9c5fcde85712a8e7a69fb..e37649ce4b3981f2cff96b64ed3bd4093c015346 100644 +index 638e98416fdf7ac065abe058d625b1c924be5abb..cedd5cb5b3488925405d80441a52239c171c5f3d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1784,6 +1784,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1794,6 +1794,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Nullable Entity getEntity(@NotNull UUID uuid); diff --git a/patches/api/0015-Expose-server-build-information.patch b/patches/api/0015-Expose-server-build-information.patch index bc5b0139dc..e1eb350def 100644 --- a/patches/api/0015-Expose-server-build-information.patch +++ b/patches/api/0015-Expose-server-build-information.patch @@ -230,10 +230,10 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d7569d644b25 100644 +index 99ad0667f4e7e03c2754d9c39f1ebb23c81be5ef..9b28dcade753bf3d2117d3d2638b529db0e533d4 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -109,13 +109,26 @@ public final class Bukkit { +@@ -110,13 +110,26 @@ public final class Bukkit { } Bukkit.server = server; @@ -261,7 +261,7 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d756 */ @NotNull public static String getName() { -@@ -126,6 +139,7 @@ public final class Bukkit { +@@ -127,6 +140,7 @@ public final class Bukkit { * Gets the version string of this server implementation. * * @return version of this server implementation @@ -269,7 +269,7 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d756 */ @NotNull public static String getVersion() { -@@ -142,6 +156,20 @@ public final class Bukkit { +@@ -143,6 +157,20 @@ public final class Bukkit { return server.getBukkitVersion(); } @@ -291,10 +291,10 @@ index ea5f1b4085fd2ec355c4c8036f3bc729e30fd1b7..f4bf442b065e93b49a7e17658f73d756 * Gets a view of all currently logged in players. This {@linkplain * Collections#unmodifiableCollection(Collection) view} is a reused diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e37649ce4b3981f2cff96b64ed3bd4093c015346..7c646d1bb8b011c156b0688f9396bbcbba43d077 100644 +index cedd5cb5b3488925405d80441a52239c171c5f3d..6e3f48f39bd32537f747dbe5b323f882d1b48b16 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -119,6 +119,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -120,6 +120,16 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public String getBukkitVersion(); diff --git a/patches/api/0018-Add-view-distance-API.patch b/patches/api/0018-Add-view-distance-API.patch index 2bc30f2879..aff8f375d8 100644 --- a/patches/api/0018-Add-view-distance-API.patch +++ b/patches/api/0018-Add-view-distance-API.patch @@ -79,10 +79,10 @@ index 9732929b666b0a5e1a2a41c8e8794cc4f2535e41..0a3a66e04f8785874f10a76603bff464 * Gets all generated structures that intersect the chunk at the given * coordinates.
    diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 966a5626eac9305c88b1fe35d12c5fc6e28348d4..b5179b6f8f65d39198c0b80e4be9aca17ca866da 100644 +index 1ba2f706a62ee6962451305b1895654453b485cd..7d530bd0e4d833da760d1cf82aba966b7fb480b1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2592,6 +2592,82 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2597,6 +2597,82 @@ 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-Expose-server-CommandMap.patch b/patches/api/0021-Expose-server-CommandMap.patch index bf07484451..55786e0ffb 100644 --- a/patches/api/0021-Expose-server-CommandMap.patch +++ b/patches/api/0021-Expose-server-CommandMap.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d86f363cc 100644 +index 9b28dcade753bf3d2117d3d2638b529db0e533d4..fe074fe9553f61bdd72b64830532a78415348781 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2322,6 +2322,19 @@ public final class Bukkit { +@@ -2334,6 +2334,19 @@ public final class Bukkit { return server.getUnsafe(); } @@ -29,10 +29,10 @@ index f4bf442b065e93b49a7e17658f73d7569d644b25..db217a9486e327b4340a54d65439055d public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 7c646d1bb8b011c156b0688f9396bbcbba43d077..69153de6847bb8740803e5f731a0586d41a0eed3 100644 +index 6e3f48f39bd32537f747dbe5b323f882d1b48b16..9545da2adacaf0bd719c2baef929588cd1042d25 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1804,6 +1804,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1814,6 +1814,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi public double[] getTPS(); // Paper end diff --git a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 635d6c4fd5..d88bd2a236 100644 --- a/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/patches/api/0022-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff3ffd6cd5 100644 +index fe074fe9553f61bdd72b64830532a78415348781..4c5327da1468cb1f9af00a99e7e79f578c47ee2a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -471,6 +471,30 @@ public final class Bukkit { +@@ -472,6 +472,30 @@ public final class Bukkit { return server.broadcastMessage(message); } @@ -41,10 +41,10 @@ index db217a9486e327b4340a54d65439055d86f363cc..25f506c344883d00a63ee2b5a998d3ff * 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/Server.java b/src/main/java/org/bukkit/Server.java -index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961ddf312509 100644 +index 9545da2adacaf0bd719c2baef929588cd1042d25..19b75704ed9eee0c929df417e1e5d0ea3718e2f8 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -382,6 +382,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -383,6 +383,30 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Deprecated // Paper public int broadcastMessage(@NotNull String message); @@ -76,10 +76,10 @@ index 69153de6847bb8740803e5f731a0586d41a0eed3..65d68716e1ff8277c534399621cf961d * 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 5d5d37e2ebbbe4d2641177c7d174059ba29bb688..881c75e84ef31390a3519549985af2711e2828b5 100644 +index 7d530bd0e4d833da760d1cf82aba966b7fb480b1..f9bacbfa223826b3b54525648080fda306a1ec36 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1216,6 +1216,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1214,6 +1214,42 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); diff --git a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch index 3b2233905e..33be050ecf 100644 --- a/patches/api/0026-Player-Tab-List-and-Title-APIs.patch +++ b/patches/api/0026-Player-Tab-List-and-Title-APIs.patch @@ -432,10 +432,10 @@ index 0000000000000000000000000000000000000000..20a028450667edf102b59b6b50ac6e89 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 881c75e84ef31390a3519549985af2711e2828b5..fc8c807ae9793452bbf3fbab5e72d05676e6fa83 100644 +index f9bacbfa223826b3b54525648080fda306a1ec36..a0317801b5a41d523324c1482356f26935f6a330 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1250,6 +1250,131 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1248,6 +1248,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/0028-Complete-resource-pack-API.patch b/patches/api/0028-Complete-resource-pack-API.patch index 7c45413b70..22c24d7cc1 100644 --- a/patches/api/0028-Complete-resource-pack-API.patch +++ b/patches/api/0028-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 fc8c807ae9793452bbf3fbab5e72d05676e6fa83..93ff1e91c41273aa1b1cffe7c15b546f3a44d6b7 100644 +index a0317801b5a41d523324c1482356f26935f6a330..47c792202e8cc6d97fcb5e9bed98d327ecc5ab2b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2207,6 +2207,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2212,6 +2212,180 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force); // Paper end diff --git a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch index dab051a99c..b7ff894867 100644 --- a/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/patches/api/0031-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec243e59983 100644 +index 4c5327da1468cb1f9af00a99e7e79f578c47ee2a..913141e79a463774d1856f7c34e469cc77ccfcdc 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2357,6 +2357,13 @@ public final class Bukkit { +@@ -2369,6 +2369,13 @@ public final class Bukkit { public static org.bukkit.command.CommandMap getCommandMap() { return server.getCommandMap(); } @@ -24,10 +24,10 @@ index 25f506c344883d00a63ee2b5a998d3ff3ffd6cd5..8dc5b43e937405070d9bdbd914fcdec2 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 65d68716e1ff8277c534399621cf961ddf312509..47766c5312a402e3329a1d4bc5e5e0c05f2b007f 100644 +index 19b75704ed9eee0c929df417e1e5d0ea3718e2f8..bb0d64b1ff147e63b927b275553d8265bfcd396d 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2065,4 +2065,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2075,4 +2075,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull Spigot spigot(); // Spigot end diff --git a/patches/api/0039-Arrow-pickup-rule-API.patch b/patches/api/0039-Arrow-pickup-rule-API.patch index 2ab09a9b11..6bbf58b3d0 100644 --- a/patches/api/0039-Arrow-pickup-rule-API.patch +++ b/patches/api/0039-Arrow-pickup-rule-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Arrow pickup rule API diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 9a0a1fa4b7a7e1e1174a75a388081b332d4bedbd..839e5b7df49f42b5fec7729997bef3370ba36d80 100644 +index 4d9938249684b7db01b78baf4eeeaa2e0638a963..493f81ba879d1eb29a32722da27e4ff7ce4c68a8 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java -@@ -160,4 +160,38 @@ public interface AbstractArrow extends Projectile { +@@ -186,4 +186,38 @@ public interface AbstractArrow extends Projectile { */ CREATIVE_ONLY } diff --git a/patches/api/0041-LootTable-API.patch b/patches/api/0041-LootTable-API.patch index d500927ae8..e1252ab848 100644 --- a/patches/api/0041-LootTable-API.patch +++ b/patches/api/0041-LootTable-API.patch @@ -271,13 +271,13 @@ index b451191312e4fb19f2131c2d0a0c0337953f6c7c..db6affbc78106b2d93b41953b624a0bc /** * Gets the inventory of the chest block represented by this block state. diff --git a/src/main/java/org/bukkit/block/Crafter.java b/src/main/java/org/bukkit/block/Crafter.java -index 05d6af1681351844a6673a6d0dfca2038dafa7b6..8b2a315ed5dd1c57ce60fc41fd5e83a6495028e6 100644 +index e004920ec1e13daaa2f0969a5cf97b6a7de25df9..8d2dd78fc588a6817dfede8040b9909a7d5bde67 100644 --- a/src/main/java/org/bukkit/block/Crafter.java +++ b/src/main/java/org/bukkit/block/Crafter.java -@@ -10,7 +10,7 @@ import org.jetbrains.annotations.ApiStatus; +@@ -7,7 +7,7 @@ import org.jetbrains.annotations.ApiStatus; + * Represents a captured state of a crafter. */ @ApiStatus.Experimental - @MinecraftExperimental(Requires.UPDATE_1_21) -public interface Crafter extends Container, Lootable { +public interface Crafter extends Container, com.destroystokyo.paper.loottable.LootableBlockInventory { // Paper - LootTable API diff --git a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch index 8279688b3f..b5f012ce42 100644 --- a/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch +++ b/patches/api/0044-Allow-Reloading-of-Command-Aliases.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa03371bb7c 100644 +index 913141e79a463774d1856f7c34e469cc77ccfcdc..26fcb119a448f1def8eb5002c41264fa129f1c08 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2364,6 +2364,15 @@ public final class Bukkit { +@@ -2376,6 +2376,15 @@ public final class Bukkit { public static void reloadPermissions() { server.reloadPermissions(); } @@ -26,10 +26,10 @@ index 8dc5b43e937405070d9bdbd914fcdec243e59983..fdf5b8c69e98e000f897aca73ef97fa0 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 47766c5312a402e3329a1d4bc5e5e0c05f2b007f..08141d729809132ed36d6088f37543e792395768 100644 +index bb0d64b1ff147e63b927b275553d8265bfcd396d..a9b22b01b6deba981e84707c5e88981980b8fb65 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2067,4 +2067,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2077,4 +2077,6 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi // Spigot end void reloadPermissions(); // Paper diff --git a/patches/api/0047-Add-String-based-Action-Bar-API.patch b/patches/api/0047-Add-String-based-Action-Bar-API.patch index 1420aad8b9..8107305c07 100644 --- a/patches/api/0047-Add-String-based-Action-Bar-API.patch +++ b/patches/api/0047-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 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b7725158a21 100644 +index 47c792202e8cc6d97fcb5e9bed98d327ecc5ab2b..add0826af957c773975f840c28cf77afbab85a09 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1217,6 +1217,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1215,6 +1215,39 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start @@ -48,7 +48,7 @@ index 6a7d63691fa3be09da0ade66cf07a41ae08d4190..252390260f62ee945c21267cd8717b77 /** * Sends the component to the player * -@@ -1244,9 +1277,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1242,9 +1275,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/0052-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch index 65bf8c19a6..c5d20165c6 100644 --- a/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/patches/api/0052-Provide-E-TE-Chunk-count-stat-methods.patch @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 890ae536fdaff11055b72b1be0fbf3766a41812c..4dc687f16a8181876fb7b3e56b39a55ea5507408 100644 +index 0a3a66e04f8785874f10a76603bff46469543688..9885fd1adc1f93a80d650e6d42dfa3a0b084db9f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -49,6 +49,33 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch index 4d5786df14..37fcf69d8e 100644 --- a/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/patches/api/0055-Add-configuration-option-to-prevent-player-names-fro.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62ddfc078c8 100644 +index 26fcb119a448f1def8eb5002c41264fa129f1c08..4597eb83b800072c3c2906cdd143c6e2909f89a2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2373,6 +2373,16 @@ public final class Bukkit { +@@ -2385,6 +2385,16 @@ public final class Bukkit { public static boolean reloadCommandAliases() { return server.reloadCommandAliases(); } @@ -27,10 +27,10 @@ index fdf5b8c69e98e000f897aca73ef97fa03371bb7c..fbddd654b4ba7b2613884fdd22f3e62d @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 08141d729809132ed36d6088f37543e792395768..1f039a3609a5a1208af408b0565f07664558a23f 100644 +index a9b22b01b6deba981e84707c5e88981980b8fb65..fae8fb5261930a24fef889405878432a83db6169 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2069,4 +2069,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2079,4 +2079,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi void reloadPermissions(); // Paper boolean reloadCommandAliases(); // Paper diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch index daf344b00c..c59299edc2 100644 --- a/patches/api/0056-Fix-upstream-javadocs.patch +++ b/patches/api/0056-Fix-upstream-javadocs.patch @@ -49,10 +49,10 @@ index a04cde615f8c4bc593f8d9f8f6f1438008aaa707..548f6d28c28d74bed8b58ee828759093 * @param target the target to remove from this list */ diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index fbddd654b4ba7b2613884fdd22f3e62ddfc078c8..53f56d95bdf484caed9effbedfe507f6745bb8c0 100644 +index 4597eb83b800072c3c2906cdd143c6e2909f89a2..5766072d436f8e36e2a3e734c817ecfe899398ce 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1534,6 +1534,8 @@ public final class Bukkit { +@@ -1535,6 +1535,8 @@ public final class Bukkit { /** * Gets every player that has ever played on this server. @@ -75,10 +75,10 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814 * @return temperature at given coordinate */ diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 3d636cb7f275df053d202356c5e9fad5b1112867..4a06ed9c769acb2eb4c6f4b76c84dc2e63176010 100644 +index 62a8bb18855be13ed1c466b4be7afcd3c91dc7aa..de9fd0fadd6d16ffe883a618bf499214878f443d 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -209,7 +209,7 @@ public enum Particle implements Keyed { +@@ -195,7 +195,7 @@ public enum Particle implements Keyed { } /** @@ -127,10 +127,10 @@ index 4c9fd558fbf7f57a948fbb7f80f4651048c0fb57..458119a9ef7ce8e1f59bd47caa5b4bc6 * @param statePredicate The predicate which should get used to test if a block should be set or not. * @return true if the tree was created successfully, otherwise false diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24e86031c7 100644 +index fae8fb5261930a24fef889405878432a83db6169..ba9c7a322f08fcc9df0ebf39720e2e95b275c651 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -580,13 +580,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -581,13 +581,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * *

    * Note: If set to 0, {@link SpawnCategory} mobs spawning will be disabled. @@ -145,7 +145,7 @@ index 1f039a3609a5a1208af408b0565f07664558a23f..b0734f8253ed540916db7bc75cd7dd24 */ public int getTicksPerSpawns(@NotNull SpawnCategory spawnCategory); -@@ -1294,6 +1291,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1295,6 +1292,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi /** * Gets every player that has ever played on this server. @@ -459,10 +459,10 @@ 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 b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddcec951ba31 100644 +index add0826af957c773975f840c28cf77afbab85a09..fea44ddd358b65681d13215244836c21fc88e0fd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -478,15 +478,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -476,15 +476,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Saves the players current location, health, inventory, motion, and @@ -482,7 +482,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce *

    * Note: This will overwrite the players current inventory, health, * motion, etc, with the state from the saved dat file. -@@ -823,7 +823,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -821,7 +821,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Plays an effect to just this player. * @@ -491,7 +491,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce * @param loc the location to play the effect at * @param effect the {@link Effect} * @param data a data bit needed for some effects -@@ -1234,7 +1234,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1232,7 +1232,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * Use supplied alternative character to the section symbol to represent legacy color codes. * @@ -500,7 +500,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce * @param message The message to send * @deprecated use {@link #sendActionBar(net.kyori.adventure.text.Component)} */ -@@ -1700,7 +1700,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1705,7 +1705,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see a player that was previously hidden. If @@ -509,7 +509,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce * remain hidden until the other plugin calls this method too. * * @param plugin Plugin that wants to show the player -@@ -1727,7 +1727,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1732,7 +1732,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Allows this player to see an entity that was previously hidden. If @@ -518,7 +518,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce * remain hidden until the other plugin calls this method too. * * @param plugin Plugin that wants to show the entity -@@ -1810,9 +1810,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1815,9 +1815,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * case this method will have no affect on them. Use the * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! @@ -528,7 +528,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce *

  • The request is send with "null" as the hash. This might result * in newer versions not loading the pack correctly. * -@@ -1846,9 +1843,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1851,9 +1848,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * case this method will have no affect on them. Use the * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! @@ -538,7 +538,7 @@ index b520489370bc1bca926f01f807f6a6725679fb8f..7d8075d7b0aeb4d10ba6879f7e1bddce *
  • The request is send with empty string as the hash. This might result * in newer versions not loading the pack correctly. * -@@ -1885,9 +1879,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1890,9 +1884,6 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * case this method will have no affect on them. Use the * {@link PlayerResourcePackStatusEvent} to figure out whether or not * the player loaded the pack! @@ -707,7 +707,7 @@ index a37febd0d4dd5b733e9ee72628fdf9395fec4367..9cee218b9ee14688356f16b1f5851218 */ public class AreaEffectCloudApplyEvent extends EntityEvent implements Cancellable { diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java -index e9de00e9e434d36117a672fa9fbfc7c52f284b67..4065432c884324b107d04f4ccd486085b0c440e7 100644 +index 330bcc65c1d65c3e59f2763892c90db72bd6757b..394ea92c1021d04e1687b8c12854356265e3d5de 100644 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java @@ -154,11 +154,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent { @@ -1558,10 +1558,10 @@ index cdbcc8dbab2456cc2bc1f3084cbb1ced1698b7f5..d528b066c2aaa3fb097931914ff2181f void setPower(int power) throws IllegalArgumentException; diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index bc065cc78b69d26ac07941b8485fabe256d6286c..fe0f8459a381c35e1e7a312a2f63d6e6eda088d6 100644 +index 014c1a0379e532a5c924694a8e0715eb0ba50ec2..707d6138f4b27370ee68c8396204f89fa0fb65f2 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -@@ -547,7 +547,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -576,7 +576,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste /** * Return an immutable copy of all {@link Attribute}s and their * {@link AttributeModifier}s for a given {@link EquipmentSlot}.
    diff --git a/patches/api/0060-Basic-PlayerProfile-API.patch b/patches/api/0060-Basic-PlayerProfile-API.patch index 0c6bb097e3..ffeb611221 100644 --- a/patches/api/0060-Basic-PlayerProfile-API.patch +++ b/patches/api/0060-Basic-PlayerProfile-API.patch @@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..8f913a078dd692a9feafb98a6e6c9583 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf0904fbb22f 100644 +index 5766072d436f8e36e2a3e734c817ecfe899398ce..ce20f1231b7998f8c4e1bf85d815661984c4f45c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2385,6 +2385,89 @@ public final class Bukkit { +@@ -2397,6 +2397,89 @@ public final class Bukkit { public static boolean suggestPlayerNamesWhenNullTabCompletions() { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -421,10 +421,10 @@ index 53f56d95bdf484caed9effbedfe507f6745bb8c0..44e833a2be716d378688fe35822bdf09 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b0734f8253ed540916db7bc75cd7dd24e86031c7..aeb5399b1c5e90079b199a591f7986acdf111cba 100644 +index ba9c7a322f08fcc9df0ebf39720e2e95b275c651..d699dd95dfdcebd22ab7e718b181ffcffe0c919e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2077,5 +2077,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2087,5 +2087,80 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if player names should be suggested */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0076-AsyncTabCompleteEvent.patch b/patches/api/0076-AsyncTabCompleteEvent.patch index 9a7669b39b..b88930e4dc 100644 --- a/patches/api/0076-AsyncTabCompleteEvent.patch +++ b/patches/api/0076-AsyncTabCompleteEvent.patch @@ -589,7 +589,7 @@ index 270e6d8ad4358baa256cee5f16cff281f063ce3b..b43c3cb5c88eada186d6f81712c244aa @Override diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index abadff47166722fdc756afdbc6ac7242b6bd4fb0..88f1ca89fa640a686231b8eec87e70419b2d73ef 100644 +index a899f63eb2ce58b3cf708e91819cbbdeffda5d9f..057dc3ebea3516863dda24252fe05d344c16fab3 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -48,6 +48,8 @@ public class AnnotationTest { diff --git a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch index 5c858d8508..c6ce0e9872 100644 --- a/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/api/0077-Expose-client-protocol-version-and-virtual-host.patch @@ -57,10 +57,10 @@ index 0000000000000000000000000000000000000000..7b2af1bd72dfbcf4e962a982940fc49b + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index cd00d2a064ee4c86b394a7861182fba9cf79cfb3..401a43573eb84c1192261377a8b58dd73b895d76 100644 +index fea44ddd358b65681d13215244836c21fc88e0fd..d470b26abbf54514e498d81d68af566e2af0a63f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -56,7 +56,7 @@ import org.jetbrains.annotations.Nullable; +@@ -57,7 +57,7 @@ import org.jetbrains.annotations.Nullable; /** * Represents a player, connected or not */ diff --git a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch index 426ac50e39..bb3d96e6f1 100644 --- a/patches/api/0081-Ability-to-apply-mending-to-XP-API.patch +++ b/patches/api/0081-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 401a43573eb84c1192261377a8b58dd73b895d76..8b92f258a85b4184d67d0af396c18400ded38a67 100644 +index d470b26abbf54514e498d81d68af566e2af0a63f..77a740fb62a9c442c9b67943f8775a824cf2617f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1543,6 +1543,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1548,6 +1548,15 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void resetPlayerWeather(); @@ -29,7 +29,7 @@ index 401a43573eb84c1192261377a8b58dd73b895d76..8b92f258a85b4184d67d0af396c18400 /** * Gets the player's cooldown between picking up experience orbs. * -@@ -1568,8 +1577,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1573,8 +1582,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/0087-Add-ArmorStand-Item-Meta.patch b/patches/api/0087-Add-ArmorStand-Item-Meta.patch index 9c5c6218ea..aed15d7522 100644 --- a/patches/api/0087-Add-ArmorStand-Item-Meta.patch +++ b/patches/api/0087-Add-ArmorStand-Item-Meta.patch @@ -95,10 +95,10 @@ index 0000000000000000000000000000000000000000..7e4acfff16db80a75e1ff2fee1972b16 + void setMarker(boolean marker); +} diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java -index 8dc744f253be42191ca04f8e2942c4c618655fa8..aa0f66b7187c800cd22905bfa43af3ffb53edb5f 100644 +index d4c29562aa3999afdac8b5bc457aa3153a0e9d77..270f85e99084ddf029bef076c335fe6b9bbddbb5 100644 --- a/src/main/java/org/bukkit/inventory/ItemType.java +++ b/src/main/java/org/bukkit/inventory/ItemType.java -@@ -1879,7 +1879,7 @@ public interface ItemType extends Keyed, Translatable { +@@ -1791,7 +1791,7 @@ public interface ItemType extends Keyed, Translatable { ItemType.Typed RABBIT_STEW = getItemType("rabbit_stew"); ItemType.Typed RABBIT_FOOT = getItemType("rabbit_foot"); ItemType.Typed RABBIT_HIDE = getItemType("rabbit_hide"); diff --git a/patches/api/0092-Player.setPlayerProfile-API.patch b/patches/api/0092-Player.setPlayerProfile-API.patch index 764d06bc30..a12782792e 100644 --- a/patches/api/0092-Player.setPlayerProfile-API.patch +++ b/patches/api/0092-Player.setPlayerProfile-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 44e833a2be716d378688fe35822bdf0904fbb22f..817824d5439919e0c8f466ba2a722a237853747b 100644 +index ce20f1231b7998f8c4e1bf85d815661984c4f45c..52123fd754530a9a5a22c81cc5ad763d3e2355b2 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1376,8 +1376,10 @@ public final class Bukkit { +@@ -1377,8 +1377,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank @@ -20,7 +20,7 @@ index 44e833a2be716d378688fe35822bdf0904fbb22f..817824d5439919e0c8f466ba2a722a23 public static PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name) { return server.createPlayerProfile(uniqueId, name); } -@@ -1388,8 +1390,10 @@ public final class Bukkit { +@@ -1389,8 +1391,10 @@ public final class Bukkit { * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null @@ -31,7 +31,7 @@ index 44e833a2be716d378688fe35822bdf0904fbb22f..817824d5439919e0c8f466ba2a722a23 public static PlayerProfile createPlayerProfile(@NotNull UUID uniqueId) { return server.createPlayerProfile(uniqueId); } -@@ -1401,8 +1405,10 @@ public final class Bukkit { +@@ -1402,8 +1406,10 @@ public final class Bukkit { * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank @@ -56,10 +56,10 @@ index ff59479f4782ac7726504aab239de79fdc840cde..abbf3d6f11350ab2dd47a277771d9f46 /** * Checks if this player has had their profile banned. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index aeb5399b1c5e90079b199a591f7986acdf111cba..e7f618a8d7245494e178052c6a63e1b150618c36 100644 +index d699dd95dfdcebd22ab7e718b181ffcffe0c919e..ce29d2d3c2fd06a09eba2147c92b3387f0a81153 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1163,8 +1163,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1164,8 +1164,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if both the unique id is * null and the name is null or blank @@ -70,7 +70,7 @@ index aeb5399b1c5e90079b199a591f7986acdf111cba..e7f618a8d7245494e178052c6a63e1b1 PlayerProfile createPlayerProfile(@Nullable UUID uniqueId, @Nullable String name); /** -@@ -1173,8 +1175,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1174,8 +1176,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param uniqueId the unique id * @return the new PlayerProfile * @throws IllegalArgumentException if the unique id is null @@ -81,7 +81,7 @@ index aeb5399b1c5e90079b199a591f7986acdf111cba..e7f618a8d7245494e178052c6a63e1b1 PlayerProfile createPlayerProfile(@NotNull UUID uniqueId); /** -@@ -1184,8 +1188,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1185,8 +1189,10 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the new PlayerProfile * @throws IllegalArgumentException if the name is null or * blank @@ -93,10 +93,10 @@ index aeb5399b1c5e90079b199a591f7986acdf111cba..e7f618a8d7245494e178052c6a63e1b1 /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 03c1b7331bec5c52afb853477e857f62a10cb4b9..631db41f2b35d3ddc96f0c80979958922be01adf 100644 +index 77a740fb62a9c442c9b67943f8775a824cf2617f..b427a37d1b382037e946e5a899e571c3aebe5ba9 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3109,6 +3109,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3114,6 +3114,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM } // Paper end diff --git a/patches/api/0093-getPlayerUniqueId-API.patch b/patches/api/0093-getPlayerUniqueId-API.patch index bcce62b587..2715d60c2b 100644 --- a/patches/api/0093-getPlayerUniqueId-API.patch +++ b/patches/api/0093-getPlayerUniqueId-API.patch @@ -9,10 +9,10 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 8521ef27d1e6c06e7228acb47388b02c50dc0e84..7bf662bd0eafcec46bb12cae78628e5045cbc299 100644 +index 52123fd754530a9a5a22c81cc5ad763d3e2355b2..5c0f610a45b6dc97f68f90a54f69b4c787157ef3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -749,6 +749,20 @@ public final class Bukkit { +@@ -750,6 +750,20 @@ public final class Bukkit { return server.getPlayer(id); } @@ -34,10 +34,10 @@ index 8521ef27d1e6c06e7228acb47388b02c50dc0e84..7bf662bd0eafcec46bb12cae78628e50 * Gets the plugin manager for interfacing with plugins. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e4b42323e8d168f9daee3d1b38f3591b45bc6a1b..f352b10ad81ee21ddbf9d09ccbc6e919cb670bf9 100644 +index ce29d2d3c2fd06a09eba2147c92b3387f0a81153..b26cbe2246722ff5d8ffad6a5734478146e3e192 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -629,6 +629,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -630,6 +630,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Nullable public Player getPlayer(@NotNull UUID id); diff --git a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch index befa2840dc..125fad56ad 100644 --- a/patches/api/0095-Add-openSign-method-to-HumanEntity.patch +++ b/patches/api/0095-Add-openSign-method-to-HumanEntity.patch @@ -36,10 +36,10 @@ index c426bdea5ef71a095cf2af9a8a83a162db3c05b7..2308fa3ca898bcb6c0ac2d4853f82a33 /** * 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 631db41f2b35d3ddc96f0c80979958922be01adf..9152d19adf8869ddac26490929088627c257bd4e 100644 +index b427a37d1b382037e946e5a899e571c3aebe5ba9..d8f97d8626850ed833b2dd32fab682cdf61a9948 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3070,10 +3070,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3075,10 +3075,12 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Open a Sign for editing by the Player. * diff --git a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch index 50b3990b13..8508d5aa31 100644 --- a/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch +++ b/patches/api/0096-Add-Ban-Methods-to-Player-Objects.patch @@ -86,10 +86,10 @@ index abbf3d6f11350ab2dd47a277771d9f46221036bd..a9d63b1630b05b86a0396355fcfee261 /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 89474de6c3a14aaf0839b51b659d0fc191f6de54..e46afd3d78af6fe8658adbe8557f91201bbebecb 100644 +index d8f97d8626850ed833b2dd32fab682cdf61a9948..8a0e8447a7c5241a53ae933229f369bf93300c72 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1217,6 +1217,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1215,6 +1215,186 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start diff --git a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch index e833e9abfe..a35e975da3 100644 --- a/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/api/0101-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -598,10 +598,10 @@ index 0000000000000000000000000000000000000000..52f639b838e8b49952c560f20bacbad0 + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 4a06ed9c769acb2eb4c6f4b76c84dc2e63176010..c5e3a8143a166d426d87fa3d0f0b3d4f3d4bff1a 100644 +index de9fd0fadd6d16ffe883a618bf499214878f443d..6f049e9044de4139971312f85ada19fb026fe75f 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -208,6 +208,18 @@ public enum Particle implements Keyed { +@@ -194,6 +194,18 @@ public enum Particle implements Keyed { return key; } diff --git a/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch index 83897ac115..b018ea41d9 100644 --- a/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/patches/api/0135-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index eb9d58f8852e732a1284beeaf542989301d21b1c..02e88db63be2d5e31da6b65157ba7b971b1f10f3 100644 +index 065991e7a7f6119797ea315a56836ba17dd17d05..2d87237ea99d42c6ce896d52a1b2e5c3ec4d4568 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -120,7 +120,7 @@ public class TimingHistory { diff --git a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 374a6c7913..5204a8d4db 100644 --- a/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/patches/api/0136-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -50,7 +50,7 @@ index 41125de49db8eafce4be59cc110ce5be06836a47..4df9a225e93aafb1e4af9591c482ac07 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 273c50b6e4f26457415779000cf09aeaffd21733..0eb6e1b0529d14ed10e901d37c6fdf896e2de8e4 100644 +index 4ecbfe4d28316527ff00e206941da9c0fc9235d0..190aba1ff06357dc0ef9341e584ab79b928d8f64 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -99,6 +99,41 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0141-isChunkGenerated-API.patch b/patches/api/0141-isChunkGenerated-API.patch index aba6214696..a1d9b815f9 100644 --- a/patches/api/0141-isChunkGenerated-API.patch +++ b/patches/api/0141-isChunkGenerated-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 042d69e6d4584eb6d678b8ea13a3e4bea78703b8..02b4ffa6b918269bd64f7c518fcceef1f6990737 100644 +index 4df9a225e93aafb1e4af9591c482ac07e7f65422..c30600666e7b32b8b4ba1e20ede04fd5ebd5a692 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -3,6 +3,7 @@ package org.bukkit; @@ -37,7 +37,7 @@ index 042d69e6d4584eb6d678b8ea13a3e4bea78703b8..02b4ffa6b918269bd64f7c518fcceef1 /** diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 575fd50b8456beed7c5049a392fca011271a8fe4..b3098ce9134acf24f49d23fc1babe79c6bf502f1 100644 +index 190aba1ff06357dc0ef9341e584ab79b928d8f64..1cc5bdd63a97a6bb62b1d29aca01658359bd15f1 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -248,6 +248,19 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch index 31fe41f549..53aad00d93 100644 --- a/patches/api/0145-Expose-attack-cooldown-methods-for-Player.patch +++ b/patches/api/0145-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 105c076bdb6396c0b630b341ff306214d5d61567..f5bd443d3ed2b9d822dcd24e648868b9e1f4f6d9 100644 +index 8a0e8447a7c5241a53ae933229f369bf93300c72..dc9829ab0f4efcf9534f1b2d4a2e48ea49e8d372 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3311,6 +3311,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3316,6 +3316,28 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void setPlayerProfile(com.destroystokyo.paper.profile.@NotNull PlayerProfile profile); // Paper end - Player Profile API diff --git a/patches/api/0151-Material-API-additions.patch b/patches/api/0151-Material-API-additions.patch index d64d21c758..2b4bfbc34d 100644 --- a/patches/api/0151-Material-API-additions.patch +++ b/patches/api/0151-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 0a5dfd728a1988d8bc937ea5122dff4cbe546cfe..fb6e030af69b085946a029d89347b19b121f6a14 100644 +index 019cc6baf8c767d973feba55ddc99a8d222e00d8..6ffed5ef4331498ff318ffc5850f8b9a0b85eba7 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -128,6 +128,7 @@ import org.jetbrains.annotations.Nullable; +@@ -127,6 +127,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index 0a5dfd728a1988d8bc937ea5122dff4cbe546cfe..fb6e030af69b085946a029d89347b19b public enum Material implements Keyed, Translatable { // AIR(9648, 0), -@@ -4728,6 +4729,22 @@ public enum Material implements Keyed, Translatable { +@@ -4660,6 +4661,22 @@ public enum Material implements Keyed, Translatable { } } diff --git a/patches/api/0152-Add-Material-Tags.patch b/patches/api/0152-Add-Material-Tags.patch index 624dd5825b..87df8a1b1e 100644 --- a/patches/api/0152-Add-Material-Tags.patch +++ b/patches/api/0152-Add-Material-Tags.patch @@ -1138,7 +1138,7 @@ index 0000000000000000000000000000000000000000..5376e51adf5af15572b0d760b17f2de6 + .ensureSize("WATER_BASED", 11).lock(); +} diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index 54861b283e82f0a9789eda508356c8a8accb0545..33c75db0fcbbd771a59764c5d90484cee27b60cf 100644 +index e2a9b7db56e3048d1872f008a104bc33ddba98c3..b587897a26e9464b61a29e7482c60d2a66469571 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java @@ -11,6 +11,10 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0159-Make-the-default-permission-message-configurable.patch b/patches/api/0159-Make-the-default-permission-message-configurable.patch index 3718459df1..10b063f125 100644 --- a/patches/api/0159-Make-the-default-permission-message-configurable.patch +++ b/patches/api/0159-Make-the-default-permission-message-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 7bf662bd0eafcec46bb12cae78628e5045cbc299..de678fa681fbd94efa8fd85568ee092ae26fca85 100644 +index 5c0f610a45b6dc97f68f90a54f69b4c787157ef3..fb143a39f81ca7f14688ee3515a06256feac0f80 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2406,6 +2406,28 @@ public final class Bukkit { +@@ -2418,6 +2418,28 @@ public final class Bukkit { return server.suggestPlayerNamesWhenNullTabCompletions(); } @@ -38,10 +38,10 @@ index 7bf662bd0eafcec46bb12cae78628e5045cbc299..de678fa681fbd94efa8fd85568ee092a * Creates a PlayerProfile for the specified uuid, with name as null. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f352b10ad81ee21ddbf9d09ccbc6e919cb670bf9..a7a04a4e9c94cc43ccf84abb3b7956b60c79e8fe 100644 +index b26cbe2246722ff5d8ffad6a5734478146e3e192..c1a1baa2c79ad48b210e770f198ca9a2d7815df4 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2096,6 +2096,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2106,6 +2106,23 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ boolean suggestPlayerNamesWhenNullTabCompletions(); diff --git a/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index dd625f4153..28494eb9d4 100644 --- a/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/patches/api/0164-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index ef85e57f812c501fac7abe7dd27c93702f66646f..f5d3e5c5d79910580b6202e7aee01341d09f6225 100644 +index a9d63b1630b05b86a0396355fcfee261bab96293..d81701f0128bdeca180ff9957621f695c787f334 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -223,7 +223,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch index e719813aee..fe3778cf5b 100644 --- a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch @@ -12,10 +12,10 @@ that continues to have use (internally). These do not help plugin developers if they bring moise noise than value. diff --git a/src/main/java/org/bukkit/Art.java b/src/main/java/org/bukkit/Art.java -index 0c20c6bf442de6015d673f5e4e7695ec6d96895e..e6e1606a202a825a45d2f5256441668ced90d7fa 100644 +index dadff073abb2dec39111e677ec77ffdb2b7ff9a9..042d1d932a33022e4fc873652f70dc6ed342d46a 100644 --- a/src/main/java/org/bukkit/Art.java +++ b/src/main/java/org/bukkit/Art.java -@@ -76,9 +76,9 @@ public enum Art implements Keyed { +@@ -96,9 +96,9 @@ public enum Art implements Keyed { * Get the ID of this painting. * * @return The ID of this painting @@ -27,7 +27,7 @@ index 0c20c6bf442de6015d673f5e4e7695ec6d96895e..e6e1606a202a825a45d2f5256441668c public int getId() { return id; } -@@ -94,9 +94,9 @@ public enum Art implements Keyed { +@@ -114,9 +114,9 @@ public enum Art implements Keyed { * * @param id The ID * @return The painting @@ -40,10 +40,10 @@ index 0c20c6bf442de6015d673f5e4e7695ec6d96895e..e6e1606a202a825a45d2f5256441668c public static Art getById(int id) { return BY_ID.get(id); diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c93b84b4928ea8690602d7904eb9de4418d9e20e..82e973a8d5700c97eac3592981560f134127f6a8 100644 +index fb143a39f81ca7f14688ee3515a06256feac0f80..7b29a19610dbdc99e3662f70a8a291e6203edd1a 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -879,9 +879,8 @@ public final class Bukkit { +@@ -880,9 +880,8 @@ public final class Bukkit { * * @param id the id of the map to get * @return a map view if it exists, or null otherwise @@ -54,7 +54,7 @@ index c93b84b4928ea8690602d7904eb9de4418d9e20e..82e973a8d5700c97eac3592981560f13 @Nullable public static MapView getMap(int id) { return server.getMap(id); -@@ -960,8 +959,14 @@ public final class Bukkit { +@@ -961,8 +960,14 @@ public final class Bukkit { * Returns the primary logger associated with this server instance. * * @return Logger associated with this server @@ -69,7 +69,7 @@ index c93b84b4928ea8690602d7904eb9de4418d9e20e..82e973a8d5700c97eac3592981560f13 public static Logger getLogger() { return server.getLogger(); } -@@ -1358,10 +1363,8 @@ public final class Bukkit { +@@ -1359,10 +1364,8 @@ public final class Bukkit { * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) @@ -81,7 +81,7 @@ index c93b84b4928ea8690602d7904eb9de4418d9e20e..82e973a8d5700c97eac3592981560f13 @NotNull public static OfflinePlayer getOfflinePlayer(@NotNull String name) { return server.getOfflinePlayer(name); -@@ -1963,7 +1966,7 @@ public final class Bukkit { +@@ -1975,7 +1978,7 @@ public final class Bukkit { * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -300,10 +300,10 @@ index c30600666e7b32b8b4ba1e20ede04fd5ebd5a692..eec6c9cd7da6938351905129bb5a66f4 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 f01f8a3cfb40ca7e7d6b6714b678b19779bc866c..5ccca18290ffc3d0933e579fbb31bd64c527488d 100644 +index 6ffed5ef4331498ff318ffc5850f8b9a0b85eba7..444406eb7f0c3cd13039bf809254e480ee6fa24f 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4749,20 +4749,20 @@ public enum Material implements Keyed, Translatable { +@@ -4681,20 +4681,20 @@ public enum Material implements Keyed, Translatable { * Do not use for any reason. * * @return ID of this material @@ -328,7 +328,7 @@ index f01f8a3cfb40ca7e7d6b6714b678b19779bc866c..5ccca18290ffc3d0933e579fbb31bd64 public boolean isLegacy() { return legacy; } -@@ -4838,8 +4838,10 @@ public enum Material implements Keyed, Translatable { +@@ -4770,8 +4770,10 @@ public enum Material implements Keyed, Translatable { * Gets the MaterialData class associated with this Material * * @return MaterialData associated with this Material @@ -339,7 +339,7 @@ index f01f8a3cfb40ca7e7d6b6714b678b19779bc866c..5ccca18290ffc3d0933e579fbb31bd64 public Class getData() { Preconditions.checkArgument(legacy, "Cannot get data class of Modern Material"); return ctor.getDeclaringClass(); -@@ -5295,7 +5297,11 @@ public enum Material implements Keyed, Translatable { +@@ -5227,7 +5229,11 @@ public enum Material implements Keyed, Translatable { * material. * * @return true if this material can be interacted with. @@ -453,7 +453,7 @@ index 48aecc9421c500137bbef1dfe3bec8de277c3ff9..aff858346776386f1288b648b221404f return note; } diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index e723bafe37b917eff0e0795c3c8c2467fe4bb231..3e0d1026e2581b4a8d23d55b7c98b028a58d22dd 100644 +index f1a7f3b3e20963fa9d97bcc0686a35863de2b60f..3effaea369d9c7a6a22979fbfc270f55f9f25cf2 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java @@ -220,14 +220,12 @@ public interface Registry extends Iterable { @@ -471,7 +471,7 @@ index e723bafe37b917eff0e0795c3c8c2467fe4bb231..3e0d1026e2581b4a8d23d55b7c98b028 Registry TRIM_PATTERN = Bukkit.getRegistry(TrimPattern.class); /** * Damage types. -@@ -329,8 +327,11 @@ public interface Registry extends Iterable { +@@ -336,8 +334,11 @@ public interface Registry extends Iterable { * * @param input non-null input * @return registered object or null if does not exist @@ -498,10 +498,10 @@ index 6277451c3c6c551078c237cd767b6d70c4f585ea..10f5cfb1885833a1d2c1027c03974da4 CRACKED(0x0), GLYPHED(0x1), diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index fc2c2941d247a1592194f11fddc1dc547269dcc7..e11398ca751d4d8b043b73f78f56b837229f70af 100644 +index c1a1baa2c79ad48b210e770f198ca9a2d7815df4..75b3295a5544626d28c57b317d95db90722de719 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -740,9 +740,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -741,9 +741,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @param id the id of the map to get * @return a map view if it exists, or null otherwise @@ -512,7 +512,7 @@ index fc2c2941d247a1592194f11fddc1dc547269dcc7..e11398ca751d4d8b043b73f78f56b837 @Nullable public MapView getMap(int id); -@@ -809,8 +808,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -810,8 +809,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * Returns the primary logger associated with this server instance. * * @return Logger associated with this server @@ -527,7 +527,7 @@ index fc2c2941d247a1592194f11fddc1dc547269dcc7..e11398ca751d4d8b043b73f78f56b837 public Logger getLogger(); /** -@@ -1147,10 +1152,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1148,10 +1153,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) @@ -539,7 +539,7 @@ index fc2c2941d247a1592194f11fddc1dc547269dcc7..e11398ca751d4d8b043b73f78f56b837 @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); -@@ -1659,7 +1662,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1669,7 +1672,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @return the scoreboard manager or null if no worlds are loaded. */ @@ -730,10 +730,10 @@ index b90f5dc345ad2cdd3ae353dc57f42a14c231d18a..a7b915ded9154d53ac8ca599119c1699 public static PistonMoveReaction getById(int id) { return byId.get(id); diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 9db24da6836de45b7aff8d89782e6b0e1bc5391b..6a89c75d913ee1ef5b368064a4cdc1ec0c96ce2b 100644 +index c7a901707048e9dc82b8f17f3285727460173c72..64675a3641acb50676ca0122f8473ce94de8fba7 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -274,7 +274,7 @@ public abstract class Enchantment implements Keyed, Translatable { +@@ -269,7 +269,7 @@ public abstract class Enchantment implements Keyed, Translatable { * @deprecated enchantment groupings are now managed by tags, not categories */ @NotNull @@ -767,10 +767,10 @@ index 3afe2787de576f7190d87c796bea0ab34dc30248..58191017244f3949f6174fb108e3a245 /** diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index bd6f99128728d2607530802caee438ae1fe0d2a3..afbd43ef062efae32c112ca8299b05a3796ee4fc 100644 +index 4047f026ab796eca7ad2d6718e1436f251c08e93..d248069adfc67eb840951f7ab4a1fa5d30214dec 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -394,9 +394,9 @@ public enum EntityType implements Keyed, Translatable { +@@ -381,9 +381,9 @@ public enum EntityType implements Keyed, Translatable { * * @param name the entity type's name * @return the matching entity type or null @@ -874,10 +874,10 @@ index 95c79c5fa0c4e30201f887da6467ce5f81c8a255..7f9c4d4b430a3f0276461346ff2621ba /** diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f5bd443d3ed2b9d822dcd24e648868b9e1f4f6d9..a0ea2ba0995a54fa12037d2a2ebe8ef9e2dd4bd0 100644 +index dc9829ab0f4efcf9534f1b2d4a2e48ea49e8d372..e65f4f0df2e6832cf089572822c96ecc7a83dab3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1635,11 +1635,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1640,11 +1640,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Forces an update of the player's entire inventory. @@ -1587,10 +1587,10 @@ index 597a18a767b68b47e81454b7d44613c7178c1366..bc3440eb72127824b3961fbdae583bb6 public ItemStack getInput() { return this.ingredient.getItemStack(); diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index fe0f8459a381c35e1e7a312a2f63d6e6eda088d6..27dfb5704b190f469dbe3d8fccd3cf47999b7133 100644 +index 707d6138f4b27370ee68c8396204f89fa0fb65f2..bdb8b666ded9837382093e6353c8d60ed8d77033 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -@@ -143,6 +143,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -144,6 +144,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste /** * Checks for existence of a localized name. * @@ -1598,7 +1598,7 @@ index fe0f8459a381c35e1e7a312a2f63d6e6eda088d6..27dfb5704b190f469dbe3d8fccd3cf47 * @return true if this has a localized name * @deprecated meta no longer exists */ -@@ -155,6 +156,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -156,6 +157,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste * Plugins should check that hasLocalizedName() returns true * before calling this method. * @@ -1606,7 +1606,7 @@ index fe0f8459a381c35e1e7a312a2f63d6e6eda088d6..27dfb5704b190f469dbe3d8fccd3cf47 * @return the localized name that is set * @deprecated meta no longer exists */ -@@ -165,6 +167,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -166,6 +168,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste /** * Sets the localized name. * diff --git a/patches/api/0174-Add-Heightmap-API.patch b/patches/api/0174-Add-Heightmap-API.patch index 9c0ab69035..c069ec6536 100644 --- a/patches/api/0174-Add-Heightmap-API.patch +++ b/patches/api/0174-Add-Heightmap-API.patch @@ -51,7 +51,7 @@ index 0000000000000000000000000000000000000000..1c832d69bb3717dcfccf21e45f6f060a + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index f0878c7539696cc0676e6010e88914d3850acf20..c6049747fc286acb4e8053901fcc517e5170afa2 100644 +index eec6c9cd7da6938351905129bb5a66f49a257d01..a104efba13133ce2bc397e32af53da8889218e11 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -649,6 +649,46 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm @@ -102,7 +102,7 @@ index f0878c7539696cc0676e6010e88914d3850acf20..c6049747fc286acb4e8053901fcc517e /** * Creates explosion at this location with given power diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index a523d1725f175c924ab1a7d544d389ec81b68bcf..77314fdbd99a5cc34e7a1df4692ba8a1685ef002 100644 +index 216995288f6b8b407ef8240411b5ed4713379a7a..c1fd76e1b8d0f326f985662a2845f76c1cdf5d40 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -153,6 +153,87 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0176-Add-BlockSoundGroup-interface.patch b/patches/api/0176-Add-BlockSoundGroup-interface.patch index bb3a1fee88..76ed1fa86d 100644 --- a/patches/api/0176-Add-BlockSoundGroup-interface.patch +++ b/patches/api/0176-Add-BlockSoundGroup-interface.patch @@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..2bde2b7c960b321d0c1396212858c780 + Sound getFallSound(); +} diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index c7ef0386a09a07a2317c56274ed41218dfd7153d..2b247b757a3707c8556b33b54ed7dc83a72f3075 100644 +index e4393f2bd71308a58305cb870271d6a647ffcd92..e63fc428543498fc5a12856671d83f13f7de8442 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -616,4 +616,25 @@ public interface Block extends Metadatable, Translatable { diff --git a/patches/api/0179-Expose-the-internal-current-tick.patch b/patches/api/0179-Expose-the-internal-current-tick.patch index bffe9779af..f080acd155 100644 --- a/patches/api/0179-Expose-the-internal-current-tick.patch +++ b/patches/api/0179-Expose-the-internal-current-tick.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 2f023dcab9fe1ea220ba04e575bb5efe78adbd45..5d927fe08057d7fe2016f5b019dbbaa647b3ad0e 100644 +index 7b29a19610dbdc99e3662f70a8a291e6203edd1a..21f7d4c0e62058df9e8e0d37886e24649a7fab67 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2513,6 +2513,10 @@ public final class Bukkit { +@@ -2525,6 +2525,10 @@ public final class Bukkit { public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) { return server.createProfileExact(uuid, name); } @@ -20,10 +20,10 @@ index 2f023dcab9fe1ea220ba04e575bb5efe78adbd45..5d927fe08057d7fe2016f5b019dbbaa6 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 6d72b50b12315caf29842b5cf52e67715de8877d..309191a5346ed9b17cf8f3aac9d587400972fda6 100644 +index 75b3295a5544626d28c57b317d95db90722de719..5889209e9855d26f07d4cb4b8f9d448fd31e4c87 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2190,5 +2190,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2200,5 +2200,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name); diff --git a/patches/api/0180-Improve-Block-breakNaturally-API.patch b/patches/api/0180-Improve-Block-breakNaturally-API.patch index 54820995ca..2b4f718585 100644 --- a/patches/api/0180-Improve-Block-breakNaturally-API.patch +++ b/patches/api/0180-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 f468e9751f75fd355512e033c180de967de5b2d8..bf29d9b733afc7c62725d259f4920c4f211cc6d0 100644 +index e63fc428543498fc5a12856671d83f13f7de8442..745413357506fa7399f8ba44dfe222d1f0c919f1 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/0183-Entity-Jump-API.patch b/patches/api/0183-Entity-Jump-API.patch index fb5b69da63..2360a174f5 100644 --- a/patches/api/0183-Entity-Jump-API.patch +++ b/patches/api/0183-Entity-Jump-API.patch @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..a6306c957fcacdcbcc8037b4ee33a167 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 2b791a093a1220be80eb6b9d7202f6596fcf2dd6..d134a7406e3960e12e811085257a1e0052abb499 100644 +index ec35111df4b38fd55cc34f4baedebcf39c7fc92b..fdb985763d0a7b0a31ad938616e11ef244f63062 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1149,4 +1149,26 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0185-Add-tick-times-API.patch b/patches/api/0185-Add-tick-times-API.patch index bd91d2fb9b..29301f813d 100644 --- a/patches/api/0185-Add-tick-times-API.patch +++ b/patches/api/0185-Add-tick-times-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 836b5d1363ffcff08708b6b4721253ade99eb987..1a8f4e122b84b423fe19bfafad56d6d3df9ec134 100644 +index 21f7d4c0e62058df9e8e0d37886e24649a7fab67..b9b4a7574763b0a22d1f6faf6170eb127d488b18 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2179,6 +2179,25 @@ public final class Bukkit { +@@ -2191,6 +2191,25 @@ public final class Bukkit { public static double[] getTPS() { return server.getTPS(); } @@ -35,10 +35,10 @@ index 836b5d1363ffcff08708b6b4721253ade99eb987..1a8f4e122b84b423fe19bfafad56d6d3 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 387478b3e4ad9877f3338b719ff447126ef16285..fc4e259e5ca7a4b25f276bda7f2f5ea022d0c552 100644 +index 5889209e9855d26f07d4cb4b8f9d448fd31e4c87..d52c81212187a1aea1e666ba2f16bbf273a23594 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1846,6 +1846,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1856,6 +1856,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull public double[] getTPS(); diff --git a/patches/api/0186-Expose-MinecraftServer-isRunning.patch b/patches/api/0186-Expose-MinecraftServer-isRunning.patch index 86a6f882ab..4523ddefdc 100644 --- a/patches/api/0186-Expose-MinecraftServer-isRunning.patch +++ b/patches/api/0186-Expose-MinecraftServer-isRunning.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index c0f8a858b26768f078ca079010af5544fe6199be..14dee17cfdfcc507d60ba10de3fe6d429dd67654 100644 +index b9b4a7574763b0a22d1f6faf6170eb127d488b18..eaf1cd1b1b74df33f9b4a0809a9570181c67aebe 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2536,6 +2536,15 @@ public final class Bukkit { +@@ -2548,6 +2548,15 @@ public final class Bukkit { public static int getCurrentTick() { return server.getCurrentTick(); } @@ -26,10 +26,10 @@ index c0f8a858b26768f078ca079010af5544fe6199be..14dee17cfdfcc507d60ba10de3fe6d42 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e3fbaecb6f50e4daccde3df3657ae0a4dadf5688..5846bcd03e34b02b0c4dc0a1edca37cc62d0ac29 100644 +index d52c81212187a1aea1e666ba2f16bbf273a23594..1d11fd9a7283d529307bdb74603f03befff07d16 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2212,5 +2212,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2222,5 +2222,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return Current tick */ int getCurrentTick(); diff --git a/patches/api/0188-Add-Player-Client-Options-API.patch b/patches/api/0188-Add-Player-Client-Options-API.patch index d6bc210a19..485335d7ee 100644 --- a/patches/api/0188-Add-Player-Client-Options-API.patch +++ b/patches/api/0188-Add-Player-Client-Options-API.patch @@ -231,10 +231,10 @@ index 0000000000000000000000000000000000000000..1757055d821d9ec7c728aa6c1b52fa6a + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index a0ea2ba0995a54fa12037d2a2ebe8ef9e2dd4bd0..9a9d3b9f19ad96704172cc709f49c2a517f117c2 100644 +index e65f4f0df2e6832cf089572822c96ecc7a83dab3..b5573a26486fdfb6eb3aa7f9c46a67c8cddba34d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3330,6 +3330,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3335,6 +3335,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void resetCooldown(); // Paper end - attack cooldown API diff --git a/patches/api/0192-Add-Mob-Goal-API.patch b/patches/api/0192-Add-Mob-Goal-API.patch index 5b10f5b6dc..c3cd7426b8 100644 --- a/patches/api/0192-Add-Mob-Goal-API.patch +++ b/patches/api/0192-Add-Mob-Goal-API.patch @@ -226,10 +226,10 @@ index 0000000000000000000000000000000000000000..e21f7574763dd4f13794f91bbef192ef + Collection> getRunningGoalsWithout(@NotNull T mob, @NotNull GoalType type); +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 14dee17cfdfcc507d60ba10de3fe6d429dd67654..bd711e43abb012065dbefa911347a47c2aa4933a 100644 +index eaf1cd1b1b74df33f9b4a0809a9570181c67aebe..5626d424e2d05931134a6fa7e14c8ae9d5c71ee8 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2545,6 +2545,16 @@ public final class Bukkit { +@@ -2557,6 +2557,16 @@ public final class Bukkit { public static boolean isStopping() { return server.isStopping(); } @@ -247,10 +247,10 @@ index 14dee17cfdfcc507d60ba10de3fe6d429dd67654..bd711e43abb012065dbefa911347a47c @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 5846bcd03e34b02b0c4dc0a1edca37cc62d0ac29..755d68961171fc6c520e9f8ee908c99c1f404584 100644 +index 1d11fd9a7283d529307bdb74603f03befff07d16..edfd016d7dd516c253444c8efa22cf92352da283 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2219,5 +2219,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2229,5 +2229,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return true if server is in the process of being shutdown */ boolean isStopping(); diff --git a/patches/api/0198-Support-components-in-ItemMeta.patch b/patches/api/0198-Support-components-in-ItemMeta.patch index fef8e2f0a2..09fb2309cf 100644 --- a/patches/api/0198-Support-components-in-ItemMeta.patch +++ b/patches/api/0198-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 27dfb5704b190f469dbe3d8fccd3cf47999b7133..434535afdbab29a21cd5eea9f454d47887f21a4e 100644 +index bdb8b666ded9837382093e6353c8d60ed8d77033..3029c9a8db501d37ffd5f52ce482c8a608e328ea 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; @@ -16,7 +16,7 @@ index 27dfb5704b190f469dbe3d8fccd3cf47999b7133..434535afdbab29a21cd5eea9f454d478 import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeModifier; import org.bukkit.configuration.serialization.ConfigurationSerializable; -@@ -67,6 +68,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -68,6 +69,20 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @NotNull String getDisplayName(); @@ -37,7 +37,7 @@ index 27dfb5704b190f469dbe3d8fccd3cf47999b7133..434535afdbab29a21cd5eea9f454d478 /** * Sets the display name. * -@@ -76,6 +91,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -77,6 +92,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @Deprecated // Paper void setDisplayName(@Nullable String name); @@ -54,7 +54,7 @@ index 27dfb5704b190f469dbe3d8fccd3cf47999b7133..434535afdbab29a21cd5eea9f454d478 /** * Checks for existence of an item name. *
    -@@ -212,6 +237,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -213,6 +238,19 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @Nullable List getLore(); @@ -74,7 +74,7 @@ index 27dfb5704b190f469dbe3d8fccd3cf47999b7133..434535afdbab29a21cd5eea9f454d478 /** * Sets the lore for this item. * Removes lore when given null. -@@ -222,6 +260,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -223,6 +261,16 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @Deprecated // Paper void setLore(@Nullable List lore); diff --git a/patches/api/0203-Brand-support.patch b/patches/api/0203-Brand-support.patch index 643d286116..64e9c90fb4 100644 --- a/patches/api/0203-Brand-support.patch +++ b/patches/api/0203-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 9a9d3b9f19ad96704172cc709f49c2a517f117c2..fb86055ba15b677b0d8969995713ec7f950cb30a 100644 +index b5573a26486fdfb6eb3aa7f9c46a67c8cddba34d..3f7ce423ef9f43c1ce9f8ef968eb2e3220906d77 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3443,6 +3443,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3448,6 +3448,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM // Paper end } diff --git a/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch index 8530c705f9..28bd4b6872 100644 --- a/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch +++ b/patches/api/0205-Add-playPickupItemAnimation-to-LivingEntity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add playPickupItemAnimation to LivingEntity diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index d134a7406e3960e12e811085257a1e0052abb499..c71bc11f7a0a72d4e5d609e333ab99031ea813d2 100644 +index fdb985763d0a7b0a31ad938616e11ef244f63062..d87c49550e697ad545742baed40068623e83bf0b 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1171,4 +1171,29 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0207-Add-methods-to-get-translation-keys.patch b/patches/api/0207-Add-methods-to-get-translation-keys.patch index 266f5c06d3..519e8eb82f 100644 --- a/patches/api/0207-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0207-Add-methods-to-get-translation-keys.patch @@ -144,10 +144,10 @@ index dc66bd69646ac949d1386ce8f6ff913e9475439d..4482e8f2c617c2f51b2b53762e775d11 + // Paper end } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 5ccca18290ffc3d0933e579fbb31bd64c527488d..ab5db87139a887ef26e46812e59998f4ea83f28c 100644 +index 444406eb7f0c3cd13039bf809254e480ee6fa24f..c12bb07fcf29be1a284f5f272b35edf206633d4a 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -129,7 +129,7 @@ import org.jetbrains.annotations.Nullable; +@@ -128,7 +128,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 5ccca18290ffc3d0933e579fbb31bd64c527488d..ab5db87139a887ef26e46812e59998f4 // AIR(9648, 0), STONE(22948), -@@ -4745,6 +4745,17 @@ public enum Material implements Keyed, Translatable { +@@ -4677,6 +4677,17 @@ public enum Material implements Keyed, Translatable { } // Paper end @@ -174,7 +174,7 @@ index 5ccca18290ffc3d0933e579fbb31bd64c527488d..ab5db87139a887ef26e46812e59998f4 /** * Do not use for any reason. * -@@ -5494,9 +5505,11 @@ public enum Material implements Keyed, Translatable { +@@ -5426,9 +5437,11 @@ public enum Material implements Keyed, Translatable { * material * @see #getBlockTranslationKey() * @see #getItemTranslationKey() @@ -235,7 +235,7 @@ index e3faa2c675c85a9cbdbbb1debec0ff81c58a1bbd..fd1629c2d2028a88fb3d56b0aeb833d1 String getTranslationKey(); } diff --git a/src/main/java/org/bukkit/attribute/Attribute.java b/src/main/java/org/bukkit/attribute/Attribute.java -index 3a7f6fd862dc2dd72366089ce99a0e96d07c0fdc..063cb21e33d039933e9ef295564db595cfd9f8c9 100644 +index ef9c998691d101c26b5247a4962628a7bc9e513f..947874c0172b690e7752e49b7bec64e0c0308515 100644 --- a/src/main/java/org/bukkit/attribute/Attribute.java +++ b/src/main/java/org/bukkit/attribute/Attribute.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; @@ -247,7 +247,7 @@ index 3a7f6fd862dc2dd72366089ce99a0e96d07c0fdc..063cb21e33d039933e9ef295564db595 /** * Maximum health of an Entity. -@@ -117,4 +117,12 @@ public enum Attribute implements Keyed, Translatable { +@@ -153,4 +153,12 @@ public enum Attribute implements Keyed, Translatable { public String getTranslationKey() { return Bukkit.getUnsafe().getTranslationKey(this); } @@ -312,10 +312,10 @@ index 745413357506fa7399f8ba44dfe222d1f0c919f1..25db31b2e9a6d75f0c59f75237842f9a // Paper end } diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java -index 2fd6f52ad69074f1a060b9a85c1a0f01ae2add2d..56bc4cbc9af40e7fa400293ddc2479c7d2754c55 100644 +index 4288bebf690a9cee6ff9a712352d1dcbb035eb77..a08c52949af1d2416ecb089fc559db2e3b29105c 100644 --- a/src/main/java/org/bukkit/block/BlockType.java +++ b/src/main/java/org/bukkit/block/BlockType.java -@@ -125,7 +125,7 @@ import org.jetbrains.annotations.Nullable; +@@ -123,7 +123,7 @@ import org.jetbrains.annotations.Nullable; * changes may occur. Do not use this API in plugins. */ @ApiStatus.Internal @@ -324,7 +324,7 @@ index 2fd6f52ad69074f1a060b9a85c1a0f01ae2add2d..56bc4cbc9af40e7fa400293ddc2479c7 /** * Typed represents a subtype of {@link BlockType}s that have a known block -@@ -3603,4 +3603,13 @@ public interface BlockType extends Keyed, Translatable { +@@ -3491,4 +3491,13 @@ public interface BlockType extends Keyed, Translatable { @Nullable @Deprecated Material asMaterial(); @@ -339,10 +339,10 @@ index 2fd6f52ad69074f1a060b9a85c1a0f01ae2add2d..56bc4cbc9af40e7fa400293ddc2479c7 + // Paper end - add Translatable } diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 6a89c75d913ee1ef5b368064a4cdc1ec0c96ce2b..0d6b06e09f6682d04623d176fcfd350cfa6a702a 100644 +index 64675a3641acb50676ca0122f8473ce94de8fba7..c481b8ffb694519010f2bc3bc6447376ed802467 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -17,7 +17,7 @@ import org.jetbrains.annotations.Nullable; +@@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; /** * The various type of enchantments that may be added to armour or weapons */ @@ -367,10 +367,10 @@ index c4f86ba1037f3f0e5d697a0962d71d6f8c7c1fbe..ac0371285370594d4de1554871b19bbc // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index afbd43ef062efae32c112ca8299b05a3796ee4fc..54fbfa2bce8d73a66ca165ba7227c574b58f91cb 100644 +index d248069adfc67eb840951f7ab4a1fa5d30214dec..976f701ed9b9873945a5628173c580e2e6873864 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Contract; +@@ -23,7 +23,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -379,7 +379,7 @@ index afbd43ef062efae32c112ca8299b05a3796ee4fc..54fbfa2bce8d73a66ca165ba7227c574 // These strings MUST match the strings in nms.EntityTypes and are case sensitive. /** -@@ -440,10 +440,22 @@ public enum EntityType implements Keyed, Translatable { +@@ -427,10 +427,22 @@ public enum EntityType implements Keyed, Translatable { @Override @NotNull @@ -547,10 +547,10 @@ index adb6576ba60219c15bcfddae03cd90e24906b01a..427e0012376effbd1b459da094ac8e4d // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java -index cf855eaf2859566a7c5763f838ff3fbecb9e3124..006c5e6449ec21b96c9e5af2fa00ae240451eeca 100644 +index 270f85e99084ddf029bef076c335fe6b9bbddbb5..5dd1c084e42ee93f3a358f58ed76b0a7d36f0713 100644 --- a/src/main/java/org/bukkit/inventory/ItemType.java +++ b/src/main/java/org/bukkit/inventory/ItemType.java -@@ -49,7 +49,7 @@ import org.jetbrains.annotations.Nullable; +@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable; * changes may occur. Do not use this API in plugins. */ @ApiStatus.Internal @@ -559,7 +559,7 @@ index cf855eaf2859566a7c5763f838ff3fbecb9e3124..006c5e6449ec21b96c9e5af2fa00ae24 /** * Typed represents a subtype of {@link ItemType}s that have a known item meta type -@@ -2445,4 +2445,13 @@ public interface ItemType extends Keyed, Translatable { +@@ -2302,4 +2302,13 @@ public interface ItemType extends Keyed, Translatable { @Nullable @Deprecated Material asMaterial(); diff --git a/patches/api/0213-Player-elytra-boost-API.patch b/patches/api/0213-Player-elytra-boost-API.patch index 3002c253d7..5567832274 100644 --- a/patches/api/0213-Player-elytra-boost-API.patch +++ b/patches/api/0213-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 fb86055ba15b677b0d8969995713ec7f950cb30a..d03c0abada5389311d4d88c69bfb3ce8f981ac8a 100644 +index 3f7ce423ef9f43c1ce9f8ef968eb2e3220906d77..77e14139e5cd22278e6decc7e5de31411fa2ae45 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3337,6 +3337,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3342,6 +3342,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @NotNull T getClientOption(com.destroystokyo.paper.@NotNull ClientOption option); // Paper end - client option API diff --git a/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch index 065ab10dd0..52181f0970 100644 --- a/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch +++ b/patches/api/0214-Add-getOfflinePlayerIfCached-String.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f2fa4c419f212ea5d7ca0aab4ead4bd44dac5947..3210587c341bc8d80ddc7f387ca4030dbd0074c9 100644 +index 5626d424e2d05931134a6fa7e14c8ae9d5c71ee8..188280a8fdf35a70a5a358f8cfe7cf44f05855b1 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1370,6 +1370,27 @@ public final class Bukkit { +@@ -1371,6 +1371,27 @@ public final class Bukkit { return server.getOfflinePlayer(name); } @@ -37,10 +37,10 @@ index f2fa4c419f212ea5d7ca0aab4ead4bd44dac5947..3210587c341bc8d80ddc7f387ca4030d * Gets the player by the given UUID, regardless if they are offline or * online. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 711de014b7cf69459526e6c20c94f29ee4db11c4..f0c1d16c6bee58826a3cde3c4988e02690207fce 100644 +index edfd016d7dd516c253444c8efa22cf92352da283..076ed338c2f3230be30225a48e3c72dc894cf70a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1157,6 +1157,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1158,6 +1158,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); diff --git a/patches/api/0219-Add-Destroy-Speed-API.patch b/patches/api/0219-Add-Destroy-Speed-API.patch index cdf304d00b..4fb7eb4c7b 100644 --- a/patches/api/0219-Add-Destroy-Speed-API.patch +++ b/patches/api/0219-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 1d3812db989a55b6f31bb30dffe70323eb592a15..4aea4be0677d93e17a4ce98dd340dd9921f996a0 100644 +index 25db31b2e9a6d75f0c59f75237842f9ad7d1c350..75c2aadb0a2baebe8b2625ad11b16380285d65c5 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -690,4 +690,31 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0220-Add-LivingEntity-clearActiveItem.patch b/patches/api/0220-Add-LivingEntity-clearActiveItem.patch index 03307beabf..64de25a82d 100644 --- a/patches/api/0220-Add-LivingEntity-clearActiveItem.patch +++ b/patches/api/0220-Add-LivingEntity-clearActiveItem.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#clearActiveItem diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index c71bc11f7a0a72d4e5d609e333ab99031ea813d2..ac8d9e3238a4d47170ba8e79bc5f259cbfd3fa33 100644 +index d87c49550e697ad545742baed40068623e83bf0b..a2489932c07b1b56d3e340ecfeddd3df95cf4eb6 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1061,6 +1061,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0225-Expose-LivingEntity-hurt-direction.patch b/patches/api/0225-Expose-LivingEntity-hurt-direction.patch index 2957bd50ae..2dc78a669d 100644 --- a/patches/api/0225-Expose-LivingEntity-hurt-direction.patch +++ b/patches/api/0225-Expose-LivingEntity-hurt-direction.patch @@ -26,7 +26,7 @@ index 5ecfb98540c00da05b13bc5370debb89c52cc76f..083d5798ccc7f37c6df5e234c7ef2332 * Get the sleep ticks of the player. This value may be capped. * diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ac8d9e3238a4d47170ba8e79bc5f259cbfd3fa33..b75b79512a8fd7054f0c0c08e34f6900309e522c 100644 +index a2489932c07b1b56d3e340ecfeddd3df95cf4eb6..4327045ec437c9c81bcd4c34c4959de6d5798132 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1201,4 +1201,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0229-Additional-Block-Material-API-s.patch b/patches/api/0229-Additional-Block-Material-API-s.patch index ab3e6f9ac6..98a66a166c 100644 --- a/patches/api/0229-Additional-Block-Material-API-s.patch +++ b/patches/api/0229-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 4aea4be0677d93e17a4ce98dd340dd9921f996a0..c68ed7de2d50da4105dd38c0986f237e8c56b2d6 100644 +index 75c2aadb0a2baebe8b2625ad11b16380285d65c5..36e177757624c4fc7835e253d3b2dd773f50f43d 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/0240-Add-sendOpLevel-API.patch b/patches/api/0240-Add-sendOpLevel-API.patch index c26d4983d4..360c197b18 100644 --- a/patches/api/0240-Add-sendOpLevel-API.patch +++ b/patches/api/0240-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 d03c0abada5389311d4d88c69bfb3ce8f981ac8a..0ac6fd7207311d27a650f5811e39de05e8f5fa9b 100644 +index 77e14139e5cd22278e6decc7e5de31411fa2ae45..466218a3b7f749b3de67e619285ceeb6d85cc28e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3356,6 +3356,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3361,6 +3361,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM } // Paper end - elytra boost API diff --git a/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch b/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch index 9cf2ffe5c1..5ef38910f9 100644 --- a/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch +++ b/patches/api/0241-Add-RegistryAccess-for-managing-registries.patch @@ -190,10 +190,10 @@ index 791813220b2504214b1adecc69093cd600fb0f8c..47fe5b0d5d031110c27210a0a256c260 final RegistryKey registryKey = createInternal(key); REGISTRY_KEYS.add(registryKey); diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 607fe5038c2a1a579c6eba16a732a6b0c42cc9b7..be1e26f4d41e991d5ffcca95d600558771fc2f26 100644 +index 188280a8fdf35a70a5a358f8cfe7cf44f05855b1..ceaa901fa830e904d6ac7a1727d1e7d185107e11 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2395,8 +2395,11 @@ public final class Bukkit { +@@ -2407,8 +2407,11 @@ public final class Bukkit { * @param tClass of the registry to get * @param type of the registry * @return the corresponding registry or null if not present @@ -206,7 +206,7 @@ index 607fe5038c2a1a579c6eba16a732a6b0c42cc9b7..be1e26f4d41e991d5ffcca95d6005587 return server.getRegistry(tClass); } diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 3e0d1026e2581b4a8d23d55b7c98b028a58d22dd..4857262f95e635e17aeaee83052ffcdf5502b736 100644 +index 3effaea369d9c7a6a22979fbfc270f55f9f25cf2..9daa96d4e87a6b11eef7abd6e0f9fbf05a57bb97 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java @@ -102,7 +102,7 @@ public interface Registry extends Iterable { @@ -302,9 +302,9 @@ index 3e0d1026e2581b4a8d23d55b7c98b028a58d22dd..4857262f95e635e17aeaee83052ffcdf + @Deprecated(since = "1.20.6") + Registry DAMAGE_TYPE = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(DamageType.class), "No registry present for DamageType. This is a bug."); // Paper /** - * Villager profession. + * Jukebox songs. * -@@ -287,8 +294,10 @@ public interface Registry extends Iterable { +@@ -294,8 +301,10 @@ public interface Registry extends Iterable { * Wolf variants. * * @see Wolf.Variant @@ -316,7 +316,7 @@ index 3e0d1026e2581b4a8d23d55b7c98b028a58d22dd..4857262f95e635e17aeaee83052ffcdf /** * Map cursor types. * -@@ -301,7 +310,7 @@ public interface Registry extends Iterable { +@@ -308,7 +317,7 @@ public interface Registry extends Iterable { * * @see GameEvent */ @@ -326,10 +326,10 @@ index 3e0d1026e2581b4a8d23d55b7c98b028a58d22dd..4857262f95e635e17aeaee83052ffcdf * Get the object by its key. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index faf7b1bba8baa869294b0542fc53fe5ba1f4147a..0035e279eee2a5af44b992ae464bed7661e74657 100644 +index 076ed338c2f3230be30225a48e3c72dc894cf70a..fd3686688862fccc9989457cf3c1aaff777c66be 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2046,8 +2046,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2056,8 +2056,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param tClass of the registry to get * @param type of the registry * @return the corresponding registry or null if not present diff --git a/patches/api/0242-Add-StructuresLocateEvent.patch b/patches/api/0242-Add-StructuresLocateEvent.patch index 65a4641153..f8c97aa625 100644 --- a/patches/api/0242-Add-StructuresLocateEvent.patch +++ b/patches/api/0242-Add-StructuresLocateEvent.patch @@ -513,10 +513,10 @@ index 0000000000000000000000000000000000000000..1e7b53f9bc13dcd5a0a4a40004591e4f + } +} diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 4857262f95e635e17aeaee83052ffcdf5502b736..9a819b179ce3040e842be58a8ddceee2a14ffa59 100644 +index 9daa96d4e87a6b11eef7abd6e0f9fbf05a57bb97..acfc52e692c9361a6bf407ce046435fd5d364d29 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -311,6 +311,15 @@ public interface Registry extends Iterable { +@@ -318,6 +318,15 @@ public interface Registry extends Iterable { * @see GameEvent */ Registry GAME_EVENT = io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.registry.RegistryKey.GAME_EVENT); // Paper diff --git a/patches/api/0257-Add-Block-isValidTool.patch b/patches/api/0257-Add-Block-isValidTool.patch index 835cf73b7a..9e96f95354 100644 --- a/patches/api/0257-Add-Block-isValidTool.patch +++ b/patches/api/0257-Add-Block-isValidTool.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Block#isValidTool diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index c68ed7de2d50da4105dd38c0986f237e8c56b2d6..b5fe76a6353816a2d009dfa5921f8ada92984f34 100644 +index 36e177757624c4fc7835e253d3b2dd773f50f43d..6ada8c036f1a112f11a9fbc3baf1f79b3f1bfc8e 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -230,6 +230,15 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0258-Expand-world-key-API.patch b/patches/api/0258-Expand-world-key-API.patch index 51b61aef60..b43164495f 100644 --- a/patches/api/0258-Expand-world-key-API.patch +++ b/patches/api/0258-Expand-world-key-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index f35e5cd82c04bce3ca24120ca6cb5260a789b2d7..94abdf67a057ef02fc98b61c1b9376454cc5b4c8 100644 +index ceaa901fa830e904d6ac7a1727d1e7d185107e11..a60b1d57904eefeb832ab93fb0e556de9409e5ae 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -861,6 +861,18 @@ public final class Bukkit { +@@ -862,6 +862,18 @@ public final class Bukkit { public static World getWorld(@NotNull UUID uid) { return server.getWorld(uid); } @@ -56,10 +56,10 @@ index 27eff0826d5b5b48697fefd9571886e7bbce74b1..d8b1fa79dc24138dc71e32c14bda71c1 // Paper end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index c53268bc4c3ae275ad8765f0848e46e1d6c7372d..e1ab2090c1b219f12af382079907e440e9cf4379 100644 +index fd3686688862fccc9989457cf3c1aaff777c66be..1074a858f441133c9c3049601411a00b0d37cf3e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -722,6 +722,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -723,6 +723,17 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @Nullable public World getWorld(@NotNull UUID uid); diff --git a/patches/api/0259-Improve-Item-Rarity-API.patch b/patches/api/0259-Improve-Item-Rarity-API.patch index c81624d7d4..13716c349c 100644 --- a/patches/api/0259-Improve-Item-Rarity-API.patch +++ b/patches/api/0259-Improve-Item-Rarity-API.patch @@ -43,10 +43,10 @@ index 0000000000000000000000000000000000000000..f1cd5a4f37eee8975ac3d0421b524afc + } +} diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index ab5db87139a887ef26e46812e59998f4ea83f28c..c96c927367d22e2651a553a5e6685bde9c8f8873 100644 +index c12bb07fcf29be1a284f5f272b35edf206633d4a..cc25734f3dcf6075eb44e39da01ed2f1b59b618e 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4756,6 +4756,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4688,6 +4688,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla } // Paper end - add Translatable diff --git a/patches/api/0275-Add-basic-Datapack-API.patch b/patches/api/0275-Add-basic-Datapack-API.patch index b221cfb447..f8efe8e60c 100644 --- a/patches/api/0275-Add-basic-Datapack-API.patch +++ b/patches/api/0275-Add-basic-Datapack-API.patch @@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7 + +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 149c1a1cc39f79ca03e1f02cf2751885e0428895..4d8ff5b400a17fadefc25b3bf602eadb12cae4e9 100644 +index a60b1d57904eefeb832ab93fb0e556de9409e5ae..913ab7ce4a754739ef786086d4da55c93d37a39e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -327,9 +327,11 @@ public final class Bukkit { +@@ -328,9 +328,11 @@ public final class Bukkit { /** * Get the DataPack Manager. * @@ -85,7 +85,7 @@ index 149c1a1cc39f79ca03e1f02cf2751885e0428895..4d8ff5b400a17fadefc25b3bf602eadb public static DataPackManager getDataPackManager() { return server.getDataPackManager(); } -@@ -2591,6 +2593,14 @@ public final class Bukkit { +@@ -2603,6 +2605,14 @@ public final class Bukkit { public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() { return server.getMobGoals(); } @@ -101,10 +101,10 @@ index 149c1a1cc39f79ca03e1f02cf2751885e0428895..4d8ff5b400a17fadefc25b3bf602eadb @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 0c71aa3b5758dbfdce8782e02772f9450901adbd..2fa562ca863810cbba82d43bf452f61d9e02cfdb 100644 +index 1074a858f441133c9c3049601411a00b0d37cf3e..b383ca29be8f86e03e81dbb9962747c03aed1671 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -266,9 +266,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -267,9 +267,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi /** * Get the DataPack Manager. * @@ -116,7 +116,7 @@ index 0c71aa3b5758dbfdce8782e02772f9450901adbd..2fa562ca863810cbba82d43bf452f61d public DataPackManager getDataPackManager(); /** -@@ -2260,5 +2262,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2270,5 +2272,11 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull com.destroystokyo.paper.entity.ai.MobGoals getMobGoals(); @@ -129,31 +129,29 @@ index 0c71aa3b5758dbfdce8782e02772f9450901adbd..2fa562ca863810cbba82d43bf452f61d // Paper end } diff --git a/src/main/java/org/bukkit/packs/DataPack.java b/src/main/java/org/bukkit/packs/DataPack.java -index 3d5af25a399589f1bdf95b77f584ae0ae5c26f02..ab512c7ee9d2442055b719d02d0d0ecc7ea8d992 100644 +index ea03c51d51e015e69d3aaa795547033ceabff9e0..419f6bdbec5dc1c731fb0f93816a90f58a329021 100644 --- a/src/main/java/org/bukkit/packs/DataPack.java +++ b/src/main/java/org/bukkit/packs/DataPack.java -@@ -10,8 +10,10 @@ import org.jetbrains.annotations.NotNull; +@@ -9,7 +9,9 @@ import org.jetbrains.annotations.NotNull; * Represents a data pack. * * @see Minecraft wiki + * @deprecated use {@link io.papermc.paper.datapack.Datapack} */ - @ApiStatus.Experimental +@Deprecated(forRemoval = true) // Paper public interface DataPack extends Keyed { /** diff --git a/src/main/java/org/bukkit/packs/DataPackManager.java b/src/main/java/org/bukkit/packs/DataPackManager.java -index c33ca7b86426223200efa7df53faef061c3c7c0b..5ec17312564e245e6d482e89c2ef2a886d463154 100644 +index aee6e828c6fac9b010356af1239a58b4579c1773..7d3694efc21c7bc3784207735bdd9fb27e69988a 100644 --- a/src/main/java/org/bukkit/packs/DataPackManager.java +++ b/src/main/java/org/bukkit/packs/DataPackManager.java -@@ -13,8 +13,10 @@ import org.jetbrains.annotations.Nullable; +@@ -13,7 +13,9 @@ import org.jetbrains.annotations.Nullable; /** * Manager of data packs. + * @deprecated use {@link io.papermc.paper.datapack.DatapackManager} */ - @ApiStatus.Experimental +@Deprecated(forRemoval = true) // Paper public interface DataPackManager { diff --git a/patches/api/0278-More-Enchantment-API.patch b/patches/api/0278-More-Enchantment-API.patch index c596fa19b0..e9f6b0ead4 100644 --- a/patches/api/0278-More-Enchantment-API.patch +++ b/patches/api/0278-More-Enchantment-API.patch @@ -41,10 +41,10 @@ index 0000000000000000000000000000000000000000..aec3b41d7c3388e26fa203e3c062f1e6 + } +} diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index 0d6b06e09f6682d04623d176fcfd350cfa6a702a..f8d9fba8791303794ba3be6f42542c096222691d 100644 +index c481b8ffb694519010f2bc3bc6447376ed802467..b35f0702c0b5a63515f5d0188c7ef61550f8410e 100644 --- a/src/main/java/org/bukkit/enchantments/Enchantment.java +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -293,11 +293,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve +@@ -290,11 +290,7 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve * Cursed enchantments are found the same way treasure enchantments are * * @return true if the enchantment is cursed @@ -56,7 +56,7 @@ index 0d6b06e09f6682d04623d176fcfd350cfa6a702a..f8d9fba8791303794ba3be6f42542c09 public abstract boolean isCursed(); /** -@@ -331,6 +327,97 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve +@@ -328,6 +324,97 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve * @return the name of the enchantment with {@code level} applied */ public abstract net.kyori.adventure.text.@NotNull Component displayName(int level); diff --git a/patches/api/0282-Improve-item-default-attribute-API.patch b/patches/api/0282-Improve-item-default-attribute-API.patch index 44122db4a9..e7c6fb4cd2 100644 --- a/patches/api/0282-Improve-item-default-attribute-API.patch +++ b/patches/api/0282-Improve-item-default-attribute-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Improve item default attribute API diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index c96c927367d22e2651a553a5e6685bde9c8f8873..a011123035a96c05921f0a206b92bef15732b443 100644 +index cc25734f3dcf6075eb44e39da01ed2f1b59b618e..8b04e0d81c56712057f1fee288b3609ef5718c60 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4771,6 +4771,23 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4703,6 +4703,23 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla } // Paper end - item rarity API @@ -32,7 +32,7 @@ index c96c927367d22e2651a553a5e6685bde9c8f8873..a011123035a96c05921f0a206b92bef1 /** * Do not use for any reason. * -@@ -5478,13 +5495,34 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -5410,13 +5427,34 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla } } @@ -72,10 +72,10 @@ index c96c927367d22e2651a553a5e6685bde9c8f8873..a011123035a96c05921f0a206b92bef1 * * @param slot the {@link EquipmentSlot} to check diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java -index 006c5e6449ec21b96c9e5af2fa00ae240451eeca..a0cd105daf93fa02f243ef5b708efe9f3718d7bb 100644 +index 5dd1c084e42ee93f3a358f58ed76b0a7d36f0713..94587a97fcea81a43b160b01d2c81cef2b7f4413 100644 --- a/src/main/java/org/bukkit/inventory/ItemType.java +++ b/src/main/java/org/bukkit/inventory/ItemType.java -@@ -2404,6 +2404,21 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans +@@ -2261,6 +2261,21 @@ public interface ItemType extends Keyed, Translatable, net.kyori.adventure.trans // @NotNull // EquipmentSlot getEquipmentSlot(); diff --git a/patches/api/0285-Add-PlayerKickEvent-causes.patch b/patches/api/0285-Add-PlayerKickEvent-causes.patch index 5bded2058c..aa55ace2fe 100644 --- a/patches/api/0285-Add-PlayerKickEvent-causes.patch +++ b/patches/api/0285-Add-PlayerKickEvent-causes.patch @@ -5,10 +5,10 @@ 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 752b2bac47588c0f75a13a7e6ec2be3c2f5a149e..b177daa7a974125dc4ccf1bc6d119ad42dba3514 100644 +index 466218a3b7f749b3de67e619285ceeb6d85cc28e..7f854d545a76a6e4dd2439f9a6e193fa54d5874d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -321,6 +321,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -319,6 +319,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param message kick message */ void kick(final net.kyori.adventure.text.@Nullable Component message); diff --git a/patches/api/0289-Add-more-line-of-sight-methods.patch b/patches/api/0289-Add-more-line-of-sight-methods.patch index dc87546ce9..1515545500 100644 --- a/patches/api/0289-Add-more-line-of-sight-methods.patch +++ b/patches/api/0289-Add-more-line-of-sight-methods.patch @@ -23,7 +23,7 @@ index d8b1fa79dc24138dc71e32c14bda71c1d570ed88..b68367f123f029c3ff47eab6bfabd7a8 // Paper end } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index b75b79512a8fd7054f0c0c08e34f6900309e522c..62a301f2f87b053bcfbf16c9870c3f740eb70022 100644 +index 4327045ec437c9c81bcd4c34c4959de6d5798132..4ba92fe8979ed127c18cb78c2b8204daa2425ed7 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -622,6 +622,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0296-Stinger-API.patch b/patches/api/0296-Stinger-API.patch index e209e5da29..84fe8f4c22 100644 --- a/patches/api/0296-Stinger-API.patch +++ b/patches/api/0296-Stinger-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index ce5cf587ce44f2410c1d0bcf459b6309ec70bfee..f05883886928169600b6309dd12de3bdb633cca1 100644 +index 73247ab2cd2cf0035cf88c98250736f9bc9ee517..22428de50580f7b70d14484ba229aa271bfd7069 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -451,6 +451,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0298-Add-PlayerSetSpawnEvent.patch b/patches/api/0298-Add-PlayerSetSpawnEvent.patch index 42bce4d456..69443add9f 100644 --- a/patches/api/0298-Add-PlayerSetSpawnEvent.patch +++ b/patches/api/0298-Add-PlayerSetSpawnEvent.patch @@ -189,16 +189,15 @@ index 0000000000000000000000000000000000000000..6a823008deaf26f751e598bc967f19c1 + } +} diff --git a/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java -index c2884bc20f0040b15dc035f4761d021e7343960d..3ea03540ce2882bbb482d9bd69a015a7fc040bfd 100644 +index b22feeda89df7a40d9e684923030230d1dd0a0fb..a57aaf09a2ce29aaeb29f8587509170dbcad24e9 100644 --- a/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java -@@ -12,8 +12,10 @@ import org.jetbrains.annotations.Nullable; +@@ -10,7 +10,9 @@ import org.jetbrains.annotations.Nullable; + /** * This event is fired when the spawn point of the player is changed. - * @apiNote draft API + * @deprecated use {@link com.destroystokyo.paper.event.player.PlayerSetSpawnEvent} */ - @ApiStatus.Experimental +@Deprecated(forRemoval = true) // Paper public class PlayerSpawnChangeEvent extends PlayerEvent implements Cancellable { diff --git a/patches/api/0309-Get-entity-default-attributes.patch b/patches/api/0309-Get-entity-default-attributes.patch index 0723f79268..3085faf18c 100644 --- a/patches/api/0309-Get-entity-default-attributes.patch +++ b/patches/api/0309-Get-entity-default-attributes.patch @@ -32,10 +32,10 @@ index 51f1a09164d501de6d2561ed90175f2c24a668c1..cbc63144e5eb35799548209f8fbee70d // Paper end } diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java -index 54fbfa2bce8d73a66ca165ba7227c574b58f91cb..ea33003014adf2e25fd974c8ff5dfc0343b805f4 100644 +index 976f701ed9b9873945a5628173c580e2e6873864..6905614c3d277a3a725554f02cc92d4b3430eecc 100644 --- a/src/main/java/org/bukkit/entity/EntityType.java +++ b/src/main/java/org/bukkit/entity/EntityType.java -@@ -454,6 +454,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans +@@ -441,6 +441,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/0314-Add-hasCollision-methods-to-various-places.patch b/patches/api/0314-Add-hasCollision-methods-to-various-places.patch index 94d0d4252e..ad022302d0 100644 --- a/patches/api/0314-Add-hasCollision-methods-to-various-places.patch +++ b/patches/api/0314-Add-hasCollision-methods-to-various-places.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add hasCollision methods to various places diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index a011123035a96c05921f0a206b92bef15732b443..889f760e0c8de3f567d86936e6fc317a43993b10 100644 +index 8b04e0d81c56712057f1fee288b3609ef5718c60..c4f067598a40b0381bc9e601a3809e2683c10407 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -4788,6 +4788,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -4720,6 +4720,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla } // Paper end - item default attributes API @@ -67,10 +67,10 @@ index fd4a9bdcfb6775dfbdb7492e6c9eb90722d2ecdc..e573e70d9e74e444783a7363e6cdac12 + // Paper end } diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java -index 56bc4cbc9af40e7fa400293ddc2479c7d2754c55..8ba422ce7eecdfdfb4edbc0d56f99eeaa3f16e9b 100644 +index a08c52949af1d2416ecb089fc559db2e3b29105c..8f430a4067fc722ebfbca846cccded4fb0a3a4e5 100644 --- a/src/main/java/org/bukkit/block/BlockType.java +++ b/src/main/java/org/bukkit/block/BlockType.java -@@ -3612,4 +3612,13 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran +@@ -3500,4 +3500,13 @@ public interface BlockType extends Keyed, Translatable, net.kyori.adventure.tran @Override @NotNull String getTranslationKey(); // Paper end - add Translatable diff --git a/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch index b5cc2e41d7..256eb6ed6a 100644 --- a/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch +++ b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Allow delegation to vanilla chunk gen diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index e5a9b816b281017a08959d8e61acf59574dc1c50..6f4509bc3b997f773c19b31de91106c004c12af5 100644 +index 913ab7ce4a754739ef786086d4da55c93d37a39e..acf382e75c11b8cf7bc06fbac7efe30673021c0c 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2102,6 +2102,24 @@ public final class Bukkit { +@@ -2114,6 +2114,24 @@ public final class Bukkit { return server.createChunkData(world); } @@ -34,10 +34,10 @@ index e5a9b816b281017a08959d8e61acf59574dc1c50..6f4509bc3b997f773c19b31de91106c0 * Creates a boss bar instance to display to players. The progress * defaults to 1.0 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e3a494b9d3727973d225de3042da93594f36ca12..8ccda3cbefcbf1d1b1d5dac195b3c5605058a040 100644 +index b383ca29be8f86e03e81dbb9962747c03aed1671..9118ae507b9744f142def8bec18b0861eb481820 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1779,6 +1779,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1789,6 +1789,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public ChunkGenerator.ChunkData createChunkData(@NotNull World world); diff --git a/patches/api/0331-Multi-Block-Change-API.patch b/patches/api/0331-Multi-Block-Change-API.patch index 46d8adeb56..9d93df8706 100644 --- a/patches/api/0331-Multi-Block-Change-API.patch +++ b/patches/api/0331-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 b177daa7a974125dc4ccf1bc6d119ad42dba3514..cd2d59a8a098227ec7725d121a63cc90e2a139fa 100644 +index 7f854d545a76a6e4dd2439f9a6e193fa54d5874d..48b3154ee164b9de74433556d8727e8b818ffbe5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -939,6 +939,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -937,6 +937,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendBlockDamage(@NotNull Location loc, float progress); diff --git a/patches/api/0335-More-PotionEffectType-API.patch b/patches/api/0335-More-PotionEffectType-API.patch index a0db1c7ec4..a3f79f780f 100644 --- a/patches/api/0335-More-PotionEffectType-API.patch +++ b/patches/api/0335-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 9a819b179ce3040e842be58a8ddceee2a14ffa59..132d375de164e6d8df61234def650154c67fc0df 100644 +index acfc52e692c9361a6bf407ce046435fd5d364d29..1d0e734b3200214f97ccd5b65c0fd3192e0b0dc1 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -319,6 +319,31 @@ public interface Registry extends Iterable { +@@ -326,6 +326,31 @@ public interface Registry extends Iterable { */ @Deprecated(forRemoval = true) Registry CONFIGURED_STRUCTURE = Objects.requireNonNull(io.papermc.paper.registry.RegistryAccess.registryAccess().getRegistry(io.papermc.paper.world.structure.ConfiguredStructure.class), "No registry present for ConfiguredStructure. This is a bug."); diff --git a/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch index 815ba515f1..f8da9ce255 100644 --- a/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch +++ b/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch @@ -5,10 +5,10 @@ Subject: [PATCH] API for creating command sender which forwards feedback diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 6f4509bc3b997f773c19b31de91106c004c12af5..f11b60d888e8f3a0c6213078cb5db35eafb82e3f 100644 +index acf382e75c11b8cf7bc06fbac7efe30673021c0c..64bd6071d45d845a2e8e5565014036e7ce16a430 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1580,6 +1580,20 @@ public final class Bukkit { +@@ -1581,6 +1581,20 @@ public final class Bukkit { return server.getConsoleSender(); } @@ -30,10 +30,10 @@ index 6f4509bc3b997f773c19b31de91106c004c12af5..f11b60d888e8f3a0c6213078cb5db35e * Gets the folder that contains all of the various {@link World}s. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8ccda3cbefcbf1d1b1d5dac195b3c5605058a040..31eaec316e0ee4021d0a67301d1bc91a2d3524d9 100644 +index 9118ae507b9744f142def8bec18b0861eb481820..d46999648b8770624d288709458cfbf400063037 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1334,6 +1334,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1335,6 +1335,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public ConsoleCommandSender getConsoleSender(); diff --git a/patches/api/0337-Implement-regenerateChunk.patch b/patches/api/0337-Implement-regenerateChunk.patch index 8f63e4dd7a..429edcb2d7 100644 --- a/patches/api/0337-Implement-regenerateChunk.patch +++ b/patches/api/0337-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 6953851a5177e9df3746f7a743f27ef02845e522..d7f4a9c634b3a7b2668f296dce108cc6fc3046df 100644 +index d3c524bbfe08d2118b0e093b2340620644d60d19..36deaae317cd9ac0455bc1daef22b7f1e1b73c62 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -486,8 +486,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0338-Add-GameEvent-tags.patch b/patches/api/0338-Add-GameEvent-tags.patch index 361f439443..8af580d84b 100644 --- a/patches/api/0338-Add-GameEvent-tags.patch +++ b/patches/api/0338-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 33c75db0fcbbd771a59764c5d90484cee27b60cf..eaec13dbe7be4dd6c5faa97c413e24d6e77cef62 100644 +index b587897a26e9464b61a29e7482c60d2a66469571..8bfec649f7c6dda956bc388a21b489f3565ff384 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -1311,6 +1311,25 @@ public interface Tag extends Keyed { +@@ -1315,6 +1315,25 @@ public interface Tag extends Keyed { */ Tag ENTITY_TYPES_REDIRECTABLE_PROJECTILE = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("redirectable_projectile"), EntityType.class); diff --git a/patches/api/0342-Custom-Potion-Mixes.patch b/patches/api/0342-Custom-Potion-Mixes.patch index a3ced4b9a1..e43d56d584 100644 --- a/patches/api/0342-Custom-Potion-Mixes.patch +++ b/patches/api/0342-Custom-Potion-Mixes.patch @@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index e224a28f1c81ca3439c9618d46ad53f8af8c760c..93012c264b6a509b0c3df26896136cb5c1ffc264 100644 +index 64bd6071d45d845a2e8e5565014036e7ce16a430..4cf3a4bdf6e76b73ce0f3acd06a10c129de7b309 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2633,6 +2633,15 @@ public final class Bukkit { +@@ -2645,6 +2645,15 @@ public final class Bukkit { public static io.papermc.paper.datapack.DatapackManager getDatapackManager() { return server.getDatapackManager(); } @@ -175,10 +175,10 @@ index e224a28f1c81ca3439c9618d46ad53f8af8c760c..93012c264b6a509b0c3df26896136cb5 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d1fb5010a8a1526a24be26c0d6330800fd54e184..082969ca7babe5f1158a11a7f6f2fb220eb912eb 100644 +index d46999648b8770624d288709458cfbf400063037..17ea9d6a508d77b449dd5ac6805074e8de42aadb 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2296,5 +2296,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2306,5 +2306,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull io.papermc.paper.datapack.DatapackManager getDatapackManager(); diff --git a/patches/api/0344-More-Projectile-API.patch b/patches/api/0344-More-Projectile-API.patch index f855759c3e..fdec1b8add 100644 --- a/patches/api/0344-More-Projectile-API.patch +++ b/patches/api/0344-More-Projectile-API.patch @@ -7,10 +7,10 @@ Co-authored-by: Nassim Jahnke Co-authored-by: SoSeDiK diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 839e5b7df49f42b5fec7729997bef3370ba36d80..b36298679d6d52d09fe4bb8e52e19e18f6df742a 100644 +index 493f81ba879d1eb29a32722da27e4ff7ce4c68a8..a3a979ca7cbc89c43713fbcc9e6524fb347fa2e2 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java -@@ -130,17 +130,21 @@ public interface AbstractArrow extends Projectile { +@@ -139,17 +139,21 @@ public interface AbstractArrow extends Projectile { * Gets the ItemStack which will be picked up from this arrow. * * @return The picked up ItemStack @@ -32,7 +32,7 @@ index 839e5b7df49f42b5fec7729997bef3370ba36d80..b36298679d6d52d09fe4bb8e52e19e18 public void setItem(@NotNull ItemStack item); /** -@@ -194,4 +198,44 @@ public interface AbstractArrow extends Projectile { +@@ -220,4 +224,44 @@ public interface AbstractArrow extends Projectile { CREATIVE_ONLY; } // Paper end diff --git a/patches/api/0345-Add-getComputedBiome-API.patch b/patches/api/0345-Add-getComputedBiome-API.patch index 6d24c2c66a..fecc34acdf 100644 --- a/patches/api/0345-Add-getComputedBiome-API.patch +++ b/patches/api/0345-Add-getComputedBiome-API.patch @@ -51,7 +51,7 @@ index b68367f123f029c3ff47eab6bfabd7a894a99da4..44ee56a5956cc17194c767a0c1071a2a * Sets the {@link Biome} at the given {@link Location}. * diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 42cc4f2ee960c0abf9c6688aeee4150754612c32..cf9600c743e977312c0a15c455d602391797ef34 100644 +index 02361d58ac723d02d93db80a721b27d37f7dc3c1..87327df6a37668eaf87394b6b049e6d4badec6df 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -371,10 +371,22 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch index 21683de3d2..85d1d1ea5e 100644 --- a/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch +++ b/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 84d43e24a69352e2715935fd7ce3fd05aaca8601..49c027f2c78660594caa51341291b1bcd35b8993 100644 +index 4cf3a4bdf6e76b73ce0f3acd06a10c129de7b309..3e774080b5877b25759d001520eacbfb7e49cba0 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -805,12 +805,26 @@ public final class Bukkit { +@@ -806,12 +806,26 @@ public final class Bukkit { return server.getWorlds(); } @@ -35,7 +35,7 @@ index 84d43e24a69352e2715935fd7ce3fd05aaca8601..49c027f2c78660594caa51341291b1bc * * @param creator the options to use when creating the world * @return newly created or loaded world -@@ -822,6 +836,9 @@ public final class Bukkit { +@@ -823,6 +837,9 @@ public final class Bukkit { /** * Unloads a world with the given name. @@ -45,7 +45,7 @@ index 84d43e24a69352e2715935fd7ce3fd05aaca8601..49c027f2c78660594caa51341291b1bc * * @param name Name of the world to unload * @param save whether to save the chunks before unloading -@@ -833,6 +850,9 @@ public final class Bukkit { +@@ -834,6 +851,9 @@ public final class Bukkit { /** * Unloads the given world. @@ -56,10 +56,10 @@ index 84d43e24a69352e2715935fd7ce3fd05aaca8601..49c027f2c78660594caa51341291b1bc * @param world the world to unload * @param save whether to save the chunks before unloading diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 88ad9e596f801c2c137fe2d31653a841b9c01683..c1a46d13e61140c851f73f2ee7c6cec24ba8b3fa 100644 +index 17ea9d6a508d77b449dd5ac6805074e8de42aadb..ea6ba08e9016928dd5e5844161e6c99571a1f495 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -675,34 +675,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -676,34 +676,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public List getWorlds(); diff --git a/patches/api/0359-More-Teleport-API.patch b/patches/api/0359-More-Teleport-API.patch index 4fad2a9bbc..a464ab5388 100644 --- a/patches/api/0359-More-Teleport-API.patch +++ b/patches/api/0359-More-Teleport-API.patch @@ -158,10 +158,10 @@ index f51f3f04ba9efe15f68620c5531b502710078b6e..8bada7f7f0200103edc415ad003132d9 * 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 2cbb3d14612777422aa01ac45b7cea63e519fbfe..a2d51e8a547c95db235a2e4fa6228c9248cfa88b 100644 +index 48b3154ee164b9de74433556d8727e8b818ffbe5..fc6a7fcb7a3f1c92f725715eaea55500d6f553c1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3516,6 +3516,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3521,6 +3521,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM String getClientBrandName(); // Paper end diff --git a/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch index e2f1a0efc1..83811edce4 100644 --- a/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch +++ b/patches/api/0361-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 a2d51e8a547c95db235a2e4fa6228c9248cfa88b..2cd85236e548c7a9732705d1af78d41f81e9d0d1 100644 +index fc6a7fcb7a3f1c92f725715eaea55500d6f553c1..9e1785692bea39cda723094eba3985c6655ad267 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3400,6 +3400,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3405,6 +3405,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void sendOpLevel(byte level); // Paper end - sendOpLevel API diff --git a/patches/api/0363-Block-Ticking-API.patch b/patches/api/0363-Block-Ticking-API.patch index 02fed74c9e..d588899982 100644 --- a/patches/api/0363-Block-Ticking-API.patch +++ b/patches/api/0363-Block-Ticking-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Block Ticking API diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index cf9600c743e977312c0a15c455d602391797ef34..8a842840e1a2652a6356d4a56e4749a5ba36e902 100644 +index 87327df6a37668eaf87394b6b049e6d4badec6df..a13c8ddd4a1222e7a16debb61769af3758502d7c 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -589,6 +589,41 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr diff --git a/patches/api/0371-Elder-Guardian-appearance-API.patch b/patches/api/0371-Elder-Guardian-appearance-API.patch index 393c6fb143..4c5b51b7a5 100644 --- a/patches/api/0371-Elder-Guardian-appearance-API.patch +++ b/patches/api/0371-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 2cd85236e548c7a9732705d1af78d41f81e9d0d1..0c9b6aa22aa0b869f80403fa4bbd8538520168f9 100644 +index 9e1785692bea39cda723094eba3985c6655ad267..6546bcbcced9468008212e9cf96a06c50c14a93f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3580,6 +3580,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3585,6 +3585,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/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch index fc814196e7..b745878796 100644 --- a/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch +++ b/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index f05883886928169600b6309dd12de3bdb633cca1..51d3bc142bcd3b349326ae2553660abcf19a2638 100644 +index 22428de50580f7b70d14484ba229aa271bfd7069..fc96043f799cf5d521d51ad4c74f8f8067bed754 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0375-Add-entity-knockback-API.patch b/patches/api/0375-Add-entity-knockback-API.patch index b8c91440f6..fe9d0a85bb 100644 --- a/patches/api/0375-Add-entity-knockback-API.patch +++ b/patches/api/0375-Add-entity-knockback-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 51d3bc142bcd3b349326ae2553660abcf19a2638..6bfc8a2148f504370df938447f4f6b757f1a516b 100644 +index fc96043f799cf5d521d51ad4c74f8f8067bed754..8dd993ce32686431e1c759d446a3620cb52f7ec1 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0379-Add-Player-Warden-Warning-API.patch b/patches/api/0379-Add-Player-Warden-Warning-API.patch index 2b6ed9cb7c..d1728e9492 100644 --- a/patches/api/0379-Add-Player-Warden-Warning-API.patch +++ b/patches/api/0379-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 0c9b6aa22aa0b869f80403fa4bbd8538520168f9..f0897d3d689ebca050c80df67581b1e3bc35ed24 100644 +index 6546bcbcced9468008212e9cf96a06c50c14a93f..edf4b93624e5c308be9bf0498187404c13525e09 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3596,6 +3596,59 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3601,6 +3601,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/0384-Friction-API.patch b/patches/api/0384-Friction-API.patch index 4aab88652e..23ae7abbae 100644 --- a/patches/api/0384-Friction-API.patch +++ b/patches/api/0384-Friction-API.patch @@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5 /** * Gets the item stack associated with this item drop. diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 208bab1f5a3200f54141c38ee4272629cfc66da5..806bf6ca0dc87e1956084c61040a3d6139e8bc29 100644 +index 0d665a31152c9a667576f2e9d91ffec5304ce944..a2c1cc7462564411db71a1e00222ef55633b49c8 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0389-Add-Sneaking-API-for-Entities.patch b/patches/api/0389-Add-Sneaking-API-for-Entities.patch index cabae02fbb..5419ce7d3c 100644 --- a/patches/api/0389-Add-Sneaking-API-for-Entities.patch +++ b/patches/api/0389-Add-Sneaking-API-for-Entities.patch @@ -35,10 +35,10 @@ index 9f4498a955279b8b5c418609801fd09444a1efb5..6dcaf7e9bc9afb708ab569e82f27c878 * 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 537ebbad48191741f666aa2a30c8584562dfcb83..5e798ea4c66e1a7ce6239b972e6a13810850a438 100644 +index edf4b93624e5c308be9bf0498187404c13525e09..9dbcbefe989c6f4ab00a2ba90fa5cdb29dc74797 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -461,6 +461,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -459,6 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @return true if player is in sneak mode */ @@ -46,7 +46,7 @@ index 537ebbad48191741f666aa2a30c8584562dfcb83..5e798ea4c66e1a7ce6239b972e6a1381 public boolean isSneaking(); /** -@@ -468,6 +469,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -466,6 +467,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * @param sneak true if player should appear sneaking */ diff --git a/patches/api/0391-Flying-Fall-Damage-API.patch b/patches/api/0391-Flying-Fall-Damage-API.patch index b38eb93f1c..13493c2aa9 100644 --- a/patches/api/0391-Flying-Fall-Damage-API.patch +++ b/patches/api/0391-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 5e798ea4c66e1a7ce6239b972e6a13810850a438..ce5530c27572fefd732301e07393fab0d9c99afb 100644 +index 9dbcbefe989c6f4ab00a2ba90fa5cdb29dc74797..32484ae22a7398bd4df94c185e7c1b4cb1d0f76c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1903,6 +1903,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1908,6 +1908,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void setAllowFlight(boolean flight); diff --git a/patches/api/0393-Win-Screen-API.patch b/patches/api/0393-Win-Screen-API.patch index 05fbb589d3..cdeea2f4f9 100644 --- a/patches/api/0393-Win-Screen-API.patch +++ b/patches/api/0393-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 ce5530c27572fefd732301e07393fab0d9c99afb..6dc9a93811d143ed266f0f6235358d58b1e00523 100644 +index 32484ae22a7398bd4df94c185e7c1b4cb1d0f76c..c86d8b88a1501bd8fd7562a21ee111607e523962 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1249,6 +1249,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1247,6 +1247,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); diff --git a/patches/api/0394-Add-Entity-Body-Yaw-API.patch b/patches/api/0394-Add-Entity-Body-Yaw-API.patch index 3a5475a99a..c0186ee4f1 100644 --- a/patches/api/0394-Add-Entity-Body-Yaw-API.patch +++ b/patches/api/0394-Add-Entity-Body-Yaw-API.patch @@ -53,7 +53,7 @@ index 6dcaf7e9bc9afb708ab569e82f27c87833450ff1..a76e537c9b3b9519cd46894c90b750f0 // Paper start - Collision API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 806bf6ca0dc87e1956084c61040a3d6139e8bc29..166b816f49d9918768f162b0b7134ffd266280f3 100644 +index a2c1cc7462564411db71a1e00222ef55633b49c8..4974540e8277011e4eb00f691a5f6f96d3dde20c 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0398-Add-Shearable-API.patch b/patches/api/0398-Add-Shearable-API.patch index 71b9361047..06e4cefb44 100644 --- a/patches/api/0398-Add-Shearable-API.patch +++ b/patches/api/0398-Add-Shearable-API.patch @@ -54,12 +54,12 @@ index 0000000000000000000000000000000000000000..0d5793790ab6a47525ad330335173612 + boolean readyToBeSheared(); +} diff --git a/src/main/java/org/bukkit/entity/Bogged.java b/src/main/java/org/bukkit/entity/Bogged.java -index 584404c6ac5f4c67a5a023f834cada0af0299447..7cd32bce7699bad7900ed137750531fd3e528020 100644 +index a89f104aa2b2244c075a72c698a9b616c57eaf7c..a36bb84c17120bc578ab01d45f6f12fb1faf9548 100644 --- a/src/main/java/org/bukkit/entity/Bogged.java +++ b/src/main/java/org/bukkit/entity/Bogged.java -@@ -9,5 +9,5 @@ import org.jetbrains.annotations.ApiStatus; +@@ -6,5 +6,5 @@ import org.jetbrains.annotations.ApiStatus; + * Represents a Bogged Skeleton. */ - @MinecraftExperimental(Requires.UPDATE_1_21) @ApiStatus.Experimental -public interface Bogged extends AbstractSkeleton { +public interface Bogged extends AbstractSkeleton, io.papermc.paper.entity.Shearable { // Paper - Shear API diff --git a/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch index 3f9c7d07ec..6448068df8 100644 --- a/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch +++ b/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Properly remove the experimental smithing inventory type diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index f5bdd6b6df126abfa26ce727c80a5772d2ab1a1b..ccb09660e565bc2f7a653bda95fb38caccf7a060 100644 +index 32cd8ee2e849df602a7e10aa5d0a218007faa0ac..fbdbd2f4da5e09d4b111ddcf72e2d7dd59046bd7 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -156,7 +156,7 @@ public enum InventoryType { +@@ -153,7 +153,7 @@ public enum InventoryType { * * @deprecated use {@link #SMITHING} */ diff --git a/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch index 65345ce8c8..2b9703cf94 100644 --- a/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 166b816f49d9918768f162b0b7134ffd266280f3..5f070c7563151c40cf4d691fc2a10d8a2766982a 100644 +index 4974540e8277011e4eb00f691a5f6f96d3dde20c..5de7651f673cba9782f88f46dc938274b37a38ec 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0405-Folia-scheduler-and-owned-region-API.patch b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch index 7732b4c696..e64ac7f52f 100644 --- a/patches/api/0405-Folia-scheduler-and-owned-region-API.patch +++ b/patches/api/0405-Folia-scheduler-and-owned-region-API.patch @@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 74ae33a6465f0a63b599527e9b7b3ed2d388d624..37b3d1aceaf6522f712cb6ec8a8b7f5689eb1852 100644 +index 3e774080b5877b25759d001520eacbfb7e49cba0..382421ca3a66ae18c00ff2ed46e4ada2cf5278ff 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -2664,6 +2664,141 @@ public final class Bukkit { +@@ -2676,6 +2676,141 @@ public final class Bukkit { } // Paper end @@ -645,10 +645,10 @@ index 74ae33a6465f0a63b599527e9b7b3ed2d388d624..37b3d1aceaf6522f712cb6ec8a8b7f56 public static Server.Spigot spigot() { return server.spigot(); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e9a97ee5c086ebb48ebc3d9bca406f32380d28cb..871696b6c7363efc7020f4ac7f6b7437f06191ae 100644 +index ea6ba08e9016928dd5e5844161e6c99571a1f495..9df85626142d8e7b704d378d76278e9b955f9687 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2325,4 +2325,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2335,4 +2335,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer(); // Paper end diff --git a/patches/api/0406-Add-event-for-player-editing-sign.patch b/patches/api/0406-Add-event-for-player-editing-sign.patch index b534aebde9..ec38bf008b 100644 --- a/patches/api/0406-Add-event-for-player-editing-sign.patch +++ b/patches/api/0406-Add-event-for-player-editing-sign.patch @@ -119,16 +119,15 @@ index 0000000000000000000000000000000000000000..c38c32ae349e094ffef84386607f4b9d + } +} diff --git a/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java b/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java -index ea197b1bc0a41355f8cdda3026f16c55f2d4fac9..62f41dbdf93e1912f4ee1376f000ffdc9073043d 100644 +index cf935d9c8d8f9a9684024507846a9754f0207986..72fe69c3830f07dd264cfd89e92410dc107034a4 100644 --- a/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerSignOpenEvent.java -@@ -10,8 +10,11 @@ import org.jetbrains.annotations.NotNull; +@@ -9,7 +9,10 @@ import org.jetbrains.annotations.NotNull; /** * This event is fired when a sign is opened by the player. + * @deprecated use {@link io.papermc.paper.event.player.PlayerOpenSignEvent} */ - @ApiStatus.Experimental +@Deprecated(forRemoval = true) // Paper +@org.bukkit.Warning(false) // Paper public class PlayerSignOpenEvent extends PlayerEvent implements Cancellable { diff --git a/patches/api/0408-Fix-BanList-API.patch b/patches/api/0408-Fix-BanList-API.patch index 911f301327..a9640f44a2 100644 --- a/patches/api/0408-Fix-BanList-API.patch +++ b/patches/api/0408-Fix-BanList-API.patch @@ -36,7 +36,7 @@ index 548f6d28c28d74bed8b58ee82875909354afe132..a77c0411a68a9bad33ddfb335b7a996a /** * Gets if a {@link BanEntry} exists for the target, indicating an active diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index f5d3e5c5d79910580b6202e7aee01341d09f6225..6a84c3d0d15251694bb7a05393b9ff7a4d8e0617 100644 +index d81701f0128bdeca180ff9957621f695c787f334..299d1cc510d24541c6bb47d02db0b6a86fb1d0eb 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -147,7 +147,7 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -130,10 +130,10 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 6dc9a93811d143ed266f0f6235358d58b1e00523..463521dc80254cab673c5203ee263948081219e9 100644 +index c86d8b88a1501bd8fd7562a21ee111607e523962..fbaea481feccfc71d744d9f93de3bf637fdcaaad 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -345,7 +345,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -343,7 +343,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * (updated) previous ban */ @Nullable @@ -142,7 +142,7 @@ index 6dc9a93811d143ed266f0f6235358d58b1e00523..463521dc80254cab673c5203ee263948 /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will -@@ -361,7 +361,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -359,7 +359,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * (updated) previous ban */ @Nullable @@ -151,7 +151,7 @@ index 6dc9a93811d143ed266f0f6235358d58b1e00523..463521dc80254cab673c5203ee263948 /** * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will -@@ -377,7 +377,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -375,7 +375,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * (updated) previous ban */ @Nullable diff --git a/patches/api/0410-API-for-updating-recipes-on-clients.patch b/patches/api/0410-API-for-updating-recipes-on-clients.patch index d4e528d077..6dfda16a0b 100644 --- a/patches/api/0410-API-for-updating-recipes-on-clients.patch +++ b/patches/api/0410-API-for-updating-recipes-on-clients.patch @@ -5,10 +5,10 @@ Subject: [PATCH] API for updating recipes on clients diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 290d692fccf63c5f109b8a3f1de726a12a20ddc9..91405dee7c822bba9ef809f00cbd85db5b569b44 100644 +index 382421ca3a66ae18c00ff2ed46e4ada2cf5278ff..801cd170bedaac84446a8687412e3efdae525d86 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -989,6 +989,26 @@ public final class Bukkit { +@@ -990,6 +990,26 @@ public final class Bukkit { server.reloadData(); } @@ -35,7 +35,7 @@ index 290d692fccf63c5f109b8a3f1de726a12a20ddc9..91405dee7c822bba9ef809f00cbd85db /** * Returns the primary logger associated with this server instance. * -@@ -1049,6 +1069,20 @@ public final class Bukkit { +@@ -1050,6 +1070,20 @@ public final class Bukkit { return server.addRecipe(recipe); } @@ -56,7 +56,7 @@ index 290d692fccf63c5f109b8a3f1de726a12a20ddc9..91405dee7c822bba9ef809f00cbd85db /** * Get a list of all recipes for a given item. The stack size is ignored * in comparisons. If the durability is -1, it will match any data value. -@@ -1240,6 +1274,24 @@ public final class Bukkit { +@@ -1241,6 +1275,24 @@ public final class Bukkit { return server.removeRecipe(key); } @@ -82,10 +82,10 @@ index 290d692fccf63c5f109b8a3f1de726a12a20ddc9..91405dee7c822bba9ef809f00cbd85db * Gets a list of command aliases defined in the server properties. * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 954c8422567edcf6bf6db153b65dad776eea654f..8029aef07eb66989d61a8cce3fb98159c4bc2b89 100644 +index 9df85626142d8e7b704d378d76278e9b955f9687..989ad0c2b86c47ccd644fd0a604e40db2dd66770 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -838,6 +838,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -839,6 +839,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ public void reloadData(); @@ -108,7 +108,7 @@ index 954c8422567edcf6bf6db153b65dad776eea654f..8029aef07eb66989d61a8cce3fb98159 /** * Returns the primary logger associated with this server instance. * -@@ -879,15 +895,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -880,15 +896,34 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi public boolean dispatchCommand(@NotNull CommandSender sender, @NotNull String commandLine) throws CommandException; /** @@ -144,7 +144,7 @@ index 954c8422567edcf6bf6db153b65dad776eea654f..8029aef07eb66989d61a8cce3fb98159 /** * Get a list of all recipes for a given item. The stack size is ignored * in comparisons. If the durability is -1, it will match any data value. -@@ -1056,6 +1091,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1057,6 +1092,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ public boolean removeRecipe(@NotNull NamespacedKey key); diff --git a/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch index 69d5af26d8..f4cfd76261 100644 --- a/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch +++ b/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 91405dee7c822bba9ef809f00cbd85db5b569b44..2726ee0338cbcf4233588d0eb7dcce3b0c571908 100644 +index 801cd170bedaac84446a8687412e3efdae525d86..031e9a41b44bf405686d3b210a8354cb9520be2e 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -934,9 +934,6 @@ public final class Bukkit { +@@ -935,9 +935,6 @@ public final class Bukkit { /** * Create a new explorer map targeting the closest nearby structure of a * given {@link StructureType}. @@ -18,7 +18,7 @@ index 91405dee7c822bba9ef809f00cbd85db5b569b44..2726ee0338cbcf4233588d0eb7dcce3b * * @param world the world the map will belong to * @param location the origin location to find the nearest structure -@@ -945,7 +942,9 @@ public final class Bukkit { +@@ -946,7 +943,9 @@ public final class Bukkit { * * @see World#locateNearestStructure(org.bukkit.Location, * org.bukkit.StructureType, int, boolean) @@ -28,7 +28,7 @@ index 91405dee7c822bba9ef809f00cbd85db5b569b44..2726ee0338cbcf4233588d0eb7dcce3b @NotNull public static ItemStack createExplorerMap(@NotNull World world, @NotNull Location location, @NotNull StructureType structureType) { return server.createExplorerMap(world, location, structureType); -@@ -968,11 +967,54 @@ public final class Bukkit { +@@ -969,11 +968,54 @@ public final class Bukkit { * * @see World#locateNearestStructure(org.bukkit.Location, * org.bukkit.StructureType, int, boolean) @@ -84,10 +84,10 @@ index 91405dee7c822bba9ef809f00cbd85db5b569b44..2726ee0338cbcf4233588d0eb7dcce3b /** * Reloads the server, refreshing settings and plugin information. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 8029aef07eb66989d61a8cce3fb98159c4bc2b89..dc985b54e1582629dffeebc56152eedaedae56d3 100644 +index 989ad0c2b86c47ccd644fd0a604e40db2dd66770..876267814d25da46f3596448b9036b5901d2c4e0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -802,16 +802,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -803,16 +803,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @see World#locateNearestStructure(org.bukkit.Location, * org.bukkit.StructureType, int, boolean) @@ -106,7 +106,7 @@ index 8029aef07eb66989d61a8cce3fb98159c4bc2b89..dc985b54e1582629dffeebc56152eeda * * @param world the world the map will belong to * @param location the origin location to find the nearest structure -@@ -823,9 +822,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -824,9 +823,50 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @see World#locateNearestStructure(org.bukkit.Location, * org.bukkit.StructureType, int, boolean) diff --git a/patches/api/0416-Add-Listing-API-for-Player.patch b/patches/api/0416-Add-Listing-API-for-Player.patch index 94d5892bd0..47a8946b80 100644 --- a/patches/api/0416-Add-Listing-API-for-Player.patch +++ b/patches/api/0416-Add-Listing-API-for-Player.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Listing API for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 463521dc80254cab673c5203ee263948081219e9..5753d6d6ae791e2b086c861ddeb6522e46f2571c 100644 +index fbaea481feccfc71d744d9f93de3bf637fdcaaad..24dc710f61d08253f66e7ecfd69873e7ebf68d1b 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2033,6 +2033,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2038,6 +2038,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public boolean canSee(@NotNull Entity entity); diff --git a/patches/api/0426-Add-OfflinePlayer-isConnected.patch b/patches/api/0426-Add-OfflinePlayer-isConnected.patch index fad59b6a54..08e2f91095 100644 --- a/patches/api/0426-Add-OfflinePlayer-isConnected.patch +++ b/patches/api/0426-Add-OfflinePlayer-isConnected.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add OfflinePlayer#isConnected This adds an alternative to OfflinePlayer#isOnline that returns true only if the same instance of the player is still online. This is generally more useful than isOnline as it allows you to determine if you have an instance of a Player that still exists. If a player relogs an old Player instance becomes unlinked leading to e.g. messages sent to the old player no longer arriving despite isOnline returning true. Checking against isConnected is more useful there to discard invalid instances. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 6a84c3d0d15251694bb7a05393b9ff7a4d8e0617..30298a629b39bd43ce14b414fc697b2dfcbea89c 100644 +index 299d1cc510d24541c6bb47d02db0b6a86fb1d0eb..3993fecec5b4c2bbd77e175a168afcad571ce4d1 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -24,10 +24,26 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio diff --git a/patches/api/0430-Add-player-idle-duration-API.patch b/patches/api/0430-Add-player-idle-duration-API.patch index 1dbaafe8db..2fbfc5dc58 100644 --- a/patches/api/0430-Add-player-idle-duration-API.patch +++ b/patches/api/0430-Add-player-idle-duration-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add player idle duration API Implements API for getting and resetting a player's idle duration. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ce541b674303695be999018eedcddf554a6ea329..b7df63c31c890b58cf32b02ab3e9d379f30f2065 100644 +index 24dc710f61d08253f66e7ecfd69873e7ebf68d1b..09094f55509eaf66670c27409b4d5ec3d73412b0 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3737,6 +3737,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3742,6 +3742,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void increaseWardenWarningLevel(); // Paper end diff --git a/patches/api/0437-Add-Structure-check-API.patch b/patches/api/0437-Add-Structure-check-API.patch index 4c0756c86e..ee0adfe254 100644 --- a/patches/api/0437-Add-Structure-check-API.patch +++ b/patches/api/0437-Add-Structure-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 3abd62dc08e1edaeec6773819c8726671221074a..0e3c7de14be8dc01199fd68b6bf41783c5c43ec3 100644 +index cda78bdc6e6a76dbb5c711ee16dcb470a7b839a6..c1f1faebc0d33710eb17dd96fddb16c85b7868e5 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -78,6 +78,30 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient diff --git a/patches/api/0438-add-missing-Experimental-annotations.patch b/patches/api/0438-add-missing-Experimental-annotations.patch index 9e6021e93d..8b64dfa889 100644 --- a/patches/api/0438-add-missing-Experimental-annotations.patch +++ b/patches/api/0438-add-missing-Experimental-annotations.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add missing Experimental annotations diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java -index 6b68c92ec894451d99ded3e3df5965cb31d68ed2..fd5e433f930963c102c9c977523a0036eabc0477 100644 +index 7522c611b5214dd09867c434d5f7cf161f5c04ca..026b1832bcd163ab89668c991bf002e608e36aef 100644 --- a/src/main/java/org/bukkit/FeatureFlag.java +++ b/src/main/java/org/bukkit/FeatureFlag.java @@ -13,6 +13,7 @@ public interface FeatureFlag extends Keyed { @@ -16,231 +16,19 @@ index 6b68c92ec894451d99ded3e3df5965cb31d68ed2..fd5e433f930963c102c9c977523a0036 public static final FeatureFlag BUNDLE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("bundle")); /** -@@ -23,7 +24,9 @@ public interface FeatureFlag extends Keyed { +@@ -23,6 +24,7 @@ public interface FeatureFlag extends Keyed { @Deprecated public static final FeatureFlag UPDATE_1_20 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_20")); + @ApiStatus.Experimental // Paper - add missing annotation public static final FeatureFlag TRADE_REBALANCE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("trade_rebalance")); -+ @ApiStatus.Experimental // Paper - add missing annotation - public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21")); - } + /** diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 889f760e0c8de3f567d86936e6fc317a43993b10..762216a117145676d3df2b74036799b024461fb7 100644 +index c4f067598a40b0381bc9e601a3809e2683c10407..8001189dfb0425aaccf956d0c743e9df9b9d1ddb 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -151,54 +151,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - * BlockData: {@link Slab} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_SLAB(19305, Slab.class), - /** - * BlockData: {@link Stairs} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_STAIRS(11268, Stairs.class), - /** - * BlockData: {@link Wall} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_WALL(24395, Wall.class), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - CHISELED_TUFF(15831), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - POLISHED_TUFF(17801), - /** - * BlockData: {@link Slab} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - POLISHED_TUFF_SLAB(31096, Slab.class), - /** - * BlockData: {@link Stairs} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - POLISHED_TUFF_STAIRS(7964, Stairs.class), - /** - * BlockData: {@link Wall} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - POLISHED_TUFF_WALL(28886, Wall.class), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_BRICKS(26276), - /** - * BlockData: {@link Slab} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_BRICK_SLAB(11843, Slab.class), - /** - * BlockData: {@link Stairs} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_BRICK_STAIRS(30753, Stairs.class), - /** - * BlockData: {@link Wall} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TUFF_BRICK_WALL(11761, Wall.class), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - CHISELED_TUFF_BRICKS(8601), - DRIPSTONE_BLOCK(26227), - /** -@@ -305,6 +318,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - HEAVY_CORE(15788, Waterlogged.class), - AMETHYST_BLOCK(18919), - BUDDING_AMETHYST(13963), -@@ -317,12 +331,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - WEATHERED_COPPER(19699), - OXIDIZED_COPPER(19490), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - CHISELED_COPPER(12143), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - EXPOSED_CHISELED_COPPER(4570), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WEATHERED_CHISELED_COPPER(30876), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OXIDIZED_CHISELED_COPPER(27719), - CUT_COPPER(32519), - EXPOSED_CUT_COPPER(18000), -@@ -365,12 +383,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - WAXED_WEATHERED_COPPER(5960), - WAXED_OXIDIZED_COPPER(25626), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_CHISELED_COPPER(7500), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_EXPOSED_CHISELED_COPPER(30658), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_WEATHERED_CHISELED_COPPER(5970), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_OXIDIZED_CHISELED_COPPER(7735), - WAXED_CUT_COPPER(11030), - WAXED_EXPOSED_CUT_COPPER(30043), -@@ -2112,41 +2134,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - COPPER_DOOR(26809, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - EXPOSED_COPPER_DOOR(13236, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WEATHERED_COPPER_DOOR(10208, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OXIDIZED_COPPER_DOOR(5348, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_COPPER_DOOR(9954, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_EXPOSED_COPPER_DOOR(20748, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_WEATHERED_COPPER_DOOR(25073, Door.class), - /** - * BlockData: {@link Door} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class), - /** - * BlockData: {@link TrapDoor} -@@ -2200,41 +2230,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - COPPER_TRAPDOOR(12110, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - EXPOSED_COPPER_TRAPDOOR(19219, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WEATHERED_COPPER_TRAPDOOR(28254, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OXIDIZED_COPPER_TRAPDOOR(26518, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_COPPER_TRAPDOOR(12626, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_EXPOSED_COPPER_TRAPDOOR(11010, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_WEATHERED_COPPER_TRAPDOOR(30709, TrapDoor.class), - /** - * BlockData: {@link TrapDoor} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class), - /** - * BlockData: {@link Gate} -@@ -2536,6 +2574,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla +@@ -2497,6 +2497,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla EGG(21603, 16), COMPASS(24139), RECOVERY_COMPASS(12710), @@ -249,621 +37,30 @@ index 889f760e0c8de3f567d86936e6fc317a43993b10..762216a117145676d3df2b74036799b0 BUNDLE(16835, 1), FISHING_ROD(4167, 1, 64), CLOCK(14980), -@@ -2642,6 +2682,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - * BlockData: {@link Crafter} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - CRAFTER(25243, Crafter.class), - FILLED_MAP(23504), - SHEARS(27971, 1, 238), -@@ -2682,8 +2723,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - BEE_SPAWN_EGG(22924), - BLAZE_SPAWN_EGG(4759), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - BOGGED_SPAWN_EGG(12042), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - BREEZE_SPAWN_EGG(7580), - CAT_SPAWN_EGG(29583), - CAMEL_SPAWN_EGG(14760), -@@ -2760,10 +2803,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - EXPERIENCE_BOTTLE(12858), - FIRE_CHARGE(4842), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WIND_CHARGE(23928), - WRITABLE_BOOK(13393, 1), - WRITTEN_BOOK(24164, 16), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - MACE(4771, 1, 250), - ITEM_FRAME(27318), - GLOW_ITEM_FRAME(26473), -@@ -2941,7 +2986,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - MOJANG_BANNER_PATTERN(11903, 1), - GLOBE_BANNER_PATTERN(27753, 1), - PIGLIN_BANNER_PATTERN(22028, 1), -+ @MinecraftExperimental(Requires.UPDATE_1_21) // Paper - add missing annotation -+ @ApiStatus.Experimental // Paper - add missing annotation - FLOW_BANNER_PATTERN(32683, 1), -+ @MinecraftExperimental(Requires.UPDATE_1_21) // Paper - add missing annotation -+ @ApiStatus.Experimental // Paper - add missing annotation - GUSTER_BANNER_PATTERN(27267, 1), - GOAT_HORN(28237, 1), - /** -@@ -3162,8 +3211,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - RAISER_ARMOR_TRIM_SMITHING_TEMPLATE(29116), - HOST_ARMOR_TRIM_SMITHING_TEMPLATE(12165), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - FLOW_ARMOR_TRIM_SMITHING_TEMPLATE(29175), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - BOLT_ARMOR_TRIM_SMITHING_TEMPLATE(9698), - ANGLER_POTTERY_SHERD(9952), - ARCHER_POTTERY_SHERD(21629), -@@ -3174,9 +3225,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - DANGER_POTTERY_SHERD(30506), - EXPLORER_POTTERY_SHERD(5124), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - FLOW_POTTERY_SHERD(4896), - FRIEND_POTTERY_SHERD(18221), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - GUSTER_POTTERY_SHERD(28193), - HEART_POTTERY_SHERD(17607), - HEARTBREAK_POTTERY_SHERD(21108), -@@ -3186,6 +3239,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - PLENTY_POTTERY_SHERD(28236), - PRIZE_POTTERY_SHERD(4341), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - SCRAPE_POTTERY_SHERD(30034), - SHEAF_POTTERY_SHERD(23652), - SHELTER_POTTERY_SHERD(28390), -@@ -3195,99 +3249,121 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - COPPER_GRATE(16221, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - EXPOSED_COPPER_GRATE(7783, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WEATHERED_COPPER_GRATE(24954, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OXIDIZED_COPPER_GRATE(14122, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_COPPER_GRATE(11230, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_EXPOSED_COPPER_GRATE(20520, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_WEATHERED_COPPER_GRATE(16533, Waterlogged.class), - /** - * BlockData: {@link Waterlogged} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_OXIDIZED_COPPER_GRATE(32010, Waterlogged.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - COPPER_BULB(21370, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - EXPOSED_COPPER_BULB(11944, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WEATHERED_COPPER_BULB(10800, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OXIDIZED_COPPER_BULB(22421, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_COPPER_BULB(23756, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_EXPOSED_COPPER_BULB(5530, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_WEATHERED_COPPER_BULB(13239, CopperBulb.class), - /** - * BlockData: {@link CopperBulb} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - WAXED_OXIDIZED_COPPER_BULB(26892, CopperBulb.class), - /** - * BlockData: {@link TrialSpawner} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TRIAL_SPAWNER(19902, TrialSpawner.class), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - TRIAL_KEY(12725), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OMINOUS_TRIAL_KEY(4986), - /** - * BlockData: {@link Vault} - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - VAULT(6288, Vault.class), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - OMINOUS_BOTTLE(26321), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @ApiStatus.Experimental // Paper - add missing annotation - BREEZE_ROD(14281), - /** - * BlockData: {@link Levelled} -diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index c5e3a8143a166d426d87fa3d0f0b3d4f3d4bff1a..50cc7a920bab32264d77f30d3af986b02229c749 100644 ---- a/src/main/java/org/bukkit/Particle.java -+++ b/src/main/java/org/bukkit/Particle.java -@@ -130,33 +130,46 @@ public enum Particle implements Keyed { - DUST_PLUME("dust_plume"), - WHITE_SMOKE("white_smoke"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - GUST("gust"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - SMALL_GUST("small_gust"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - GUST_EMITTER_LARGE("gust_emitter_large"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - GUST_EMITTER_SMALL("gust_emitter_small"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_SPAWNER_DETECTION("trial_spawner_detection"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - VAULT_CONNECTION("vault_connection"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - INFESTED("infested"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_COBWEB("item_cobweb"), - /** - * Uses {@link BlockData} as DataType - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - DUST_PILLAR("dust_pillar", BlockData.class), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - OMINOUS_SPAWNING("ominous_spawning"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - RAID_OMEN("raid_omen"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_OMEN("trial_omen"), - /** - * Uses {@link BlockData} as DataType diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java -index 375172e05a78611deb3003f780867516cb6cd1a4..e31e7b6624ff9da7bec5d3b0548a4fa38812daca 100644 +index b2ff1da3386223a544ab5fc363a90c66c8869242..8c7b50906fc5b84c5570408f357410810bbfbded 100644 --- a/src/main/java/org/bukkit/Sound.java +++ b/src/main/java/org/bukkit/Sound.java -@@ -221,40 +221,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - BLOCK_CONDUIT_DEACTIVATE("block.conduit.deactivate"), - BLOCK_COPPER_BREAK("block.copper.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_BREAK("block.copper_bulb.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_FALL("block.copper_bulb.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_HIT("block.copper_bulb.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_PLACE("block.copper_bulb.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_STEP("block.copper_bulb.step"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_TURN_OFF("block.copper_bulb.turn_off"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_BULB_TURN_ON("block.copper_bulb.turn_on"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_DOOR_CLOSE("block.copper_door.close"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_DOOR_OPEN("block.copper_door.open"), - BLOCK_COPPER_FALL("block.copper.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_GRATE_BREAK("block.copper_grate.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_GRATE_FALL("block.copper_grate.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_GRATE_HIT("block.copper_grate.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_GRATE_PLACE("block.copper_grate.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_GRATE_STEP("block.copper_grate.step"), - BLOCK_COPPER_HIT("block.copper.hit"), - BLOCK_COPPER_PLACE("block.copper.place"), - BLOCK_COPPER_STEP("block.copper.step"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_TRAPDOOR_CLOSE("block.copper_trapdoor.close"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_COPPER_TRAPDOOR_OPEN("block.copper_trapdoor.open"), - BLOCK_CORAL_BLOCK_BREAK("block.coral_block.break"), - BLOCK_CORAL_BLOCK_FALL("block.coral_block.fall"), -@@ -361,14 +377,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - BLOCK_HANGING_SIGN_STEP("block.hanging_sign.step"), - BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL("block.hanging_sign.waxed_interact_fail"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_HEAVY_CORE_BREAK("block.heavy_core.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_HEAVY_CORE_FALL("block.heavy_core.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_HEAVY_CORE_HIT("block.heavy_core.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_HEAVY_CORE_PLACE("block.heavy_core.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_HEAVY_CORE_STEP("block.heavy_core.step"), - BLOCK_HONEY_BLOCK_BREAK("block.honey_block.break"), - BLOCK_HONEY_BLOCK_FALL("block.honey_block.fall"), -@@ -547,14 +568,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - BLOCK_POLISHED_DEEPSLATE_PLACE("block.polished_deepslate.place"), - BLOCK_POLISHED_DEEPSLATE_STEP("block.polished_deepslate.step"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_POLISHED_TUFF_BREAK("block.polished_tuff.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_POLISHED_TUFF_FALL("block.polished_tuff.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_POLISHED_TUFF_HIT("block.polished_tuff.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_POLISHED_TUFF_PLACE("block.polished_tuff.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_POLISHED_TUFF_STEP("block.polished_tuff.step"), - BLOCK_PORTAL_AMBIENT("block.portal.ambient"), - BLOCK_PORTAL_TRAVEL("block.portal.travel"), -@@ -700,36 +726,52 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"), - BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_DETECT_PLAYER("block.trial_spawner.detect_player"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_EJECT_ITEM("block.trial_spawner.eject_item"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_FALL("block.trial_spawner.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_HIT("block.trial_spawner.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER("block.trial_spawner.open_shutter"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TRIAL_SPAWNER_STEP("block.trial_spawner.step"), - BLOCK_TRIPWIRE_ATTACH("block.tripwire.attach"), - BLOCK_TRIPWIRE_CLICK_OFF("block.tripwire.click_off"), -@@ -737,44 +779,62 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - BLOCK_TRIPWIRE_DETACH("block.tripwire.detach"), - BLOCK_TUFF_BREAK("block.tuff.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TUFF_BRICKS_BREAK("block.tuff_bricks.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TUFF_BRICKS_FALL("block.tuff_bricks.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TUFF_BRICKS_HIT("block.tuff_bricks.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TUFF_BRICKS_PLACE("block.tuff_bricks.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_TUFF_BRICKS_STEP("block.tuff_bricks.step"), - BLOCK_TUFF_FALL("block.tuff.fall"), - BLOCK_TUFF_HIT("block.tuff.hit"), - BLOCK_TUFF_PLACE("block.tuff.place"), - BLOCK_TUFF_STEP("block.tuff.step"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_ACTIVATE("block.vault.activate"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_AMBIENT("block.vault.ambient"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_BREAK("block.vault.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_CLOSE_SHUTTER("block.vault.close_shutter"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_DEACTIVATE("block.vault.deactivate"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_EJECT_ITEM("block.vault.eject_item"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_FALL("block.vault.fall"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_HIT("block.vault.hit"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_INSERT_ITEM("block.vault.insert_item"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_INSERT_ITEM_FAIL("block.vault.insert_item_fail"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_OPEN_SHUTTER("block.vault.open_shutter"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_PLACE("block.vault.place"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - BLOCK_VAULT_STEP("block.vault.step"), - BLOCK_VINE_BREAK("block.vine.break"), - BLOCK_VINE_FALL("block.vine.fall"), -@@ -875,40 +935,58 @@ 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(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BOGGED_DEATH("entity.bogged.death"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BOGGED_HURT("entity.bogged.hurt"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BOGGED_SHEAR("entity.bogged.shear"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BOGGED_STEP("entity.bogged.step"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_CHARGE("entity.breeze.charge"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_DEATH("entity.breeze.death"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_HURT("entity.breeze.hurt"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_IDLE_AIR("entity.breeze.idle_air"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_IDLE_GROUND("entity.breeze.idle_ground"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_INHALE("entity.breeze.inhale"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_JUMP("entity.breeze.jump"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_LAND("entity.breeze.land"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_SHOOT("entity.breeze.shoot"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_SLIDE("entity.breeze.slide"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_WHIRL("entity.breeze.whirl"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_BREEZE_WIND_BURST("entity.breeze.wind_burst"), - ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), - ENTITY_CAMEL_DASH("entity.camel.dash"), -@@ -1208,8 +1286,10 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_PARROT_HURT("entity.parrot.hurt"), - ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"), - ENTITY_PARROT_IMITATE_CREEPER("entity.parrot.imitate.creeper"), - ENTITY_PARROT_IMITATE_DROWNED("entity.parrot.imitate.drowned"), -@@ -1489,8 +1569,10 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_WARDEN_STEP("entity.warden.step"), - ENTITY_WARDEN_TENDRIL_CLICKS("entity.warden.tendril_clicks"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_WIND_CHARGE_THROW("entity.wind_charge.throw"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ENTITY_WIND_CHARGE_WIND_BURST("entity.wind_charge.wind_burst"), - ENTITY_WITCH_AMBIENT("entity.witch.ambient"), - ENTITY_WITCH_CELEBRATE("entity.witch.celebrate"), -@@ -1546,11 +1628,12 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ENTITY_ZOMBIFIED_PIGLIN_ANGRY("entity.zombified_piglin.angry"), - ENTITY_ZOMBIFIED_PIGLIN_DEATH("entity.zombified_piglin.death"), - ENTITY_ZOMBIFIED_PIGLIN_HURT("entity.zombified_piglin.hurt"), -- @MinecraftExperimental(Requires.UPDATE_1_21) - EVENT_MOB_EFFECT_BAD_OMEN("event.mob_effect.bad_omen"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - EVENT_MOB_EFFECT_RAID_OMEN("event.mob_effect.raid_omen"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - EVENT_MOB_EFFECT_TRIAL_OMEN("event.mob_effect.trial_omen"), - EVENT_RAID_HORN("event.raid.horn"), - INTENTIONALLY_EMPTY("intentionally_empty"), -@@ -1591,8 +1674,14 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa +@@ -1506,8 +1506,14 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa ITEM_BUCKET_FILL_LAVA("item.bucket.fill_lava"), ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"), ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"), -+ @MinecraftExperimental(Requires.BUNDLE) // Paper - add missing annotation ++ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"), -+ @MinecraftExperimental(Requires.BUNDLE) // Paper - add missing annotation ++ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_BUNDLE_INSERT("item.bundle.insert"), -+ @MinecraftExperimental(Requires.BUNDLE) // Paper - add missing annotation ++ @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"), ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"), ITEM_CROP_PLANT("item.crop.plant"), -@@ -1624,13 +1713,17 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ITEM_INK_SAC_USE("item.ink_sac.use"), - ITEM_LODESTONE_COMPASS_LOCK("item.lodestone_compass.lock"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_MACE_SMASH_AIR("item.mace.smash_air"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_MACE_SMASH_GROUND("item.mace.smash_ground"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_MACE_SMASH_GROUND_HEAVY("item.mace.smash_ground_heavy"), - ITEM_NETHER_WART_PLANT("item.nether_wart.plant"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_OMINOUS_BOTTLE_DISPOSE("item.ominous_bottle.dispose"), - ITEM_SHIELD_BLOCK("item.shield.block"), - ITEM_SHIELD_BREAK("item.shield.break"), -@@ -1647,12 +1740,16 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - ITEM_TRIDENT_THROW("item.trident.throw"), - ITEM_TRIDENT_THUNDER("item.trident.thunder"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_WOLF_ARMOR_BREAK("item.wolf_armor.break"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_WOLF_ARMOR_CRACK("item.wolf_armor.crack"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_WOLF_ARMOR_DAMAGE("item.wolf_armor.damage"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_WOLF_ARMOR_REPAIR("item.wolf_armor.repair"), - MUSIC_CREATIVE("music.creative"), - MUSIC_CREDITS("music.credits"), diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java -index eaec13dbe7be4dd6c5faa97c413e24d6e77cef62..4b037863bde8e3a167cfd94b0df0b357025dcf27 100644 +index 8bfec649f7c6dda956bc388a21b489f3565ff384..63f35e9ff5952a6d03243fa511157c1a5020e9fb 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java -@@ -770,6 +770,8 @@ public interface Tag extends Keyed { +@@ -774,6 +774,8 @@ public interface Tag extends Keyed { /** * Vanilla block tag representing all blocks which block wind charge explosions. */ @@ -872,7 +69,7 @@ index eaec13dbe7be4dd6c5faa97c413e24d6e77cef62..4b037863bde8e3a167cfd94b0df0b357 Tag BLOCKS_WIND_CHARGE_EXPLOSIONS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("blocks_wind_charge_explosions"), Material.class); /** * Vanilla block tag representing solid blocks which do not block hopper operation. -@@ -1146,6 +1148,8 @@ public interface Tag extends Keyed { +@@ -1150,6 +1152,8 @@ public interface Tag extends Keyed { /** * Vanilla item tag representing all items enchantable with mace enchantments. */ @@ -881,7 +78,7 @@ index eaec13dbe7be4dd6c5faa97c413e24d6e77cef62..4b037863bde8e3a167cfd94b0df0b357 Tag ITEMS_ENCHANTABLE_MACE = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("enchantable/mace"), Material.class); /** * Vanilla item tag representing all items that confer freeze immunity on -@@ -1239,6 +1243,8 @@ public interface Tag extends Keyed { +@@ -1243,6 +1247,8 @@ public interface Tag extends Keyed { /** * Vanilla tag representing entities which deflect projectiles. */ @@ -890,7 +87,7 @@ index eaec13dbe7be4dd6c5faa97c413e24d6e77cef62..4b037863bde8e3a167cfd94b0df0b357 Tag ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class); /** * Vanilla tag representing entities which deflect arrows. -@@ -1249,6 +1255,8 @@ public interface Tag extends Keyed { +@@ -1253,6 +1259,8 @@ public interface Tag extends Keyed { /** * Vanilla tag representing entities which can turn in boats. */ @@ -899,7 +96,7 @@ index eaec13dbe7be4dd6c5faa97c413e24d6e77cef62..4b037863bde8e3a167cfd94b0df0b357 Tag ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class); /** * Vanilla tag representing all entities sensitive to illager enchantments. -@@ -1297,14 +1305,20 @@ public interface Tag extends Keyed { +@@ -1301,14 +1309,20 @@ public interface Tag extends Keyed { /** * Vanilla tag representing all entities which do not receive anger from wind charges. */ @@ -920,59 +117,6 @@ index eaec13dbe7be4dd6c5faa97c413e24d6e77cef62..4b037863bde8e3a167cfd94b0df0b357 Tag ENTITY_TYPES_IMMUNE_TO_INFESTED = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("immune_to_infested"), EntityType.class); /** * Vanilla tag representing all projectiles which can be punched back. -diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java -index db7723e2907525850f8dbd2bd7150c1e47ebf1c8..9951cf6780ae47649625b8fe0ed72d87ad0417b2 100644 ---- a/src/main/java/org/bukkit/block/banner/PatternType.java -+++ b/src/main/java/org/bukkit/block/banner/PatternType.java -@@ -54,8 +54,10 @@ public enum PatternType implements Keyed { - GLOBE("glb", "globe"), - PIGLIN("pig", "piglin"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - FLOW("flw", "flow"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - GUSTER("gus", "guster"); - - private final String identifier; -diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java -index f8d9fba8791303794ba3be6f42542c096222691d..7145fce635e542d5898576d815921d0b7105fee1 100644 ---- a/src/main/java/org/bukkit/enchantments/Enchantment.java -+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java -@@ -199,18 +199,21 @@ public abstract class Enchantment implements Keyed, Translatable, net.kyori.adve - * Increases fall damage of maces - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - public static final Enchantment DENSITY = getEnchantment("density"); - - /** - * Reduces armor effectiveness against maces - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - public static final Enchantment BREACH = getEnchantment("breach"); - - /** - * Emits wind burst upon hitting enemy - */ - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - public static final Enchantment WIND_BURST = getEnchantment("wind_burst"); - - /** -diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java -index b670ff8b2bfcaa59c2292211cb9fc2bf4c5b2642..94092a5882180cca7905388184de1f91633f0df1 100644 ---- a/src/main/java/org/bukkit/generator/structure/Structure.java -+++ b/src/main/java/org/bukkit/generator/structure/Structure.java -@@ -50,6 +50,7 @@ public abstract class Structure implements Keyed { - public static final Structure ANCIENT_CITY = getStructure("ancient_city"); - public static final Structure TRAIL_RUINS = getStructure("trail_ruins"); - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - public static final Structure TRIAL_CHAMBERS = getStructure("trial_chambers"); - - private static Structure getStructure(String name) { diff --git a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java index e404cd1e2ba44e4c2d09524bc7cf730d8ffbdabd..cea0ebf50876dd32ab7fba6025b30f297d0a69c4 100644 --- a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java @@ -1017,95 +161,6 @@ index f2242ddc4085f7e7cdd748d860857822e3d9b007..9133a889c1936b4cf7dbf17f744ee926 public static final TrimPattern BOLT = Registry.TRIM_PATTERN.get(NamespacedKey.minecraft("bolt")); // Paper start - adventure -diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java -index 0fc30514375c1700c282d1e92342f7b48ca1cb27..bd625de1103741e592b4111412e4094f4c454f9b 100644 ---- a/src/main/java/org/bukkit/loot/LootTables.java -+++ b/src/main/java/org/bukkit/loot/LootTables.java -@@ -36,44 +36,64 @@ public enum LootTables implements Keyed { - ANCIENT_CITY_ICE_BOX("chests/ancient_city_ice_box"), - RUINED_PORTAL("chests/ruined_portal"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_CORRIDOR("chests/trial_chambers/corridor"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_INTERSECTION("chests/trial_chambers/intersection"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_INTERSECTION_BARREL("chests/trial_chambers/intersection_barrel"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_ENTRANCE("chests/trial_chambers/entrance"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_CORRIDOR_DISPENSER("dispensers/trial_chambers/corridor"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_CHAMBER_DISPENSER("dispensers/trial_chambers/chamber"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_WATER_DISPENSER("dispensers/trial_chambers/water"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - EQUIPMENT_TRIAL_CHAMBER_RANGED("equipment/trial_chamber_ranged"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - EQUIPMENT_TRIAL_CHAMBER_MELEE("equipment/trial_chamber_melee"), - SHIPWRECK_MAP("chests/shipwreck_map"), - SHIPWRECK_SUPPLY("chests/shipwreck_supply"), -@@ -202,14 +222,19 @@ public enum LootTables implements Keyed { - PIGLIN_BARTERING("gameplay/piglin_bartering"), - // Spawners - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBER_KEY("spawners/trial_chamber/key"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - OMINOUS_TRIAL_CHAMBER_CONSUMABLES("spawners/ominous/trial_chamber/consumables"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS("spawners/trial_chamber/items_to_drop_when_ominous"), - // Shearing - SHEARING_BOGGED("shearing/bogged"), diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java index 1afa33ca0d900d9301d52ace3ddb0bd50b5ce4e8..c7100c2bc2be9e294957862d943e629ae9916468 100644 --- a/src/main/java/org/bukkit/map/MapCursor.java @@ -1188,24 +243,3 @@ index 10fa51d116b40450b51af9110d5637f3505ebf65..4716df59a46c2fb1d5108c7c2a11a323 public static final PotionEffectType INFESTED = getPotionEffectType(39, "infested"); @NotNull -diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java -index dabaa58432b91ed120cc5a3a43a8e94110fa84a3..1fdd56450e8a0763833742c805847a723c43bf6c 100644 ---- a/src/main/java/org/bukkit/potion/PotionType.java -+++ b/src/main/java/org/bukkit/potion/PotionType.java -@@ -60,12 +60,16 @@ public enum PotionType implements Keyed { - SLOW_FALLING("slow_falling"), - LONG_SLOW_FALLING("long_slow_falling"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - WIND_CHARGED("wind_charged"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - WEAVING("weaving"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - OOZING("oozing"), - @MinecraftExperimental(Requires.UPDATE_1_21) -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - INFESTED("infested"), - ; - diff --git a/patches/api/0440-Improve-Registry.patch b/patches/api/0440-Improve-Registry.patch index 649d4d49ab..1bc5004d46 100644 --- a/patches/api/0440-Improve-Registry.patch +++ b/patches/api/0440-Improve-Registry.patch @@ -31,10 +31,10 @@ index 62d2b3f950860dee0898d77b0a29635c3f9a7e23..704dba92f9246ef398ed8d162ebee3cf @Override public @NotNull String translationKey() { diff --git a/src/main/java/org/bukkit/Registry.java b/src/main/java/org/bukkit/Registry.java -index 132d375de164e6d8df61234def650154c67fc0df..73edd472b62441670653eb7e3c90aa9667792df7 100644 +index 1d0e734b3200214f97ccd5b65c0fd3192e0b0dc1..eada6d6c4340a345750f63bf49f14711596f706e 100644 --- a/src/main/java/org/bukkit/Registry.java +++ b/src/main/java/org/bukkit/Registry.java -@@ -354,6 +354,49 @@ public interface Registry extends Iterable { +@@ -361,6 +361,49 @@ public interface Registry extends Iterable { @Nullable T get(@NotNull NamespacedKey key); @@ -84,7 +84,7 @@ index 132d375de164e6d8df61234def650154c67fc0df..73edd472b62441670653eb7e3c90aa96 /** * Returns a new stream, which contains all registry items, which are registered to the registry. * -@@ -428,5 +471,12 @@ public interface Registry extends Iterable { +@@ -435,5 +478,12 @@ public interface Registry extends Iterable { public Class getType() { return this.type; } @@ -98,10 +98,10 @@ index 132d375de164e6d8df61234def650154c67fc0df..73edd472b62441670653eb7e3c90aa96 } } diff --git a/src/main/java/org/bukkit/block/banner/PatternType.java b/src/main/java/org/bukkit/block/banner/PatternType.java -index 9951cf6780ae47649625b8fe0ed72d87ad0417b2..2a245735ac902d55681880dc80b12ddef65c0124 100644 +index 6a6be0287255cf38a735bfc83ec91644dc96b903..1883183157c875d87656fdc86a589e9b95dc4895 100644 --- a/src/main/java/org/bukkit/block/banner/PatternType.java +++ b/src/main/java/org/bukkit/block/banner/PatternType.java -@@ -75,6 +75,13 @@ public enum PatternType implements Keyed { +@@ -69,6 +69,13 @@ public enum PatternType implements Keyed { this.key = NamespacedKey.minecraft(key); } @@ -116,10 +116,10 @@ index 9951cf6780ae47649625b8fe0ed72d87ad0417b2..2a245735ac902d55681880dc80b12dde @NotNull public NamespacedKey getKey() { diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java -index 94092a5882180cca7905388184de1f91633f0df1..729588330e543408fbb4c7c4f6b27eaa721bd2c4 100644 +index 1a766e68713d4014783b3224b9395644116784fa..978054ee364f9a3330525b9b50da5325ebb6ef57 100644 --- a/src/main/java/org/bukkit/generator/structure/Structure.java +++ b/src/main/java/org/bukkit/generator/structure/Structure.java -@@ -64,4 +64,13 @@ public abstract class Structure implements Keyed { +@@ -60,4 +60,13 @@ public abstract class Structure implements Keyed { */ @NotNull public abstract StructureType getStructureType(); diff --git a/patches/api/0441-Add-experience-points-API.patch b/patches/api/0441-Add-experience-points-API.patch index a0add5e837..9b489a9ded 100644 --- a/patches/api/0441-Add-experience-points-API.patch +++ b/patches/api/0441-Add-experience-points-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add experience points API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9261f06e332f8db94b2ef7bc01f5b0e61422bcb2..f08b1a2ec8815efcaaf1371e20eb1461a5f2d359 100644 +index 09094f55509eaf66670c27409b4d5ec3d73412b0..4bc4a1c0c6f6759f984843823f1bbec6ffed92bc 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1902,6 +1902,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1907,6 +1907,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param exp New total experience points */ public void setTotalExperience(int exp); diff --git a/patches/api/0442-Add-missing-InventoryType.patch b/patches/api/0442-Add-missing-InventoryType.patch index 9c578e05a4..88ed48c3e6 100644 --- a/patches/api/0442-Add-missing-InventoryType.patch +++ b/patches/api/0442-Add-missing-InventoryType.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Add missing InventoryType Upstream did not add a DECORATED_POT inventory type diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java -index ccb09660e565bc2f7a653bda95fb38caccf7a060..59b375569a75cb1e1f7c610f96078e102ec0d3ed 100644 +index fbdbd2f4da5e09d4b111ddcf72e2d7dd59046bd7..851e40dc8af6dcb5670785e006b078af7e72fb76 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java -@@ -145,6 +145,12 @@ public enum InventoryType { +@@ -143,6 +143,12 @@ public enum InventoryType { * Pseudo jukebox inventory with 1 slot of undefined type. */ JUKEBOX(1, "Jukebox", false), diff --git a/patches/api/0444-Add-HiddenPotionEffect-API.patch b/patches/api/0444-Add-HiddenPotionEffect-API.patch index 8ac61db064..94799bbf65 100644 --- a/patches/api/0444-Add-HiddenPotionEffect-API.patch +++ b/patches/api/0444-Add-HiddenPotionEffect-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 5f070c7563151c40cf4d691fc2a10d8a2766982a..b777e530122549455dcce6fac8d4a151c1c0af42 100644 +index 5de7651f673cba9782f88f46dc938274b37a38ec..5c29956c6db53440322330ff723c7087193641f1 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0456-improve-BanList-types.patch b/patches/api/0456-improve-BanList-types.patch index 4a4980dd7a..fb48003a0d 100644 --- a/patches/api/0456-improve-BanList-types.patch +++ b/patches/api/0456-improve-BanList-types.patch @@ -68,10 +68,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce /** * Banned player names diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index dea75658cc232590ecd566845e180cc9aa562c17..47039514503d99e84cb99f4941707a7726286516 100644 +index 031e9a41b44bf405686d3b210a8354cb9520be2e..3f0ead8b57a73c788b1cb0fc0799b8fa914e2519 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java -@@ -1648,11 +1648,27 @@ public final class Bukkit { +@@ -1649,11 +1649,27 @@ public final class Bukkit { * @param The ban target * * @return a ban list of the specified type @@ -100,10 +100,10 @@ index dea75658cc232590ecd566845e180cc9aa562c17..47039514503d99e84cb99f4941707a77 /** * Gets a set containing all player operators. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f7e9b293484886e5d981ed44e223103b73d516fd..0614bd7e2d658172a7765925adf81b75b5620f11 100644 +index 876267814d25da46f3596448b9036b5901d2c4e0..b6b4bc19e8348096469fd47d93cc5ae6cae9e516 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1410,10 +1410,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1411,10 +1411,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @param The ban target * * @return a ban list of the specified type diff --git a/patches/api/0463-Item-Mutation-Fixes.patch b/patches/api/0463-Item-Mutation-Fixes.patch index c1c3508b78..ccd77b7fbc 100644 --- a/patches/api/0463-Item-Mutation-Fixes.patch +++ b/patches/api/0463-Item-Mutation-Fixes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Item Mutation Fixes diff --git a/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java b/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java -index f30ed841864f426c59143f392f39c96f864ba924..16fd600c25991e641a1be6fb78238256a6ce3d3f 100644 +index 1ebd45295a29fbc990a1311a7f0fe7f42ac79275..b70450919e78e869c9f158c4e3e25944bcaa73f2 100644 --- a/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java +++ b/src/main/java/org/bukkit/event/block/InventoryBlockStartEvent.java -@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; +@@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull; public class InventoryBlockStartEvent extends BlockEvent { private static final HandlerList handlers = new HandlerList(); diff --git a/patches/api/0464-API-for-checking-sent-chunks.patch b/patches/api/0464-API-for-checking-sent-chunks.patch index faeaa79bf8..a3844b5401 100644 --- a/patches/api/0464-API-for-checking-sent-chunks.patch +++ b/patches/api/0464-API-for-checking-sent-chunks.patch @@ -5,10 +5,10 @@ Subject: [PATCH] API for checking sent chunks diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b824be639084e73d5150b35f29506bfed7af4642..c91dd7689e767a93946ec09f39731301d0e163cb 100644 +index 4bc4a1c0c6f6759f984843823f1bbec6ffed92bc..7b699c1e63cf5bc805754101f28066f836877ee2 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3799,6 +3799,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3804,6 +3804,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM void resetIdleDuration(); // Paper end diff --git a/patches/api/0472-Expose-hasColor-to-leather-armor.patch b/patches/api/0472-Expose-hasColor-to-leather-armor.patch index b4c3426c8b..e2c609b4f0 100644 --- a/patches/api/0472-Expose-hasColor-to-leather-armor.patch +++ b/patches/api/0472-Expose-hasColor-to-leather-armor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expose #hasColor to leather armor diff --git a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java -index 1d61cc4ab36413fe3c1ecdf9824a5e18cb4bc148..fba0512827b4af289674a5602722f520f32d28b2 100644 +index c701d5fbc5fef503f18a3a46fa54c983bf96e895..2d68f93c371e4a40638f56e5cd4d39472d4e462b 100644 --- a/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/LeatherArmorMeta.java @@ -36,4 +36,13 @@ public interface LeatherArmorMeta extends ItemMeta { diff --git a/patches/api/0473-Add-missing-wind-charge-damage-type.patch b/patches/api/0473-Add-missing-wind-charge-damage-type.patch index 8a77bddf2a..3ae5ccd47a 100644 --- a/patches/api/0473-Add-missing-wind-charge-damage-type.patch +++ b/patches/api/0473-Add-missing-wind-charge-damage-type.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add missing wind charge damage type diff --git a/src/main/java/org/bukkit/damage/DamageType.java b/src/main/java/org/bukkit/damage/DamageType.java -index 9f2d80a91e12f09407d737668f4178e81811fe14..e1367e86c21a1c733c8db45b357e9a95e093644a 100644 +index 69abda41ef3a1d8948982d16b193a9a565fafa38..5e332d7def0ef346c7d55018f18b3136e69deb3f 100644 --- a/src/main/java/org/bukkit/damage/DamageType.java +++ b/src/main/java/org/bukkit/damage/DamageType.java -@@ -65,6 +65,12 @@ public interface DamageType extends Keyed, Translatable { +@@ -66,6 +66,12 @@ public interface DamageType extends Keyed, Translatable { public static final DamageType BAD_RESPAWN_POINT = getDamageType("bad_respawn_point"); public static final DamageType OUTSIDE_BORDER = getDamageType("outside_border"); public static final DamageType GENERIC_KILL = getDamageType("generic_kill"); @@ -21,7 +21,7 @@ index 9f2d80a91e12f09407d737668f4178e81811fe14..e1367e86c21a1c733c8db45b357e9a95 @NotNull private static DamageType getDamageType(@NotNull String key) { -@@ -72,6 +78,12 @@ public interface DamageType extends Keyed, Translatable { +@@ -73,6 +79,12 @@ public interface DamageType extends Keyed, Translatable { return Preconditions.checkNotNull(Registry.DAMAGE_TYPE.get(namespacedKey), "No DamageType found for %s. This is a bug.", namespacedKey); } diff --git a/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch index 66f3365768..b1702bee61 100644 --- a/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch +++ b/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Added API to get player ha proxy address diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8a1e39474af88188f2e1765731b57d349f0ee645..6c327a07bf8a6aa11a2d7dad12b2830acc539484 100644 +index 7b699c1e63cf5bc805754101f28066f836877ee2..7c56182acaf827f4b1a986a61cea8e9960604c98 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -250,6 +250,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -251,6 +251,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Nullable public InetSocketAddress getAddress(); diff --git a/patches/api/0478-Fix-equipment-slot-and-group-API.patch b/patches/api/0478-Fix-equipment-slot-and-group-API.patch index 26189fa8bf..fe72e478bc 100644 --- a/patches/api/0478-Fix-equipment-slot-and-group-API.patch +++ b/patches/api/0478-Fix-equipment-slot-and-group-API.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Fix equipment slot and group API was missing the 'body' slot group diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index 9b47cbb93399a22301ec643e4be8f173314c455e..097396166b94ec7c9581a7b2f4ef644f95708671 100644 +index d66502c9df2592cd18694481e7e90a71a5c3a359..ed54c85c2370a47f4531eb1302ff82ddfc0f5672 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java -@@ -96,6 +96,7 @@ public class AttributeModifier implements ConfigurationSerializable { +@@ -112,6 +112,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { */ @Nullable @Deprecated diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/unapplied/server/0001-Setup-Gradle-project.patch similarity index 100% rename from patches/server/0001-Setup-Gradle-project.patch rename to patches/unapplied/server/0001-Setup-Gradle-project.patch diff --git a/patches/server/0002-Remap-fixes.patch b/patches/unapplied/server/0002-Remap-fixes.patch similarity index 100% rename from patches/server/0002-Remap-fixes.patch rename to patches/unapplied/server/0002-Remap-fixes.patch diff --git a/patches/server/0003-Build-system-changes.patch b/patches/unapplied/server/0003-Build-system-changes.patch similarity index 100% rename from patches/server/0003-Build-system-changes.patch rename to patches/unapplied/server/0003-Build-system-changes.patch diff --git a/patches/server/0004-Test-changes.patch b/patches/unapplied/server/0004-Test-changes.patch similarity index 100% rename from patches/server/0004-Test-changes.patch rename to patches/unapplied/server/0004-Test-changes.patch diff --git a/patches/server/0005-Paper-config-files.patch b/patches/unapplied/server/0005-Paper-config-files.patch similarity index 100% rename from patches/server/0005-Paper-config-files.patch rename to patches/unapplied/server/0005-Paper-config-files.patch diff --git a/patches/server/0006-MC-Dev-fixes.patch b/patches/unapplied/server/0006-MC-Dev-fixes.patch similarity index 98% rename from patches/server/0006-MC-Dev-fixes.patch rename to patches/unapplied/server/0006-MC-Dev-fixes.patch index ca860ff160..01e046d5cd 100644 --- a/patches/server/0006-MC-Dev-fixes.patch +++ b/patches/unapplied/server/0006-MC-Dev-fixes.patch @@ -71,7 +71,7 @@ index a614e960fcd5958ad17b679eee8a8e6926f58e62..da101bca71f4710812621b98f0a0d8ca if (!this.hasElementSeparator()) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1d241972e6f93a88c31f1276e15bae0912db5c9e..9efd8dc1c35dc0a13f5ff3f097386e6e768b3bc0 100644 +index c2c20eb7fedbadc56b1f8ee8bf4b03092e62a26b..925c2c83191bdb70b0d14a6177183e4d9a190a97 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1924,7 +1924,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop pendingBlockEntityTickers = Lists.newArrayList(); private boolean tickingBlockEntities; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5bbbb9ee266879291e4ff56ad2ee39aa6151bfff..705cfb8ac38ee49adfb36a93b6939c975bbe95e9 100644 +index ee5b61c476abc1f9a2babf350ac9dfa45b2c3253..8fea8bc0117b5b9ebff1979a73783446b7afe228 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -164,6 +164,56 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0126-Enforce-Sync-Player-Saves.patch b/patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch similarity index 100% rename from patches/server/0126-Enforce-Sync-Player-Saves.patch rename to patches/unapplied/server/0126-Enforce-Sync-Player-Saves.patch diff --git a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/unapplied/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 99% rename from patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/unapplied/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 270d30624c..4be7a3850e 100644 --- a/patches/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/patches/unapplied/server/0127-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -21,7 +21,7 @@ index 344d22ae4067bccd6d42b444f6b057c9d1ea6e82..f4bf927477af23365a2d4618a1634195 return true; diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 1f29ed95ef3d1904a014715028d9d591fe39231f..1a829f79e6f9e03ead745e13ece4d1b57195dbb4 100644 +index b919ae8602f54f6ec8c9c743f3e852cd4c00e97f..0dd931a082a972cd62f80f32ef0c7177b0daf599 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -41,9 +41,63 @@ public class ExperienceOrb extends Entity { @@ -247,7 +247,7 @@ index c493c324a2606a40a3a04a55cb77790614d2707b..057eca881d279c610e933ebff5fb6546 } diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java -index 6b3cf71d7ced6405308b41ac316040bcc03f654d..453da998a98eabe5a55a968277b71bd9998f3221 100644 +index 1eeb61688cae52bb25ef6d9ac4f0a0df3d34f846..c3a035742271611f2d26cf4af0d5877369dd6558 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java @@ -524,7 +524,7 @@ public class FishingHook extends Projectile { diff --git a/patches/server/0128-Cap-Entity-Collisions.patch b/patches/unapplied/server/0128-Cap-Entity-Collisions.patch similarity index 100% rename from patches/server/0128-Cap-Entity-Collisions.patch rename to patches/unapplied/server/0128-Cap-Entity-Collisions.patch diff --git a/patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch b/patches/unapplied/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch similarity index 100% rename from patches/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch rename to patches/unapplied/server/0129-Remove-CraftScheduler-Async-Task-Debugger.patch diff --git a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch b/patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch similarity index 99% rename from patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch rename to patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch index f9dd43b3aa..d5a2f6ec3b 100644 --- a/patches/server/0130-Properly-handle-async-calls-to-restart-the-server.patch +++ b/patches/unapplied/server/0130-Properly-handle-async-calls-to-restart-the-server.patch @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fb0904312cad3a8853f2f92888f9e21c3ab50f27..260e364c91d8c3d774681f9f0ecba63df5dd3f5c 100644 +index fca7340f5b0dbbf072a752e7e7b589dbaeb17d50..1fdd088f0bb6606f2a9a482d276aa3e9261be012 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -236,6 +236,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop collection, boolean force) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f0f00d459ef93ac8e716067b2160fed1433ce0b3..6d947a11bc94cb8792a3ce0b5314d7226485e8ab 100644 +index 321c3e48e520865d2e226a8773af0bd4b5f3d5bb..3d8c4cc4d1bdd8c5ceea65fc2189070098410849 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -892,9 +892,16 @@ public class CraftEventFactory { diff --git a/patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch b/patches/unapplied/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch similarity index 95% rename from patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch rename to patches/unapplied/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch index 1a3e71696c..8d3113967f 100644 --- a/patches/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/patches/unapplied/server/0246-Allow-chests-to-be-placed-with-NBT-data.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 6dd441484dbae1818a927773a6e6c663c70ccd0e..91f342912372326a6ced16c23550da7727d6d3ad 100644 +index 6358cdada112cd3e17d9363111c931a4d21eb4b9..b5f1d223a3955e1b478712c581080904f86a2a2a 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -469,6 +469,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0247-Mob-Pathfinding-API.patch b/patches/unapplied/server/0247-Mob-Pathfinding-API.patch similarity index 100% rename from patches/server/0247-Mob-Pathfinding-API.patch rename to patches/unapplied/server/0247-Mob-Pathfinding-API.patch diff --git a/patches/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch b/patches/unapplied/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch similarity index 100% rename from patches/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch rename to patches/unapplied/server/0248-Prevent-various-interactions-from-causing-chunk-load.patch diff --git a/patches/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch b/patches/unapplied/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch similarity index 100% rename from patches/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch rename to patches/unapplied/server/0249-Prevent-mob-spawning-from-loading-generating-chunks.patch diff --git a/patches/server/0250-Implement-furnace-cook-speed-multiplier-API.patch b/patches/unapplied/server/0250-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/server/0250-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/unapplied/server/0250-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/server/0251-Honor-EntityAgeable.ageLock.patch b/patches/unapplied/server/0251-Honor-EntityAgeable.ageLock.patch similarity index 100% rename from patches/server/0251-Honor-EntityAgeable.ageLock.patch rename to patches/unapplied/server/0251-Honor-EntityAgeable.ageLock.patch diff --git a/patches/server/0252-Configurable-connection-throttle-kick-message.patch b/patches/unapplied/server/0252-Configurable-connection-throttle-kick-message.patch similarity index 100% rename from patches/server/0252-Configurable-connection-throttle-kick-message.patch rename to patches/unapplied/server/0252-Configurable-connection-throttle-kick-message.patch diff --git a/patches/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch b/patches/unapplied/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch similarity index 100% rename from patches/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch rename to patches/unapplied/server/0253-Prevent-chunk-loading-from-Fluid-Flowing.patch diff --git a/patches/server/0254-PreSpawnerSpawnEvent.patch b/patches/unapplied/server/0254-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/server/0254-PreSpawnerSpawnEvent.patch rename to patches/unapplied/server/0254-PreSpawnerSpawnEvent.patch diff --git a/patches/server/0255-Add-LivingEntity-getTargetEntity.patch b/patches/unapplied/server/0255-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/server/0255-Add-LivingEntity-getTargetEntity.patch rename to patches/unapplied/server/0255-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/server/0256-Add-sun-related-API.patch b/patches/unapplied/server/0256-Add-sun-related-API.patch similarity index 100% rename from patches/server/0256-Add-sun-related-API.patch rename to patches/unapplied/server/0256-Add-sun-related-API.patch diff --git a/patches/server/0257-Catch-JsonParseException-in-block-entity-names.patch b/patches/unapplied/server/0257-Catch-JsonParseException-in-block-entity-names.patch similarity index 100% rename from patches/server/0257-Catch-JsonParseException-in-block-entity-names.patch rename to patches/unapplied/server/0257-Catch-JsonParseException-in-block-entity-names.patch diff --git a/patches/server/0258-Turtle-API.patch b/patches/unapplied/server/0258-Turtle-API.patch similarity index 100% rename from patches/server/0258-Turtle-API.patch rename to patches/unapplied/server/0258-Turtle-API.patch diff --git a/patches/server/0259-Call-player-spectator-target-events-and-improve-impl.patch b/patches/unapplied/server/0259-Call-player-spectator-target-events-and-improve-impl.patch similarity index 100% rename from patches/server/0259-Call-player-spectator-target-events-and-improve-impl.patch rename to patches/unapplied/server/0259-Call-player-spectator-target-events-and-improve-impl.patch diff --git a/patches/server/0260-Add-more-Witch-API.patch b/patches/unapplied/server/0260-Add-more-Witch-API.patch similarity index 100% rename from patches/server/0260-Add-more-Witch-API.patch rename to patches/unapplied/server/0260-Add-more-Witch-API.patch diff --git a/patches/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch b/patches/unapplied/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch similarity index 100% rename from patches/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch rename to patches/unapplied/server/0261-Check-Drowned-for-Villager-Aggression-Config.patch diff --git a/patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch b/patches/unapplied/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch similarity index 100% rename from patches/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch rename to patches/unapplied/server/0262-Add-option-to-prevent-players-from-moving-into-unloa.patch diff --git a/patches/server/0263-Reset-players-airTicks-on-respawn.patch b/patches/unapplied/server/0263-Reset-players-airTicks-on-respawn.patch similarity index 100% rename from patches/server/0263-Reset-players-airTicks-on-respawn.patch rename to patches/unapplied/server/0263-Reset-players-airTicks-on-respawn.patch diff --git a/patches/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/patches/unapplied/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch similarity index 100% rename from patches/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch rename to patches/unapplied/server/0264-Don-t-sleep-after-profile-lookups-if-not-needed.patch diff --git a/patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch b/patches/unapplied/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch similarity index 98% rename from patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch rename to patches/unapplied/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch index 553a1ab418..f83d324e4f 100644 --- a/patches/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch +++ b/patches/unapplied/server/0265-Improve-Server-Thread-Pool-and-Thread-Priorities.patch @@ -92,7 +92,7 @@ index cf54e2c8e8aadb9e7343382a5ba59c657234c9b9..c7a21a11efba5c212958d56095217621 return executorService; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6d871dd9bc4a954046f03f0911003e3fb2d4dfd6..41ffbf38f8bc4423f7670edf86702330f02e488d 100644 +index a8a53b0aad6cda7fa1cd0565b5a4249a228f87f7..015eb2e8e9bf28435a8ea9aff544bcd95e679bde 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -316,6 +316,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index faa228698c7dd60bde0f3767cc27957ece04b8be..f3bce016e729d553aaa6185470bbf4317f94352b 100644 +index 1f62158072d7503f0148a9af4e9fbebab30e6fd7..6048e80241246cabf0390e11d217cd8c291d31b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -203,23 +203,27 @@ public class Main { diff --git a/patches/server/0321-Add-ThrownEggHatchEvent.patch b/patches/unapplied/server/0321-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/server/0321-Add-ThrownEggHatchEvent.patch rename to patches/unapplied/server/0321-Add-ThrownEggHatchEvent.patch diff --git a/patches/server/0322-Entity-Jump-API.patch b/patches/unapplied/server/0322-Entity-Jump-API.patch similarity index 100% rename from patches/server/0322-Entity-Jump-API.patch rename to patches/unapplied/server/0322-Entity-Jump-API.patch diff --git a/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/unapplied/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch similarity index 96% rename from patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch rename to patches/unapplied/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch index f12aca294a..02b1a1e50a 100644 --- a/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/unapplied/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a80041ccb308fa393498e72c1060f89ade440cb8..70fdacb0aab225b89126d9c21e14cf42d69f00fa 100644 +index 7544a013111a830618371b9b929c950d8f791bd8..102f32c0724b6042412c010cffa02e5b454ab757 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -398,6 +398,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0324-Make-the-GUI-graph-fancier.patch b/patches/unapplied/server/0324-Make-the-GUI-graph-fancier.patch similarity index 100% rename from patches/server/0324-Make-the-GUI-graph-fancier.patch rename to patches/unapplied/server/0324-Make-the-GUI-graph-fancier.patch diff --git a/patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch b/patches/unapplied/server/0325-add-hand-to-BlockMultiPlaceEvent.patch similarity index 93% rename from patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/unapplied/server/0325-add-hand-to-BlockMultiPlaceEvent.patch index da943486d3..e422639556 100644 --- a/patches/server/0325-add-hand-to-BlockMultiPlaceEvent.patch +++ b/patches/unapplied/server/0325-add-hand-to-BlockMultiPlaceEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 6d947a11bc94cb8792a3ce0b5314d7226485e8ab..74fc73549b504eb2b7fcaa141aa125f84a077ed9 100644 +index 3d8c4cc4d1bdd8c5ceea65fc2189070098410849..c0f0627d3c303e625be584c6eba5865f5622490f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -401,13 +401,18 @@ public class CraftEventFactory { diff --git a/patches/server/0326-Validate-tripwire-hook-placement-before-update.patch b/patches/unapplied/server/0326-Validate-tripwire-hook-placement-before-update.patch similarity index 100% rename from patches/server/0326-Validate-tripwire-hook-placement-before-update.patch rename to patches/unapplied/server/0326-Validate-tripwire-hook-placement-before-update.patch diff --git a/patches/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/patches/unapplied/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch similarity index 100% rename from patches/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch rename to patches/unapplied/server/0327-Add-option-to-allow-iron-golems-to-spawn-in-air.patch diff --git a/patches/server/0328-Configurable-chance-of-villager-zombie-infection.patch b/patches/unapplied/server/0328-Configurable-chance-of-villager-zombie-infection.patch similarity index 100% rename from patches/server/0328-Configurable-chance-of-villager-zombie-infection.patch rename to patches/unapplied/server/0328-Configurable-chance-of-villager-zombie-infection.patch diff --git a/patches/server/0329-Optimise-Chunk-getFluid.patch b/patches/unapplied/server/0329-Optimise-Chunk-getFluid.patch similarity index 100% rename from patches/server/0329-Optimise-Chunk-getFluid.patch rename to patches/unapplied/server/0329-Optimise-Chunk-getFluid.patch diff --git a/patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch b/patches/unapplied/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch similarity index 89% rename from patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch rename to patches/unapplied/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch index f00c33db91..e97303c0a9 100644 --- a/patches/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch +++ b/patches/unapplied/server/0330-Set-spigots-verbose-world-setting-to-false-by-def.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Set spigots verbose world setting to false by def diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 81c76360e8c7389bafd61f38e6782668e8c65d27..2a787b641fec29427963ac2bdc14df60f32af2bc 100644 +index da91101f250a828a88b0511f7fd34879956db8dd..c15c60fb88c9d6e370e2100c57ccb59d5441c96f 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -20,7 +20,7 @@ public class SpigotWorldConfig diff --git a/patches/server/0331-Add-tick-times-API-and-mspt-command.patch b/patches/unapplied/server/0331-Add-tick-times-API-and-mspt-command.patch similarity index 100% rename from patches/server/0331-Add-tick-times-API-and-mspt-command.patch rename to patches/unapplied/server/0331-Add-tick-times-API-and-mspt-command.patch diff --git a/patches/server/0332-Expose-MinecraftServer-isRunning.patch b/patches/unapplied/server/0332-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/server/0332-Expose-MinecraftServer-isRunning.patch rename to patches/unapplied/server/0332-Expose-MinecraftServer-isRunning.patch diff --git a/patches/server/0333-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/unapplied/server/0333-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/server/0333-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/unapplied/server/0333-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch b/patches/unapplied/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch similarity index 98% rename from patches/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch rename to patches/unapplied/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch index dfa35fee3f..c1c57ebd98 100644 --- a/patches/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/patches/unapplied/server/0334-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 3a24a46fca271e12f8ad5b716ef6ea6621b8801c..553e9bcac962085e38464493650c47ee1636c0e0 100644 +index 932b68089c55c8f1b84a15272378d4322a0a5a91..10369280138e3baf563cd1099af5eb878cd2a39b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -265,6 +265,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/patches/unapplied/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch similarity index 95% rename from patches/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch rename to patches/unapplied/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch index d5833fa44c..d4ff9e5867 100644 --- a/patches/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch +++ b/patches/unapplied/server/0335-Remote-Connections-shouldn-t-hold-up-shutdown.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Remote Connections shouldn't hold up shutdown Bugs in the connection logic appears to leave stale connections even, preventing shutdown diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index bce5fc7337d4e29c3353600a35c999caaed1428e..3d33504eac6af17c8833de11226968d52f96232f 100644 +index 3736fdd1dba4fc86012c687c5525a52cb8094f47..539a8ddfcf660bf824325516c88cf91f4a32a746 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -412,11 +412,11 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/patches/unapplied/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch similarity index 100% rename from patches/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch rename to patches/unapplied/server/0336-Do-not-allow-bees-to-load-chunks-for-beehives.patch diff --git a/patches/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/patches/unapplied/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch similarity index 100% rename from patches/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch rename to patches/unapplied/server/0337-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch diff --git a/patches/server/0338-Don-t-tick-dead-players.patch b/patches/unapplied/server/0338-Don-t-tick-dead-players.patch similarity index 91% rename from patches/server/0338-Don-t-tick-dead-players.patch rename to patches/unapplied/server/0338-Don-t-tick-dead-players.patch index 5301bf6d95..5b34e6f194 100644 --- a/patches/server/0338-Don-t-tick-dead-players.patch +++ b/patches/unapplied/server/0338-Don-t-tick-dead-players.patch @@ -7,7 +7,7 @@ Causes sync chunk loads and who knows what all else. This is safe because Spectators are skipped in unloaded chunks too in vanilla. diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 553e9bcac962085e38464493650c47ee1636c0e0..a55707fc74f6cc2ac1e1f1f6dc60e3de9ccbbb5e 100644 +index 10369280138e3baf563cd1099af5eb878cd2a39b..5d42a20c2b908858c3b61a8100addec5100b33a0 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -758,7 +758,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch b/patches/unapplied/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch similarity index 90% rename from patches/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch rename to patches/unapplied/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch index 6c42f020df..de7bd84221 100644 --- a/patches/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch +++ b/patches/unapplied/server/0339-Dead-Player-s-shouldn-t-be-able-to-move.patch @@ -7,7 +7,7 @@ This fixes a lot of game state issues where packets were delayed for processing due to 1.15's new queue but processed while dead. diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index bbafbeff99a7c1bd2d9e27982671a017071f829c..f07c2bd727a8e3e65bb2e6b1367a4bb392febe23 100644 +index e60385c2b84ca0807ed5fc710017a1de09aa3c4e..37190eb2d7a8f81989908f58aa13de1ba964e43a 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1162,7 +1162,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0340-Don-t-move-existing-players-to-world-spawn.patch b/patches/unapplied/server/0340-Don-t-move-existing-players-to-world-spawn.patch similarity index 96% rename from patches/server/0340-Don-t-move-existing-players-to-world-spawn.patch rename to patches/unapplied/server/0340-Don-t-move-existing-players-to-world-spawn.patch index d4c692afa8..3c566159a3 100644 --- a/patches/server/0340-Don-t-move-existing-players-to-world-spawn.patch +++ b/patches/unapplied/server/0340-Don-t-move-existing-players-to-world-spawn.patch @@ -13,7 +13,7 @@ By skipping this, we avoid potential for a large spike on server start. public net.minecraft.server.level.ServerPlayer fudgeSpawnLocation(Lnet/minecraft/server/level/ServerLevel;)V diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index a55707fc74f6cc2ac1e1f1f6dc60e3de9ccbbb5e..188d087576944cc19794151ed380c7471afc8b16 100644 +index 5d42a20c2b908858c3b61a8100addec5100b33a0..1856f0692f1894614a9366378b3209a87a1253ec 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -353,7 +353,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0341-Optimize-Pathfinding.patch b/patches/unapplied/server/0341-Optimize-Pathfinding.patch similarity index 100% rename from patches/server/0341-Optimize-Pathfinding.patch rename to patches/unapplied/server/0341-Optimize-Pathfinding.patch diff --git a/patches/server/0342-Reduce-Either-Optional-allocation.patch b/patches/unapplied/server/0342-Reduce-Either-Optional-allocation.patch similarity index 100% rename from patches/server/0342-Reduce-Either-Optional-allocation.patch rename to patches/unapplied/server/0342-Reduce-Either-Optional-allocation.patch diff --git a/patches/server/0343-Reduce-memory-footprint-of-CompoundTag.patch b/patches/unapplied/server/0343-Reduce-memory-footprint-of-CompoundTag.patch similarity index 100% rename from patches/server/0343-Reduce-memory-footprint-of-CompoundTag.patch rename to patches/unapplied/server/0343-Reduce-memory-footprint-of-CompoundTag.patch diff --git a/patches/server/0344-Prevent-opening-inventories-when-frozen.patch b/patches/unapplied/server/0344-Prevent-opening-inventories-when-frozen.patch similarity index 97% rename from patches/server/0344-Prevent-opening-inventories-when-frozen.patch rename to patches/unapplied/server/0344-Prevent-opening-inventories-when-frozen.patch index 4fc06e5cb2..1c3720ee78 100644 --- a/patches/server/0344-Prevent-opening-inventories-when-frozen.patch +++ b/patches/unapplied/server/0344-Prevent-opening-inventories-when-frozen.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Prevent opening inventories when frozen diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 188d087576944cc19794151ed380c7471afc8b16..ce2df5daf3854b541ce0206ea6105c33aad3d010 100644 +index 1856f0692f1894614a9366378b3209a87a1253ec..2720fee3f0e8d1c9a3e2a13c86bf2d60fa9de26c 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -703,7 +703,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/unapplied/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch similarity index 100% rename from patches/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch rename to patches/unapplied/server/0345-Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/patches/server/0346-Implement-Player-Client-Options-API.patch b/patches/unapplied/server/0346-Implement-Player-Client-Options-API.patch similarity index 98% rename from patches/server/0346-Implement-Player-Client-Options-API.patch rename to patches/unapplied/server/0346-Implement-Player-Client-Options-API.patch index 4603218155..2417bf6e0c 100644 --- a/patches/server/0346-Implement-Player-Client-Options-API.patch +++ b/patches/unapplied/server/0346-Implement-Player-Client-Options-API.patch @@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..b6f4400df3d8ec7e06a996de54f8cabb + } +} diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index ce2df5daf3854b541ce0206ea6105c33aad3d010..234b290896ba9dfb36d110740cd0494b0fbfe1e4 100644 +index 2720fee3f0e8d1c9a3e2a13c86bf2d60fa9de26c..f9b2bbda1cbd16f8635d6fff05bb5c0e26a5e6f1 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -354,7 +354,7 @@ public class ServerPlayer extends Player { @@ -136,7 +136,7 @@ index ce2df5daf3854b541ce0206ea6105c33aad3d010..234b290896ba9dfb36d110740cd0494b this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(this.language), java.util.Locale.US); // Paper this.requestedViewDistance = clientOptions.viewDistance(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6572ca279d8ffe896b852fc138e01816fd28058a..4131b83117e399d7113442def85101d20c493d06 100644 +index 332f916a5063aa3048675eb906bb3ff5050b37bb..61b9dabaa74ee9e2b357316382ecbdf6c822b916 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -651,6 +651,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch b/patches/unapplied/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch similarity index 100% rename from patches/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch rename to patches/unapplied/server/0347-Don-t-crash-if-player-is-attempted-to-be-removed-fro.patch diff --git a/patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch b/patches/unapplied/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch similarity index 98% rename from patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch rename to patches/unapplied/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch index a771469d23..db5513d4b1 100644 --- a/patches/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch +++ b/patches/unapplied/server/0348-Fire-PlayerJoinEvent-when-Player-is-actually-ready.patch @@ -43,7 +43,7 @@ index 66936834a80ef6b645ab44f3439defcb90237bfa..406c78dcb97d954f16f05d379d4dbf74 EntityType entitytypes = entity.getType(); int i = entitytypes.clientTrackingRange() * 16; diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 234b290896ba9dfb36d110740cd0494b0fbfe1e4..dde6d567521a08b416ee50b1249b653b0bf6e87a 100644 +index f9b2bbda1cbd16f8635d6fff05bb5c0e26a5e6f1..bf6c81300d29c445a1012d1159866547c202d135 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -284,6 +284,7 @@ public class ServerPlayer extends Player { diff --git a/patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch b/patches/unapplied/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch similarity index 98% rename from patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch rename to patches/unapplied/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch index f14f39fbe2..161e100760 100644 --- a/patches/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch +++ b/patches/unapplied/server/0349-Move-player-to-spawn-point-if-spawn-in-unloaded-worl.patch @@ -84,7 +84,7 @@ index a4db0bcefc92091ff26b146a2ce914c1d36a3c23..935061ed5c22b48e43d27fe0840cc69f } // Paper end - Entity#getEntitySpawnReason diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 70fdacb0aab225b89126d9c21e14cf42d69f00fa..06b52eefb16f7605021c2e2a5e3a300151fc5424 100644 +index 102f32c0724b6042412c010cffa02e5b454ab757..33329cb73324ea3e005d59ee3f9ea1225ada7055 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2316,27 +2316,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/unapplied/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/unapplied/server/0350-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch b/patches/unapplied/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch similarity index 100% rename from patches/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch rename to patches/unapplied/server/0351-Don-t-fire-BlockFade-on-worldgen-threads.patch diff --git a/patches/server/0352-Add-phantom-creative-and-insomniac-controls.patch b/patches/unapplied/server/0352-Add-phantom-creative-and-insomniac-controls.patch similarity index 100% rename from patches/server/0352-Add-phantom-creative-and-insomniac-controls.patch rename to patches/unapplied/server/0352-Add-phantom-creative-and-insomniac-controls.patch diff --git a/patches/server/0353-Fix-item-duplication-and-teleport-issues.patch b/patches/unapplied/server/0353-Fix-item-duplication-and-teleport-issues.patch similarity index 97% rename from patches/server/0353-Fix-item-duplication-and-teleport-issues.patch rename to patches/unapplied/server/0353-Fix-item-duplication-and-teleport-issues.patch index 8c46843ec9..84397e780b 100644 --- a/patches/server/0353-Fix-item-duplication-and-teleport-issues.patch +++ b/patches/unapplied/server/0353-Fix-item-duplication-and-teleport-issues.patch @@ -16,7 +16,7 @@ So even if something NEW comes up, it would be impossible to drop the same item twice because the source was destroyed. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b93185f50bd87d070ef08b9c6a714a065dd714d8..996ca6762fe45ee1c2fa2392ed6a050be9df5ac6 100644 +index 33329cb73324ea3e005d59ee3f9ea1225ada7055..fcdfe37d2135190e44527190976a718b2f9359c5 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2446,11 +2446,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -80,7 +80,7 @@ index b93185f50bd87d070ef08b9c6a714a065dd714d8..996ca6762fe45ee1c2fa2392ed6a050b public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index bff839920bdac3e5d31fe411bda6ec6cbfc1303a..26affae253104122531ebac4358412c992db3a76 100644 +index accb574f961114f225596a633b36a91e3009ed87..a4d5e0ffbdade4e1b15d30de6e60feddda697c24 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1734,9 +1734,9 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -135,7 +135,7 @@ index 029d5756f424dba57b4a974b09453c2f0cf0e8e2..e1f6853c450a2e6a0d7607f1faec7bc5 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 74fc73549b504eb2b7fcaa141aa125f84a077ed9..ac4a8c9d4f727f3caa16f6dc5497d69f9db52aab 100644 +index c0f0627d3c303e625be584c6eba5865f5622490f..18d1e2ff18cae10ec6f1b7adf480bd6bfe738584 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -894,6 +894,11 @@ public class CraftEventFactory { diff --git a/patches/server/0354-Villager-Restocks-API.patch b/patches/unapplied/server/0354-Villager-Restocks-API.patch similarity index 100% rename from patches/server/0354-Villager-Restocks-API.patch rename to patches/unapplied/server/0354-Villager-Restocks-API.patch diff --git a/patches/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch b/patches/unapplied/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch similarity index 100% rename from patches/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch rename to patches/unapplied/server/0355-Validate-PickItem-Packet-and-kick-for-invalid.patch diff --git a/patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch b/patches/unapplied/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch similarity index 93% rename from patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch rename to patches/unapplied/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch index 44bd324f68..20c245bbb4 100644 --- a/patches/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch +++ b/patches/unapplied/server/0356-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch @@ -17,7 +17,7 @@ keeping long lived large direct buffers in cache. Set system properly at server startup if not set already to help protect from this. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index f3bce016e729d553aaa6185470bbf4317f94352b..02243b69cca7255588b43dab57e1c9ca4c3ca87f 100644 +index 6048e80241246cabf0390e11d217cd8c291d31b6..8316e0703b6c1ad81d6745f29eb697017e84c65a 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -27,6 +27,7 @@ public class Main { diff --git a/patches/server/0357-misc-debugging-dumps.patch b/patches/unapplied/server/0357-misc-debugging-dumps.patch similarity index 100% rename from patches/server/0357-misc-debugging-dumps.patch rename to patches/unapplied/server/0357-misc-debugging-dumps.patch diff --git a/patches/server/0358-Prevent-teleporting-dead-entities.patch b/patches/unapplied/server/0358-Prevent-teleporting-dead-entities.patch similarity index 100% rename from patches/server/0358-Prevent-teleporting-dead-entities.patch rename to patches/unapplied/server/0358-Prevent-teleporting-dead-entities.patch diff --git a/patches/server/0359-Implement-Mob-Goal-API.patch b/patches/unapplied/server/0359-Implement-Mob-Goal-API.patch similarity index 100% rename from patches/server/0359-Implement-Mob-Goal-API.patch rename to patches/unapplied/server/0359-Implement-Mob-Goal-API.patch diff --git a/patches/server/0360-Add-villager-reputation-API.patch b/patches/unapplied/server/0360-Add-villager-reputation-API.patch similarity index 100% rename from patches/server/0360-Add-villager-reputation-API.patch rename to patches/unapplied/server/0360-Add-villager-reputation-API.patch diff --git a/patches/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch b/patches/unapplied/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch similarity index 98% rename from patches/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch rename to patches/unapplied/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch index 70fb78d164..265e653227 100644 --- a/patches/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch +++ b/patches/unapplied/server/0361-ExperienceOrb-merging-stacking-API-and-fixes.patch @@ -77,7 +77,7 @@ index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c3670 public java.util.UUID getTriggerEntityId() { return getHandle().triggerEntityId; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ac4a8c9d4f727f3caa16f6dc5497d69f9db52aab..53f5eb1682c88abf7b09e16f010ebbd8fe2ac059 100644 +index 18d1e2ff18cae10ec6f1b7adf480bd6bfe738584..943c452e1d3d1273a2ef304aa2a52f328dfb5d37 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -703,15 +703,29 @@ public class CraftEventFactory { diff --git a/patches/server/0362-Fix-PotionEffect-ignores-icon-flag.patch b/patches/unapplied/server/0362-Fix-PotionEffect-ignores-icon-flag.patch similarity index 100% rename from patches/server/0362-Fix-PotionEffect-ignores-icon-flag.patch rename to patches/unapplied/server/0362-Fix-PotionEffect-ignores-icon-flag.patch diff --git a/patches/server/0363-Potential-bed-API.patch b/patches/unapplied/server/0363-Potential-bed-API.patch similarity index 100% rename from patches/server/0363-Potential-bed-API.patch rename to patches/unapplied/server/0363-Potential-bed-API.patch diff --git a/patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch b/patches/unapplied/server/0364-Wait-for-Async-Tasks-during-shutdown.patch similarity index 100% rename from patches/server/0364-Wait-for-Async-Tasks-during-shutdown.patch rename to patches/unapplied/server/0364-Wait-for-Async-Tasks-during-shutdown.patch diff --git a/patches/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch b/patches/unapplied/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch similarity index 100% rename from patches/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch rename to patches/unapplied/server/0365-Ensure-EntityRaider-respects-game-and-entity-rules-f.patch diff --git a/patches/server/0366-Ensure-safe-gateway-teleport.patch b/patches/unapplied/server/0366-Ensure-safe-gateway-teleport.patch similarity index 100% rename from patches/server/0366-Ensure-safe-gateway-teleport.patch rename to patches/unapplied/server/0366-Ensure-safe-gateway-teleport.patch diff --git a/patches/server/0367-Add-option-for-console-having-all-permissions.patch b/patches/unapplied/server/0367-Add-option-for-console-having-all-permissions.patch similarity index 100% rename from patches/server/0367-Add-option-for-console-having-all-permissions.patch rename to patches/unapplied/server/0367-Add-option-for-console-having-all-permissions.patch diff --git a/patches/server/0368-Fix-villager-trading-demand-MC-163962.patch b/patches/unapplied/server/0368-Fix-villager-trading-demand-MC-163962.patch similarity index 100% rename from patches/server/0368-Fix-villager-trading-demand-MC-163962.patch rename to patches/unapplied/server/0368-Fix-villager-trading-demand-MC-163962.patch diff --git a/patches/server/0369-Maps-shouldn-t-load-chunks.patch b/patches/unapplied/server/0369-Maps-shouldn-t-load-chunks.patch similarity index 100% rename from patches/server/0369-Maps-shouldn-t-load-chunks.patch rename to patches/unapplied/server/0369-Maps-shouldn-t-load-chunks.patch diff --git a/patches/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch b/patches/unapplied/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch similarity index 100% rename from patches/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch rename to patches/unapplied/server/0370-Use-seed-based-lookup-for-Treasure-Maps-Fixes-lag-fr.patch diff --git a/patches/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch b/patches/unapplied/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch similarity index 100% rename from patches/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch rename to patches/unapplied/server/0371-Fix-CraftScheduler-runTaskTimerAsynchronously-Plugin.patch diff --git a/patches/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch b/patches/unapplied/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch similarity index 100% rename from patches/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch rename to patches/unapplied/server/0372-Fix-piston-physics-inconsistency-MC-188840.patch diff --git a/patches/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/unapplied/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch similarity index 100% rename from patches/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch rename to patches/unapplied/server/0373-Fix-missing-chunks-due-to-integer-overflow.patch diff --git a/patches/server/0374-Prevent-position-desync-causing-tp-exploit.patch b/patches/unapplied/server/0374-Prevent-position-desync-causing-tp-exploit.patch similarity index 100% rename from patches/server/0374-Prevent-position-desync-causing-tp-exploit.patch rename to patches/unapplied/server/0374-Prevent-position-desync-causing-tp-exploit.patch diff --git a/patches/server/0375-Inventory-getHolder-method-without-block-snapshot.patch b/patches/unapplied/server/0375-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/server/0375-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/unapplied/server/0375-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/server/0376-Add-PlayerRecipeBookClickEvent.patch b/patches/unapplied/server/0376-Add-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/server/0376-Add-PlayerRecipeBookClickEvent.patch rename to patches/unapplied/server/0376-Add-PlayerRecipeBookClickEvent.patch diff --git a/patches/server/0377-Hide-sync-chunk-writes-behind-flag.patch b/patches/unapplied/server/0377-Hide-sync-chunk-writes-behind-flag.patch similarity index 100% rename from patches/server/0377-Hide-sync-chunk-writes-behind-flag.patch rename to patches/unapplied/server/0377-Hide-sync-chunk-writes-behind-flag.patch diff --git a/patches/server/0378-Add-permission-for-command-blocks.patch b/patches/unapplied/server/0378-Add-permission-for-command-blocks.patch similarity index 100% rename from patches/server/0378-Add-permission-for-command-blocks.patch rename to patches/unapplied/server/0378-Add-permission-for-command-blocks.patch diff --git a/patches/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch b/patches/unapplied/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch similarity index 97% rename from patches/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch rename to patches/unapplied/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch index 84279fedca..c71aa67e6a 100644 --- a/patches/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch +++ b/patches/unapplied/server/0379-Ensure-Entity-position-and-AABB-are-never-invalid.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Entity position and AABB are never invalid Co-authored-by: Spottedleaf diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 996ca6762fe45ee1c2fa2392ed6a050be9df5ac6..184d8bdca8aa06b6a1f00bab03e8c2688a391663 100644 +index fcdfe37d2135190e44527190976a718b2f9359c5..084824335dc4c83d331cac2da8fdd5604d650b5d 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -664,8 +664,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch b/patches/unapplied/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch similarity index 98% rename from patches/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch rename to patches/unapplied/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch index c848c30dab..c5602f9f90 100644 --- a/patches/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch +++ b/patches/unapplied/server/0380-Fix-Per-World-Difficulty-Remembering-Difficulty.patch @@ -63,7 +63,7 @@ index 997a96a21440ae72696d68f8031ece4ba487d3ef..3d8584929cee000ae7df10c5bd94f358 return Component.translatable("commands.difficulty.success", difficulty.getDisplayName()); }, true); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 3d33504eac6af17c8833de11226968d52f96232f..4d7c2832a9cd9a88b99c837a02df7fa91e572658 100644 +index 539a8ddfcf660bf824325516c88cf91f4a32a746..1bc8217cf1df95edadd57e18a91885808d31cb93 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -346,7 +346,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0381-Paper-dumpitem-command.patch b/patches/unapplied/server/0381-Paper-dumpitem-command.patch similarity index 98% rename from patches/server/0381-Paper-dumpitem-command.patch rename to patches/unapplied/server/0381-Paper-dumpitem-command.patch index a752f44867..cb79e9ddfd 100644 --- a/patches/server/0381-Paper-dumpitem-command.patch +++ b/patches/unapplied/server/0381-Paper-dumpitem-command.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Paper dumpitem command Let's you quickly view the item in your hands NBT data diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java -index 69d093d3450931038ac3d27d7874060d13dc2225..27775df10a490ff75ca377e8373931738f1b817c 100644 +index 3010d57efcc97fb409bfe43b1fc9af198c099a67..cdad0fd5257ae842f83b9c1c98b4565b468d4f54 100644 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java @@ -39,6 +39,7 @@ public final class PaperCommand extends Command { diff --git a/patches/server/0382-Improve-Legacy-Component-serialization-size.patch b/patches/unapplied/server/0382-Improve-Legacy-Component-serialization-size.patch similarity index 100% rename from patches/server/0382-Improve-Legacy-Component-serialization-size.patch rename to patches/unapplied/server/0382-Improve-Legacy-Component-serialization-size.patch diff --git a/patches/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch b/patches/unapplied/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch similarity index 100% rename from patches/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch rename to patches/unapplied/server/0383-Add-Plugin-Tickets-to-API-Chunk-Methods.patch diff --git a/patches/server/0384-Add-BlockStateMeta-clearBlockState.patch b/patches/unapplied/server/0384-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/server/0384-Add-BlockStateMeta-clearBlockState.patch rename to patches/unapplied/server/0384-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/server/0385-Convert-legacy-attributes-in-Item-Meta.patch b/patches/unapplied/server/0385-Convert-legacy-attributes-in-Item-Meta.patch similarity index 100% rename from patches/server/0385-Convert-legacy-attributes-in-Item-Meta.patch rename to patches/unapplied/server/0385-Convert-legacy-attributes-in-Item-Meta.patch diff --git a/patches/server/0386-Do-not-accept-invalid-client-settings.patch b/patches/unapplied/server/0386-Do-not-accept-invalid-client-settings.patch similarity index 100% rename from patches/server/0386-Do-not-accept-invalid-client-settings.patch rename to patches/unapplied/server/0386-Do-not-accept-invalid-client-settings.patch diff --git a/patches/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch b/patches/unapplied/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch similarity index 100% rename from patches/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch rename to patches/unapplied/server/0387-Improve-fix-EntityTargetLivingEntityEvent.patch diff --git a/patches/server/0388-Add-entity-liquid-API.patch b/patches/unapplied/server/0388-Add-entity-liquid-API.patch similarity index 100% rename from patches/server/0388-Add-entity-liquid-API.patch rename to patches/unapplied/server/0388-Add-entity-liquid-API.patch diff --git a/patches/server/0389-Add-PrepareResultEvent.patch b/patches/unapplied/server/0389-Add-PrepareResultEvent.patch similarity index 99% rename from patches/server/0389-Add-PrepareResultEvent.patch rename to patches/unapplied/server/0389-Add-PrepareResultEvent.patch index e4a700c653..d23bf3868b 100644 --- a/patches/server/0389-Add-PrepareResultEvent.patch +++ b/patches/unapplied/server/0389-Add-PrepareResultEvent.patch @@ -94,7 +94,7 @@ index 9c2fe69ced7a46bbd8b0fbe10fa67d0a39b0f375..e40d9dbdbe5359c38af6d764d01c9be4 private void setupRecipeList(Container input, ItemStack stack) { diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 54aa1a462bf4d9649f34d79aab1f59e14b7962a5..c3c7cfc33d07b87e034fb050b0a1ca1d8b971aa6 100644 +index 943c452e1d3d1273a2ef304aa2a52f328dfb5d37..2006573ca4bed3c3ed02bf2f38cdd248e6b123c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1650,6 +1650,12 @@ public class CraftEventFactory { diff --git a/patches/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/unapplied/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch similarity index 100% rename from patches/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch rename to patches/unapplied/server/0390-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch diff --git a/patches/server/0391-Fix-arrows-never-despawning-MC-125757.patch b/patches/unapplied/server/0391-Fix-arrows-never-despawning-MC-125757.patch similarity index 91% rename from patches/server/0391-Fix-arrows-never-despawning-MC-125757.patch rename to patches/unapplied/server/0391-Fix-arrows-never-despawning-MC-125757.patch index a08ff237f0..d5c0c8aec4 100644 --- a/patches/server/0391-Fix-arrows-never-despawning-MC-125757.patch +++ b/patches/unapplied/server/0391-Fix-arrows-never-despawning-MC-125757.patch @@ -9,7 +9,7 @@ instead of getting stuck in a never despawn state (bubble columns, etc). diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 464ba41fd284e29374dbc81c984cf9486e51393e..047629405dc67e3bcb5e4b3d5afa0e821f8fde44 100644 +index ccb5de967a83c01b69161af0c1c922fc31c7a0d9..49dc01532f9b60b3f594abca56b7d807fe6716d5 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -214,6 +214,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch b/patches/unapplied/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch similarity index 100% rename from patches/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch rename to patches/unapplied/server/0392-Thread-Safe-Vanilla-Command-permission-checking.patch diff --git a/patches/server/0393-Fix-SPIGOT-5989.patch b/patches/unapplied/server/0393-Fix-SPIGOT-5989.patch similarity index 100% rename from patches/server/0393-Fix-SPIGOT-5989.patch rename to patches/unapplied/server/0393-Fix-SPIGOT-5989.patch diff --git a/patches/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch b/patches/unapplied/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch similarity index 100% rename from patches/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch rename to patches/unapplied/server/0394-Fix-SPIGOT-5824-Bukkit-world-container-is-not-used.patch diff --git a/patches/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch b/patches/unapplied/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch similarity index 100% rename from patches/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch rename to patches/unapplied/server/0395-Fix-SPIGOT-5885-Unable-to-disable-advancements.patch diff --git a/patches/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch b/patches/unapplied/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch similarity index 100% rename from patches/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch rename to patches/unapplied/server/0396-Fix-AdvancementDataPlayer-leak-due-from-quitting-ear.patch diff --git a/patches/server/0397-Optimize-NetworkManager-Exception-Handling.patch b/patches/unapplied/server/0397-Optimize-NetworkManager-Exception-Handling.patch similarity index 100% rename from patches/server/0397-Optimize-NetworkManager-Exception-Handling.patch rename to patches/unapplied/server/0397-Optimize-NetworkManager-Exception-Handling.patch diff --git a/patches/server/0398-Fix-some-rails-connecting-improperly.patch b/patches/unapplied/server/0398-Fix-some-rails-connecting-improperly.patch similarity index 100% rename from patches/server/0398-Fix-some-rails-connecting-improperly.patch rename to patches/unapplied/server/0398-Fix-some-rails-connecting-improperly.patch diff --git a/patches/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch b/patches/unapplied/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch similarity index 100% rename from patches/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch rename to patches/unapplied/server/0399-Fix-regex-mistake-in-CB-NBT-int-deserialization.patch diff --git a/patches/server/0400-Brand-support.patch b/patches/unapplied/server/0400-Brand-support.patch similarity index 100% rename from patches/server/0400-Brand-support.patch rename to patches/unapplied/server/0400-Brand-support.patch diff --git a/patches/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/unapplied/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/unapplied/server/0401-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/server/0402-Don-t-require-FACING-data.patch b/patches/unapplied/server/0402-Don-t-require-FACING-data.patch similarity index 100% rename from patches/server/0402-Don-t-require-FACING-data.patch rename to patches/unapplied/server/0402-Don-t-require-FACING-data.patch diff --git a/patches/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch b/patches/unapplied/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch similarity index 96% rename from patches/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch rename to patches/unapplied/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch index 47d790e9ed..4bec5c2cbd 100644 --- a/patches/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch +++ b/patches/unapplied/server/0403-Fix-SpawnChangeEvent-not-firing-for-all-use-cases.patch @@ -19,7 +19,7 @@ index df623f10def1ecf071971119f449a773063b3ce1..f079192644e3b366dc58c4a77c10cbbe } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 630b3e9a9a89016846dba1b18ff68c11f1815685..2436d66fb3be1611885bf05b793975dc2aa1a2e8 100644 +index 8db6209b22c838d01b0b8032ad0608713cc8a54c..a493c8d12935336bb3049aa6d00eb1a4f2194c25 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -269,12 +269,14 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0404-Add-moon-phase-API.patch b/patches/unapplied/server/0404-Add-moon-phase-API.patch similarity index 100% rename from patches/server/0404-Add-moon-phase-API.patch rename to patches/unapplied/server/0404-Add-moon-phase-API.patch diff --git a/patches/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch b/patches/unapplied/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch similarity index 100% rename from patches/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch rename to patches/unapplied/server/0405-Do-not-let-the-server-load-chunks-from-newer-version.patch diff --git a/patches/server/0406-Prevent-headless-pistons-from-being-created.patch b/patches/unapplied/server/0406-Prevent-headless-pistons-from-being-created.patch similarity index 95% rename from patches/server/0406-Prevent-headless-pistons-from-being-created.patch rename to patches/unapplied/server/0406-Prevent-headless-pistons-from-being-created.patch index 67afd12454..9e9737ddde 100644 --- a/patches/server/0406-Prevent-headless-pistons-from-being-created.patch +++ b/patches/unapplied/server/0406-Prevent-headless-pistons-from-being-created.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent headless pistons from being created Prevent headless pistons from being created by explosions or tree/mushroom growth. diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index f7cb61c85074fc0f79b0b11dcb11e96b93548554..7227345914c9e4288faa227be568d974b3cfcf45 100644 +index 03c25fec51562f652a8060cde4aabfe9e8bbcfe0..4107756fb31e4ad99f643184118d877aef09e9f4 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -206,6 +206,15 @@ public class Explosion { diff --git a/patches/server/0407-Add-BellRingEvent.patch b/patches/unapplied/server/0407-Add-BellRingEvent.patch similarity index 93% rename from patches/server/0407-Add-BellRingEvent.patch rename to patches/unapplied/server/0407-Add-BellRingEvent.patch index e1fd6ce23f..fd9371e9d1 100644 --- a/patches/server/0407-Add-BellRingEvent.patch +++ b/patches/unapplied/server/0407-Add-BellRingEvent.patch @@ -7,7 +7,7 @@ Add a new event, BellRingEvent, to trigger whenever a player rings a village bell. Passes along the bell block and the player who rang it. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c3c7cfc33d07b87e034fb050b0a1ca1d8b971aa6..c6408feaff6a5bd8529004e6c2e1aa76ddc8c861 100644 +index 2006573ca4bed3c3ed02bf2f38cdd248e6b123c9..50f0ea8f6892b8a3323fb5ebf5731b8245d7788a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -367,10 +367,11 @@ public class CraftEventFactory { diff --git a/patches/server/0408-Add-zombie-targets-turtle-egg-config.patch b/patches/unapplied/server/0408-Add-zombie-targets-turtle-egg-config.patch similarity index 100% rename from patches/server/0408-Add-zombie-targets-turtle-egg-config.patch rename to patches/unapplied/server/0408-Add-zombie-targets-turtle-egg-config.patch diff --git a/patches/server/0409-Buffer-joins-to-world.patch b/patches/unapplied/server/0409-Buffer-joins-to-world.patch similarity index 100% rename from patches/server/0409-Buffer-joins-to-world.patch rename to patches/unapplied/server/0409-Buffer-joins-to-world.patch diff --git a/patches/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch b/patches/unapplied/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch similarity index 100% rename from patches/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch rename to patches/unapplied/server/0410-Fix-hex-colors-not-working-in-some-kick-messages.patch diff --git a/patches/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch b/patches/unapplied/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 98% rename from patches/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch rename to patches/unapplied/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch index f4c4bfc8bb..8ba6264b62 100644 --- a/patches/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch +++ b/patches/unapplied/server/0411-PortalCreateEvent-needs-to-know-its-entity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PortalCreateEvent needs to know its entity diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 91f342912372326a6ced16c23550da7727d6d3ad..b4cb9ff5553995dddfb99b6b3ac1250b92a65d9d 100644 +index b5f1d223a3955e1b478712c581080904f86a2a2a..e5fbb6dac3b1869797f2141e82993374a9f18e94 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -501,7 +501,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0412-Add-more-Evoker-API.patch b/patches/unapplied/server/0412-Add-more-Evoker-API.patch similarity index 100% rename from patches/server/0412-Add-more-Evoker-API.patch rename to patches/unapplied/server/0412-Add-more-Evoker-API.patch diff --git a/patches/server/0413-Add-methods-to-get-translation-keys.patch b/patches/unapplied/server/0413-Add-methods-to-get-translation-keys.patch similarity index 100% rename from patches/server/0413-Add-methods-to-get-translation-keys.patch rename to patches/unapplied/server/0413-Add-methods-to-get-translation-keys.patch diff --git a/patches/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/unapplied/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/unapplied/server/0414-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/server/0415-Cache-block-data-strings.patch b/patches/unapplied/server/0415-Cache-block-data-strings.patch similarity index 97% rename from patches/server/0415-Cache-block-data-strings.patch rename to patches/unapplied/server/0415-Cache-block-data-strings.patch index aa5d5797be..dcbb1a9127 100644 --- a/patches/server/0415-Cache-block-data-strings.patch +++ b/patches/unapplied/server/0415-Cache-block-data-strings.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache block data strings diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a7de512a019a51d3133d4304b9ef80a6b6b6b80d..c2182db2233d765713089367804bf542d11af73c 100644 +index f5a2645afc64f3ba9ee21e6442697d6eb2fabb13..8e88345ad3514380cd88e38e81d6359324afd569 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2125,6 +2125,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop Co-authored-by: TotalledZebra diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java -index 55e85267c7cbd8be5d2da212e33c43fb353f2e12..c72d6bccf7d72d08d388c65936a89c92261c7860 100644 +index 3f8cca8027051694cb0440373e75f418f73edf87..06455d65c4605ce092bf5300d432087f24186741 100644 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java @@ -165,7 +165,7 @@ public class MobGoalHelper { diff --git a/patches/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/unapplied/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch similarity index 100% rename from patches/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch rename to patches/unapplied/server/0570-Ensure-disconnect-for-book-edit-is-called-on-main.patch diff --git a/patches/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/unapplied/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch similarity index 100% rename from patches/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch rename to patches/unapplied/server/0571-Fix-return-value-of-Block-applyBoneMeal-always-being.patch diff --git a/patches/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/unapplied/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch similarity index 100% rename from patches/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch rename to patches/unapplied/server/0572-Use-getChunkIfLoadedImmediately-in-places.patch diff --git a/patches/server/0573-Fix-commands-from-signs-not-firing-command-events.patch b/patches/unapplied/server/0573-Fix-commands-from-signs-not-firing-command-events.patch similarity index 100% rename from patches/server/0573-Fix-commands-from-signs-not-firing-command-events.patch rename to patches/unapplied/server/0573-Fix-commands-from-signs-not-firing-command-events.patch diff --git a/patches/server/0574-Add-PlayerArmSwingEvent.patch b/patches/unapplied/server/0574-Add-PlayerArmSwingEvent.patch similarity index 100% rename from patches/server/0574-Add-PlayerArmSwingEvent.patch rename to patches/unapplied/server/0574-Add-PlayerArmSwingEvent.patch diff --git a/patches/server/0575-Fix-kick-event-leave-message-not-being-sent.patch b/patches/unapplied/server/0575-Fix-kick-event-leave-message-not-being-sent.patch similarity index 100% rename from patches/server/0575-Fix-kick-event-leave-message-not-being-sent.patch rename to patches/unapplied/server/0575-Fix-kick-event-leave-message-not-being-sent.patch diff --git a/patches/server/0576-Don-t-apply-cramming-damage-to-players.patch b/patches/unapplied/server/0576-Don-t-apply-cramming-damage-to-players.patch similarity index 100% rename from patches/server/0576-Don-t-apply-cramming-damage-to-players.patch rename to patches/unapplied/server/0576-Don-t-apply-cramming-damage-to-players.patch diff --git a/patches/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/unapplied/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch similarity index 100% rename from patches/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch rename to patches/unapplied/server/0577-Rate-options-and-timings-for-sensors-and-behaviors.patch diff --git a/patches/server/0578-Add-missing-forceDrop-toggles.patch b/patches/unapplied/server/0578-Add-missing-forceDrop-toggles.patch similarity index 100% rename from patches/server/0578-Add-missing-forceDrop-toggles.patch rename to patches/unapplied/server/0578-Add-missing-forceDrop-toggles.patch diff --git a/patches/server/0579-Stinger-API.patch b/patches/unapplied/server/0579-Stinger-API.patch similarity index 100% rename from patches/server/0579-Stinger-API.patch rename to patches/unapplied/server/0579-Stinger-API.patch diff --git a/patches/server/0580-Add-System.out-err-catcher.patch b/patches/unapplied/server/0580-Add-System.out-err-catcher.patch similarity index 100% rename from patches/server/0580-Add-System.out-err-catcher.patch rename to patches/unapplied/server/0580-Add-System.out-err-catcher.patch diff --git a/patches/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/unapplied/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch similarity index 100% rename from patches/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch rename to patches/unapplied/server/0581-Prevent-AFK-kick-while-watching-end-credits.patch diff --git a/patches/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/unapplied/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch similarity index 100% rename from patches/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch rename to patches/unapplied/server/0582-Allow-skipping-writing-of-comments-to-server.propert.patch diff --git a/patches/server/0583-Add-PlayerSetSpawnEvent.patch b/patches/unapplied/server/0583-Add-PlayerSetSpawnEvent.patch similarity index 99% rename from patches/server/0583-Add-PlayerSetSpawnEvent.patch rename to patches/unapplied/server/0583-Add-PlayerSetSpawnEvent.patch index 6ffc931866..28d5ca16f6 100644 --- a/patches/server/0583-Add-PlayerSetSpawnEvent.patch +++ b/patches/unapplied/server/0583-Add-PlayerSetSpawnEvent.patch @@ -187,7 +187,7 @@ index ba22ad1e4253477572d10d71db6db0ebc14d6755..94d067e9eeee73183de25165d8c97043 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 6c759f6860c7eccb634c1c0cda6d8e24196023d1..bb75c965266fefa58919823e5fcc9f56f11b04d0 100644 +index eee0c49bbf9bc768fcf7275c29536b4f16b1d421..634da85870b31a9fc09d53f5670239e18bcb3d47 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1399,9 +1399,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/unapplied/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch similarity index 100% rename from patches/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch rename to patches/unapplied/server/0584-Make-hoppers-respect-inventory-max-stack-size.patch diff --git a/patches/server/0585-Optimize-entity-tracker-passenger-checks.patch b/patches/unapplied/server/0585-Optimize-entity-tracker-passenger-checks.patch similarity index 100% rename from patches/server/0585-Optimize-entity-tracker-passenger-checks.patch rename to patches/unapplied/server/0585-Optimize-entity-tracker-passenger-checks.patch diff --git a/patches/server/0586-Config-option-for-Piglins-guarding-chests.patch b/patches/unapplied/server/0586-Config-option-for-Piglins-guarding-chests.patch similarity index 100% rename from patches/server/0586-Config-option-for-Piglins-guarding-chests.patch rename to patches/unapplied/server/0586-Config-option-for-Piglins-guarding-chests.patch diff --git a/patches/server/0587-Add-EntityDamageItemEvent.patch b/patches/unapplied/server/0587-Add-EntityDamageItemEvent.patch similarity index 97% rename from patches/server/0587-Add-EntityDamageItemEvent.patch rename to patches/unapplied/server/0587-Add-EntityDamageItemEvent.patch index e78be10457..dab8825098 100644 --- a/patches/server/0587-Add-EntityDamageItemEvent.patch +++ b/patches/unapplied/server/0587-Add-EntityDamageItemEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add EntityDamageItemEvent diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index b4cb9ff5553995dddfb99b6b3ac1250b92a65d9d..2947a43a1d9e49273ed0242691273e50c657cd05 100644 +index e5fbb6dac3b1869797f2141e82993374a9f18e94..1b062edcc04af4c500f38c1664b5cee25e265f3c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -647,7 +647,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0588-Optimize-indirect-passenger-iteration.patch b/patches/unapplied/server/0588-Optimize-indirect-passenger-iteration.patch similarity index 96% rename from patches/server/0588-Optimize-indirect-passenger-iteration.patch rename to patches/unapplied/server/0588-Optimize-indirect-passenger-iteration.patch index d00a5c0cf2..a535497d73 100644 --- a/patches/server/0588-Optimize-indirect-passenger-iteration.patch +++ b/patches/unapplied/server/0588-Optimize-indirect-passenger-iteration.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Optimize indirect passenger iteration diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 318d0f557d50b74c44b2fd1ac84e12bf30e75c24..325d8551d4f6c1d24525fab607769a75320cf436 100644 +index b4670fc653721283f95bb61ac57c306b224b7fb7..56de24f923571aff124ae64b737cbdf482d4b847 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3875,20 +3875,34 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0589-Configurable-item-frame-map-cursor-update-interval.patch b/patches/unapplied/server/0589-Configurable-item-frame-map-cursor-update-interval.patch similarity index 100% rename from patches/server/0589-Configurable-item-frame-map-cursor-update-interval.patch rename to patches/unapplied/server/0589-Configurable-item-frame-map-cursor-update-interval.patch diff --git a/patches/server/0590-Clear-bucket-NBT-after-dispense.patch b/patches/unapplied/server/0590-Clear-bucket-NBT-after-dispense.patch similarity index 100% rename from patches/server/0590-Clear-bucket-NBT-after-dispense.patch rename to patches/unapplied/server/0590-Clear-bucket-NBT-after-dispense.patch diff --git a/patches/server/0591-Change-EnderEye-target-without-changing-other-things.patch b/patches/unapplied/server/0591-Change-EnderEye-target-without-changing-other-things.patch similarity index 100% rename from patches/server/0591-Change-EnderEye-target-without-changing-other-things.patch rename to patches/unapplied/server/0591-Change-EnderEye-target-without-changing-other-things.patch diff --git a/patches/server/0592-Add-BlockBreakBlockEvent.patch b/patches/unapplied/server/0592-Add-BlockBreakBlockEvent.patch similarity index 100% rename from patches/server/0592-Add-BlockBreakBlockEvent.patch rename to patches/unapplied/server/0592-Add-BlockBreakBlockEvent.patch diff --git a/patches/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/unapplied/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch similarity index 100% rename from patches/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch rename to patches/unapplied/server/0593-Option-to-prevent-data-components-copy-in-smithing-r.patch diff --git a/patches/server/0594-More-CommandBlock-API.patch b/patches/unapplied/server/0594-More-CommandBlock-API.patch similarity index 100% rename from patches/server/0594-More-CommandBlock-API.patch rename to patches/unapplied/server/0594-More-CommandBlock-API.patch diff --git a/patches/server/0595-Add-missing-team-sidebar-display-slots.patch b/patches/unapplied/server/0595-Add-missing-team-sidebar-display-slots.patch similarity index 100% rename from patches/server/0595-Add-missing-team-sidebar-display-slots.patch rename to patches/unapplied/server/0595-Add-missing-team-sidebar-display-slots.patch diff --git a/patches/server/0596-Add-back-EntityPortalExitEvent.patch b/patches/unapplied/server/0596-Add-back-EntityPortalExitEvent.patch similarity index 97% rename from patches/server/0596-Add-back-EntityPortalExitEvent.patch rename to patches/unapplied/server/0596-Add-back-EntityPortalExitEvent.patch index 5a83bce11c..7b49353853 100644 --- a/patches/server/0596-Add-back-EntityPortalExitEvent.patch +++ b/patches/unapplied/server/0596-Add-back-EntityPortalExitEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 325d8551d4f6c1d24525fab607769a75320cf436..2d98bdae7e8686d8a15e8938a16d8d63f0575bef 100644 +index 56de24f923571aff124ae64b737cbdf482d4b847..5d4fa3823a6dbb6150e4b97cf3973eb254018e38 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3312,6 +3312,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/unapplied/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch similarity index 100% rename from patches/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch rename to patches/unapplied/server/0597-Add-methods-to-find-targets-for-lightning-strikes.patch diff --git a/patches/server/0598-Get-entity-default-attributes.patch b/patches/unapplied/server/0598-Get-entity-default-attributes.patch similarity index 100% rename from patches/server/0598-Get-entity-default-attributes.patch rename to patches/unapplied/server/0598-Get-entity-default-attributes.patch diff --git a/patches/server/0599-Left-handed-API.patch b/patches/unapplied/server/0599-Left-handed-API.patch similarity index 100% rename from patches/server/0599-Left-handed-API.patch rename to patches/unapplied/server/0599-Left-handed-API.patch diff --git a/patches/server/0600-Add-more-advancement-API.patch b/patches/unapplied/server/0600-Add-more-advancement-API.patch similarity index 100% rename from patches/server/0600-Add-more-advancement-API.patch rename to patches/unapplied/server/0600-Add-more-advancement-API.patch diff --git a/patches/server/0601-Add-ItemFactory-getSpawnEgg-API.patch b/patches/unapplied/server/0601-Add-ItemFactory-getSpawnEgg-API.patch similarity index 100% rename from patches/server/0601-Add-ItemFactory-getSpawnEgg-API.patch rename to patches/unapplied/server/0601-Add-ItemFactory-getSpawnEgg-API.patch diff --git a/patches/server/0602-Add-critical-damage-API.patch b/patches/unapplied/server/0602-Add-critical-damage-API.patch similarity index 100% rename from patches/server/0602-Add-critical-damage-API.patch rename to patches/unapplied/server/0602-Add-critical-damage-API.patch diff --git a/patches/server/0603-Fix-issues-with-mob-conversion.patch b/patches/unapplied/server/0603-Fix-issues-with-mob-conversion.patch similarity index 100% rename from patches/server/0603-Fix-issues-with-mob-conversion.patch rename to patches/unapplied/server/0603-Fix-issues-with-mob-conversion.patch diff --git a/patches/server/0604-Add-hasCollision-methods-to-various-places.patch b/patches/unapplied/server/0604-Add-hasCollision-methods-to-various-places.patch similarity index 100% rename from patches/server/0604-Add-hasCollision-methods-to-various-places.patch rename to patches/unapplied/server/0604-Add-hasCollision-methods-to-various-places.patch diff --git a/patches/server/0605-Goat-ram-API.patch b/patches/unapplied/server/0605-Goat-ram-API.patch similarity index 100% rename from patches/server/0605-Goat-ram-API.patch rename to patches/unapplied/server/0605-Goat-ram-API.patch diff --git a/patches/server/0606-Add-API-for-resetting-a-single-score.patch b/patches/unapplied/server/0606-Add-API-for-resetting-a-single-score.patch similarity index 100% rename from patches/server/0606-Add-API-for-resetting-a-single-score.patch rename to patches/unapplied/server/0606-Add-API-for-resetting-a-single-score.patch diff --git a/patches/server/0607-Add-Raw-Byte-Entity-Serialization.patch b/patches/unapplied/server/0607-Add-Raw-Byte-Entity-Serialization.patch similarity index 100% rename from patches/server/0607-Add-Raw-Byte-Entity-Serialization.patch rename to patches/unapplied/server/0607-Add-Raw-Byte-Entity-Serialization.patch diff --git a/patches/server/0608-Vanilla-command-permission-fixes.patch b/patches/unapplied/server/0608-Vanilla-command-permission-fixes.patch similarity index 100% rename from patches/server/0608-Vanilla-command-permission-fixes.patch rename to patches/unapplied/server/0608-Vanilla-command-permission-fixes.patch diff --git a/patches/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/unapplied/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch similarity index 97% rename from patches/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch rename to patches/unapplied/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch index fd96ed9d70..b13869e417 100644 --- a/patches/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch +++ b/patches/unapplied/server/0609-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch @@ -51,7 +51,7 @@ index b90b525faa5bba684c783a56f136532a8195de84..5a13975fc9a472308ee74401f7b1f84f @Override public void doCloseContainer() { diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index f18e370399fb36040cec64dd7bee4915e3cb56d7..461129261d93ca9831f347c9612c6f38cbbd8ac9 100644 +index 07afb966626d86b065e138959e9ffcac27a0d5d2..9f3d1a5407635d740adb6722930c94781a021015 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -509,6 +509,11 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0610-Fix-GameProfileCache-concurrency.patch b/patches/unapplied/server/0610-Fix-GameProfileCache-concurrency.patch similarity index 100% rename from patches/server/0610-Fix-GameProfileCache-concurrency.patch rename to patches/unapplied/server/0610-Fix-GameProfileCache-concurrency.patch diff --git a/patches/server/0611-Improve-and-expand-AsyncCatcher.patch b/patches/unapplied/server/0611-Improve-and-expand-AsyncCatcher.patch similarity index 100% rename from patches/server/0611-Improve-and-expand-AsyncCatcher.patch rename to patches/unapplied/server/0611-Improve-and-expand-AsyncCatcher.patch diff --git a/patches/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/unapplied/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch similarity index 99% rename from patches/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch rename to patches/unapplied/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch index bcca0e8640..080042b269 100644 --- a/patches/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch +++ b/patches/unapplied/server/0612-Add-paper-mobcaps-and-paper-playermobcaps.patch @@ -10,7 +10,7 @@ Also has a hover text on each mob category listing what entity types are in said category diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java -index 27775df10a490ff75ca377e8373931738f1b817c..c9bb2df0d884227576ed8d2e72219bbbd7ba827e 100644 +index cdad0fd5257ae842f83b9c1c98b4565b468d4f54..fd4f37711989431f997d77fb0917f8a9232ce53f 100644 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java @@ -40,6 +40,7 @@ public final class PaperCommand extends Command { diff --git a/patches/server/0613-Sanitize-ResourceLocation-error-logging.patch b/patches/unapplied/server/0613-Sanitize-ResourceLocation-error-logging.patch similarity index 100% rename from patches/server/0613-Sanitize-ResourceLocation-error-logging.patch rename to patches/unapplied/server/0613-Sanitize-ResourceLocation-error-logging.patch diff --git a/patches/server/0614-Manually-inline-methods-in-BlockPosition.patch b/patches/unapplied/server/0614-Manually-inline-methods-in-BlockPosition.patch similarity index 100% rename from patches/server/0614-Manually-inline-methods-in-BlockPosition.patch rename to patches/unapplied/server/0614-Manually-inline-methods-in-BlockPosition.patch diff --git a/patches/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/unapplied/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch similarity index 100% rename from patches/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch rename to patches/unapplied/server/0615-Name-craft-scheduler-threads-according-to-the-plugin.patch diff --git a/patches/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/unapplied/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch similarity index 100% rename from patches/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch rename to patches/unapplied/server/0616-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch diff --git a/patches/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/unapplied/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch similarity index 100% rename from patches/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch rename to patches/unapplied/server/0617-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch diff --git a/patches/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/unapplied/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch similarity index 100% rename from patches/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch rename to patches/unapplied/server/0618-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch diff --git a/patches/server/0619-Time-scoreboard-search.patch b/patches/unapplied/server/0619-Time-scoreboard-search.patch similarity index 100% rename from patches/server/0619-Time-scoreboard-search.patch rename to patches/unapplied/server/0619-Time-scoreboard-search.patch diff --git a/patches/server/0620-Oprimise-map-impl-for-tracked-players.patch b/patches/unapplied/server/0620-Oprimise-map-impl-for-tracked-players.patch similarity index 100% rename from patches/server/0620-Oprimise-map-impl-for-tracked-players.patch rename to patches/unapplied/server/0620-Oprimise-map-impl-for-tracked-players.patch diff --git a/patches/server/0621-Add-missing-InventoryType.patch b/patches/unapplied/server/0621-Add-missing-InventoryType.patch similarity index 100% rename from patches/server/0621-Add-missing-InventoryType.patch rename to patches/unapplied/server/0621-Add-missing-InventoryType.patch diff --git a/patches/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/unapplied/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch similarity index 100% rename from patches/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch rename to patches/unapplied/server/0622-Optimise-BlockSoil-nearby-water-lookup.patch diff --git a/patches/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/unapplied/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch similarity index 100% rename from patches/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch rename to patches/unapplied/server/0623-Fix-merchant-inventory-not-closing-on-entity-removal.patch diff --git a/patches/server/0624-Check-requirement-before-suggesting-root-nodes.patch b/patches/unapplied/server/0624-Check-requirement-before-suggesting-root-nodes.patch similarity index 100% rename from patches/server/0624-Check-requirement-before-suggesting-root-nodes.patch rename to patches/unapplied/server/0624-Check-requirement-before-suggesting-root-nodes.patch diff --git a/patches/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/unapplied/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch similarity index 100% rename from patches/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch rename to patches/unapplied/server/0625-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch diff --git a/patches/server/0626-Add-packet-limiter-config.patch b/patches/unapplied/server/0626-Add-packet-limiter-config.patch similarity index 100% rename from patches/server/0626-Add-packet-limiter-config.patch rename to patches/unapplied/server/0626-Add-packet-limiter-config.patch diff --git a/patches/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/unapplied/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch similarity index 100% rename from patches/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch rename to patches/unapplied/server/0627-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch diff --git a/patches/server/0628-Ensure-valid-vehicle-status.patch b/patches/unapplied/server/0628-Ensure-valid-vehicle-status.patch similarity index 100% rename from patches/server/0628-Ensure-valid-vehicle-status.patch rename to patches/unapplied/server/0628-Ensure-valid-vehicle-status.patch diff --git a/patches/server/0629-Prevent-softlocked-end-exit-portal-generation.patch b/patches/unapplied/server/0629-Prevent-softlocked-end-exit-portal-generation.patch similarity index 100% rename from patches/server/0629-Prevent-softlocked-end-exit-portal-generation.patch rename to patches/unapplied/server/0629-Prevent-softlocked-end-exit-portal-generation.patch diff --git a/patches/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/unapplied/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch similarity index 100% rename from patches/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch rename to patches/unapplied/server/0630-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch diff --git a/patches/server/0631-Don-t-log-debug-logging-being-disabled.patch b/patches/unapplied/server/0631-Don-t-log-debug-logging-being-disabled.patch similarity index 100% rename from patches/server/0631-Don-t-log-debug-logging-being-disabled.patch rename to patches/unapplied/server/0631-Don-t-log-debug-logging-being-disabled.patch diff --git a/patches/server/0632-fix-various-menus-with-empty-level-accesses.patch b/patches/unapplied/server/0632-fix-various-menus-with-empty-level-accesses.patch similarity index 100% rename from patches/server/0632-fix-various-menus-with-empty-level-accesses.patch rename to patches/unapplied/server/0632-fix-various-menus-with-empty-level-accesses.patch diff --git a/patches/server/0633-Preserve-overstacked-loot.patch b/patches/unapplied/server/0633-Preserve-overstacked-loot.patch similarity index 100% rename from patches/server/0633-Preserve-overstacked-loot.patch rename to patches/unapplied/server/0633-Preserve-overstacked-loot.patch diff --git a/patches/server/0634-Update-head-rotation-in-missing-places.patch b/patches/unapplied/server/0634-Update-head-rotation-in-missing-places.patch similarity index 93% rename from patches/server/0634-Update-head-rotation-in-missing-places.patch rename to patches/unapplied/server/0634-Update-head-rotation-in-missing-places.patch index 8116c5ccb3..ff87022802 100644 --- a/patches/server/0634-Update-head-rotation-in-missing-places.patch +++ b/patches/unapplied/server/0634-Update-head-rotation-in-missing-places.patch @@ -8,7 +8,7 @@ This is because bukkit uses a separate head rotation field for yaw. This issue only applies to players. diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 96c9feb545c02014c324852344a1d86156c32237..df7741ca931d7d1eb1b0cbdcc2b2bb15875c750c 100644 +index ebacae6f39fea052f4fb7c60f7164763b49f8148..0034e06a3caa89dfbb24a75d377d799ca0e8aed0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1813,6 +1813,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0635-prevent-unintended-light-block-manipulation.patch b/patches/unapplied/server/0635-prevent-unintended-light-block-manipulation.patch similarity index 100% rename from patches/server/0635-prevent-unintended-light-block-manipulation.patch rename to patches/unapplied/server/0635-prevent-unintended-light-block-manipulation.patch diff --git a/patches/server/0636-Fix-CraftCriteria-defaults-map.patch b/patches/unapplied/server/0636-Fix-CraftCriteria-defaults-map.patch similarity index 100% rename from patches/server/0636-Fix-CraftCriteria-defaults-map.patch rename to patches/unapplied/server/0636-Fix-CraftCriteria-defaults-map.patch diff --git a/patches/server/0637-Fix-upstreams-block-state-factories.patch b/patches/unapplied/server/0637-Fix-upstreams-block-state-factories.patch similarity index 99% rename from patches/server/0637-Fix-upstreams-block-state-factories.patch rename to patches/unapplied/server/0637-Fix-upstreams-block-state-factories.patch index 2fdb11ce82..a48a6b0d09 100644 --- a/patches/server/0637-Fix-upstreams-block-state-factories.patch +++ b/patches/unapplied/server/0637-Fix-upstreams-block-state-factories.patch @@ -13,7 +13,7 @@ the material type of the block at that location. public net.minecraft.world.level.block.entity.BlockEntityType validBlocks diff --git a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java -index 6e24673a793017ee857cf75bf9a74105ce76b773..e3c5f99b3ad91a9bb454f9ab95b1ccff0bb7b34c 100644 +index 7147484eefad44ba67db03b6ef2090a596e278de..6f6693456cf518b7bd9eb21ba681540a40c588ef 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java @@ -371,7 +371,7 @@ public abstract class BlockEntity { diff --git a/patches/server/0638-Configurable-feature-seeds.patch b/patches/unapplied/server/0638-Configurable-feature-seeds.patch similarity index 100% rename from patches/server/0638-Configurable-feature-seeds.patch rename to patches/unapplied/server/0638-Configurable-feature-seeds.patch diff --git a/patches/server/0639-Add-root-admin-user-detection.patch b/patches/unapplied/server/0639-Add-root-admin-user-detection.patch similarity index 97% rename from patches/server/0639-Add-root-admin-user-detection.patch rename to patches/unapplied/server/0639-Add-root-admin-user-detection.patch index 5b81dcd09a..ceb124af5d 100644 --- a/patches/server/0639-Add-root-admin-user-detection.patch +++ b/patches/unapplied/server/0639-Add-root-admin-user-detection.patch @@ -40,7 +40,7 @@ index 0000000000000000000000000000000000000000..68098dfe716e93aafcca4d8d5b5a81d8 + } +} diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 4bc7b3d7c5214b3272614fe3fce8e4d8d2264867..784788d8d3d1a07efbd406b6c463e046699081e2 100644 +index b8043b7e778792153620923ea228c1a211c27969..bbbadf5284907531eef761a738c3adf5305bd08f 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -192,6 +192,16 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch b/patches/unapplied/server/0640-don-t-attempt-to-teleport-dead-entities.patch similarity index 91% rename from patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch rename to patches/unapplied/server/0640-don-t-attempt-to-teleport-dead-entities.patch index 1ea681b348..c23f304dec 100644 --- a/patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch +++ b/patches/unapplied/server/0640-don-t-attempt-to-teleport-dead-entities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] don't attempt to teleport dead entities diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index df7741ca931d7d1eb1b0cbdcc2b2bb15875c750c..50aca89516dea3f4c4d668b994f4afdea69b4cc9 100644 +index 0034e06a3caa89dfbb24a75d377d799ca0e8aed0..7966d45adcbc239a506ab4aa2923a6df0dc36c03 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -730,7 +730,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/unapplied/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch similarity index 100% rename from patches/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch rename to patches/unapplied/server/0641-Prevent-excessive-velocity-through-repeated-crits.patch diff --git a/patches/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/unapplied/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch similarity index 100% rename from patches/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch rename to patches/unapplied/server/0642-Remove-client-side-code-using-deprecated-for-removal.patch diff --git a/patches/server/0643-Fix-Spigot-growth-modifiers.patch b/patches/unapplied/server/0643-Fix-Spigot-growth-modifiers.patch similarity index 98% rename from patches/server/0643-Fix-Spigot-growth-modifiers.patch rename to patches/unapplied/server/0643-Fix-Spigot-growth-modifiers.patch index 245729c1f4..dbaed5a331 100644 --- a/patches/server/0643-Fix-Spigot-growth-modifiers.patch +++ b/patches/unapplied/server/0643-Fix-Spigot-growth-modifiers.patch @@ -102,7 +102,7 @@ index c9ed129db2cadd0a33d69993961f43088725c3cb..d06e3892cf42723f8e3f621b5497c534 this.grow(world, state, pos, 1); } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 2a787b641fec29427963ac2bdc14df60f32af2bc..41f4416d820ed1ca2d02b457749cbb6c3dbb20af 100644 +index c15c60fb88c9d6e370e2100c57ccb59d5441c96f..44bdd0e6cdcabcb4deedd9aa3340330db2370615 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -96,6 +96,7 @@ public class SpigotWorldConfig diff --git a/patches/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/unapplied/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch similarity index 100% rename from patches/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch rename to patches/unapplied/server/0644-Prevent-ContainerOpenersCounter-openCount-from-going.patch diff --git a/patches/server/0645-Add-PlayerItemFrameChangeEvent.patch b/patches/unapplied/server/0645-Add-PlayerItemFrameChangeEvent.patch similarity index 100% rename from patches/server/0645-Add-PlayerItemFrameChangeEvent.patch rename to patches/unapplied/server/0645-Add-PlayerItemFrameChangeEvent.patch diff --git a/patches/server/0646-Optimize-HashMapPalette.patch b/patches/unapplied/server/0646-Optimize-HashMapPalette.patch similarity index 100% rename from patches/server/0646-Optimize-HashMapPalette.patch rename to patches/unapplied/server/0646-Optimize-HashMapPalette.patch diff --git a/patches/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/unapplied/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/unapplied/server/0647-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/unapplied/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch similarity index 100% rename from patches/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch rename to patches/unapplied/server/0648-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch diff --git a/patches/server/0649-Add-more-Campfire-API.patch b/patches/unapplied/server/0649-Add-more-Campfire-API.patch similarity index 100% rename from patches/server/0649-Add-more-Campfire-API.patch rename to patches/unapplied/server/0649-Add-more-Campfire-API.patch diff --git a/patches/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/unapplied/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch similarity index 100% rename from patches/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch rename to patches/unapplied/server/0650-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch diff --git a/patches/server/0651-Forward-CraftEntity-in-teleport-command.patch b/patches/unapplied/server/0651-Forward-CraftEntity-in-teleport-command.patch similarity index 95% rename from patches/server/0651-Forward-CraftEntity-in-teleport-command.patch rename to patches/unapplied/server/0651-Forward-CraftEntity-in-teleport-command.patch index c07753356e..36fce551ed 100644 --- a/patches/server/0651-Forward-CraftEntity-in-teleport-command.patch +++ b/patches/unapplied/server/0651-Forward-CraftEntity-in-teleport-command.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Forward CraftEntity in teleport command diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 50aca89516dea3f4c4d668b994f4afdea69b4cc9..af1b161e5e61fe244b316d352452038c9b4ea458 100644 +index 7966d45adcbc239a506ab4aa2923a6df0dc36c03..1632b2231e20901ce8498f3a0442e9ea54fcc068 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -3284,6 +3284,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0652-Improve-scoreboard-entries.patch b/patches/unapplied/server/0652-Improve-scoreboard-entries.patch similarity index 100% rename from patches/server/0652-Improve-scoreboard-entries.patch rename to patches/unapplied/server/0652-Improve-scoreboard-entries.patch diff --git a/patches/server/0653-Entity-powdered-snow-API.patch b/patches/unapplied/server/0653-Entity-powdered-snow-API.patch similarity index 100% rename from patches/server/0653-Entity-powdered-snow-API.patch rename to patches/unapplied/server/0653-Entity-powdered-snow-API.patch diff --git a/patches/server/0654-Add-API-for-item-entity-health.patch b/patches/unapplied/server/0654-Add-API-for-item-entity-health.patch similarity index 100% rename from patches/server/0654-Add-API-for-item-entity-health.patch rename to patches/unapplied/server/0654-Add-API-for-item-entity-health.patch diff --git a/patches/server/0655-Configurable-max-block-light-for-monster-spawning.patch b/patches/unapplied/server/0655-Configurable-max-block-light-for-monster-spawning.patch similarity index 100% rename from patches/server/0655-Configurable-max-block-light-for-monster-spawning.patch rename to patches/unapplied/server/0655-Configurable-max-block-light-for-monster-spawning.patch diff --git a/patches/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/unapplied/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch similarity index 100% rename from patches/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch rename to patches/unapplied/server/0656-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch diff --git a/patches/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/unapplied/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch similarity index 100% rename from patches/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch rename to patches/unapplied/server/0657-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch diff --git a/patches/server/0658-Bucketable-API.patch b/patches/unapplied/server/0658-Bucketable-API.patch similarity index 100% rename from patches/server/0658-Bucketable-API.patch rename to patches/unapplied/server/0658-Bucketable-API.patch diff --git a/patches/server/0659-Validate-usernames.patch b/patches/unapplied/server/0659-Validate-usernames.patch similarity index 100% rename from patches/server/0659-Validate-usernames.patch rename to patches/unapplied/server/0659-Validate-usernames.patch diff --git a/patches/server/0660-Make-water-animal-spawn-height-configurable.patch b/patches/unapplied/server/0660-Make-water-animal-spawn-height-configurable.patch similarity index 100% rename from patches/server/0660-Make-water-animal-spawn-height-configurable.patch rename to patches/unapplied/server/0660-Make-water-animal-spawn-height-configurable.patch diff --git a/patches/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/unapplied/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch similarity index 100% rename from patches/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch rename to patches/unapplied/server/0661-Expose-vanilla-BiomeProvider-from-WorldInfo.patch diff --git a/patches/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/unapplied/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch similarity index 100% rename from patches/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch rename to patches/unapplied/server/0662-Add-config-option-for-worlds-affected-by-time-cmd.patch diff --git a/patches/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/unapplied/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch similarity index 100% rename from patches/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch rename to patches/unapplied/server/0663-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch diff --git a/patches/server/0664-Multiple-Entries-with-Scoreboards.patch b/patches/unapplied/server/0664-Multiple-Entries-with-Scoreboards.patch similarity index 100% rename from patches/server/0664-Multiple-Entries-with-Scoreboards.patch rename to patches/unapplied/server/0664-Multiple-Entries-with-Scoreboards.patch diff --git a/patches/server/0665-Reset-placed-block-on-exception.patch b/patches/unapplied/server/0665-Reset-placed-block-on-exception.patch similarity index 100% rename from patches/server/0665-Reset-placed-block-on-exception.patch rename to patches/unapplied/server/0665-Reset-placed-block-on-exception.patch diff --git a/patches/server/0666-Add-configurable-height-for-slime-spawn.patch b/patches/unapplied/server/0666-Add-configurable-height-for-slime-spawn.patch similarity index 100% rename from patches/server/0666-Add-configurable-height-for-slime-spawn.patch rename to patches/unapplied/server/0666-Add-configurable-height-for-slime-spawn.patch diff --git a/patches/server/0667-Fix-xp-reward-for-baby-zombies.patch b/patches/unapplied/server/0667-Fix-xp-reward-for-baby-zombies.patch similarity index 100% rename from patches/server/0667-Fix-xp-reward-for-baby-zombies.patch rename to patches/unapplied/server/0667-Fix-xp-reward-for-baby-zombies.patch diff --git a/patches/server/0668-Multi-Block-Change-API-Implementation.patch b/patches/unapplied/server/0668-Multi-Block-Change-API-Implementation.patch similarity index 97% rename from patches/server/0668-Multi-Block-Change-API-Implementation.patch rename to patches/unapplied/server/0668-Multi-Block-Change-API-Implementation.patch index 95d2c691b3..a6c9ee19af 100644 --- a/patches/server/0668-Multi-Block-Change-API-Implementation.patch +++ b/patches/unapplied/server/0668-Multi-Block-Change-API-Implementation.patch @@ -24,7 +24,7 @@ index 926ff9be3d9e3f5d620e4c7ccb22b9f64865ff8c..1a37654aff9a9c86c9f7af10a1cf7213 buf.writeLong(this.sectionPos.asLong()); buf.writeVarInt(this.positions.length); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bb75c965266fefa58919823e5fcc9f56f11b04d0..409d8f8957eda02a474f36e4c9010aee62c7fade 100644 +index 634da85870b31a9fc09d53f5670239e18bcb3d47..6793acbbae09a9bc39f59c029f6b02182ec33a92 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -928,6 +928,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0669-Fix-NotePlayEvent.patch b/patches/unapplied/server/0669-Fix-NotePlayEvent.patch similarity index 100% rename from patches/server/0669-Fix-NotePlayEvent.patch rename to patches/unapplied/server/0669-Fix-NotePlayEvent.patch diff --git a/patches/server/0670-Freeze-Tick-Lock-API.patch b/patches/unapplied/server/0670-Freeze-Tick-Lock-API.patch similarity index 100% rename from patches/server/0670-Freeze-Tick-Lock-API.patch rename to patches/unapplied/server/0670-Freeze-Tick-Lock-API.patch diff --git a/patches/server/0671-More-PotionEffectType-API.patch b/patches/unapplied/server/0671-More-PotionEffectType-API.patch similarity index 100% rename from patches/server/0671-More-PotionEffectType-API.patch rename to patches/unapplied/server/0671-More-PotionEffectType-API.patch diff --git a/patches/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/unapplied/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch similarity index 100% rename from patches/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch rename to patches/unapplied/server/0672-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch diff --git a/patches/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/unapplied/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch similarity index 100% rename from patches/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch rename to patches/unapplied/server/0673-API-for-creating-command-sender-which-forwards-feedb.patch diff --git a/patches/server/0674-Add-missing-structure-set-seed-configs.patch b/patches/unapplied/server/0674-Add-missing-structure-set-seed-configs.patch similarity index 99% rename from patches/server/0674-Add-missing-structure-set-seed-configs.patch rename to patches/unapplied/server/0674-Add-missing-structure-set-seed-configs.patch index 0c160b7c1c..6e9e7c21b8 100644 --- a/patches/server/0674-Add-missing-structure-set-seed-configs.patch +++ b/patches/unapplied/server/0674-Add-missing-structure-set-seed-configs.patch @@ -277,7 +277,7 @@ index a4c34e9415632354d33668a38d06453ada4d3c77..cbf13e4f2da6a27619e9bc9a7cd73bb6 @Override diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 41f4416d820ed1ca2d02b457749cbb6c3dbb20af..5485df1a1b59e81f4dcedd21dd972e1fd2759573 100644 +index 44bdd0e6cdcabcb4deedd9aa3340330db2370615..37bbda040bd6f8a92295d2f32affbb53ea2d369b 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -322,6 +322,18 @@ public class SpigotWorldConfig diff --git a/patches/server/0675-Implement-regenerateChunk.patch b/patches/unapplied/server/0675-Implement-regenerateChunk.patch similarity index 98% rename from patches/server/0675-Implement-regenerateChunk.patch rename to patches/unapplied/server/0675-Implement-regenerateChunk.patch index c6a6c8eb34..61257215bf 100644 --- a/patches/server/0675-Implement-regenerateChunk.patch +++ b/patches/unapplied/server/0675-Implement-regenerateChunk.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Implement regenerateChunk Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com> diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 43b3af7bba4551d98c7ffb53fbee9413ed5b8dd3..e31794510cb204fa1360803050d25d0e226785e2 100644 +index a5121eb7fa8fccf7e742beea285c2f741ece513d..7e9344fdafb01030061458c55ccf6836bf643da3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -151,6 +151,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/unapplied/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch similarity index 95% rename from patches/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch rename to patches/unapplied/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch index e46654952c..d0917dc1c2 100644 --- a/patches/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch +++ b/patches/unapplied/server/0676-Fix-cancelled-powdered-snow-bucket-placement.patch @@ -8,7 +8,7 @@ snow bucket didn't revert grass that became snowy because of the placement. diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 2947a43a1d9e49273ed0242691273e50c657cd05..51a7919b019f2fd5d2e2ab850ed512769b0b1685 100644 +index 1b062edcc04af4c500f38c1664b5cee25e265f3c..aa0a5b392942e03123b1dbd68ec8e9e1321457e9 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -401,7 +401,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/unapplied/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch similarity index 100% rename from patches/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch rename to patches/unapplied/server/0677-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch diff --git a/patches/server/0678-Add-GameEvent-tags.patch b/patches/unapplied/server/0678-Add-GameEvent-tags.patch similarity index 100% rename from patches/server/0678-Add-GameEvent-tags.patch rename to patches/unapplied/server/0678-Add-GameEvent-tags.patch diff --git a/patches/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/unapplied/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch similarity index 94% rename from patches/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch rename to patches/unapplied/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch index 74e1372a47..4490dcca94 100644 --- a/patches/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch +++ b/patches/unapplied/server/0679-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch @@ -9,7 +9,7 @@ This might result in chunks loading far slower in the nether, for example. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 533e1225b863ef314b7defebc4787304fd19f5a1..6d80102287f3976ea7f0912bcbd5ff0a2088a0e1 100644 +index f295eaf2dced5bf294eb094f6d6110da826f053f..9f279ba3b3ed8a6cf4f79a41a1513b30d7ea9ccc 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1343,6 +1343,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java -index c9bb2df0d884227576ed8d2e72219bbbd7ba827e..534d9c380f26d6cce3c99fa88ad2e15410535094 100644 +index fd4f37711989431f997d77fb0917f8a9232ce53f..46bf42d5ea9e7b046f962531c5962d287cf44a41 100644 --- a/src/main/java/io/papermc/paper/command/PaperCommand.java +++ b/src/main/java/io/papermc/paper/command/PaperCommand.java @@ -41,6 +41,7 @@ public final class PaperCommand extends Command { diff --git a/patches/server/0786-check-global-player-list-where-appropriate.patch b/patches/unapplied/server/0786-check-global-player-list-where-appropriate.patch similarity index 100% rename from patches/server/0786-check-global-player-list-where-appropriate.patch rename to patches/unapplied/server/0786-check-global-player-list-where-appropriate.patch diff --git a/patches/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/unapplied/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch similarity index 100% rename from patches/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch rename to patches/unapplied/server/0787-Fix-async-entity-add-due-to-fungus-trees.patch diff --git a/patches/server/0788-ItemStack-damage-API.patch b/patches/unapplied/server/0788-ItemStack-damage-API.patch similarity index 98% rename from patches/server/0788-ItemStack-damage-API.patch rename to patches/unapplied/server/0788-ItemStack-damage-API.patch index ba4a14ae11..6b5800404d 100644 --- a/patches/server/0788-ItemStack-damage-API.patch +++ b/patches/unapplied/server/0788-ItemStack-damage-API.patch @@ -11,7 +11,7 @@ the logic associated with damaging them public net.minecraft.world.entity.LivingEntity entityEventForEquipmentBreak(Lnet/minecraft/world/entity/EquipmentSlot;)B diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index acce1b72185d4687ef5a72dd4014d87149f4b092..dc473b46394b41d951b68ed0eb6993e6807a0d29 100644 +index 0ac1d8cf71dc685bcf2d1f9ab1440e933757359c..a158642471ab037ea3b99cac09ba5f3bf282e2a7 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -713,7 +713,14 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0789-Friction-API.patch b/patches/unapplied/server/0789-Friction-API.patch similarity index 98% rename from patches/server/0789-Friction-API.patch rename to patches/unapplied/server/0789-Friction-API.patch index 4fef79a8fc..eb78b15231 100644 --- a/patches/server/0789-Friction-API.patch +++ b/patches/unapplied/server/0789-Friction-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Friction API diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d736a53a6ea2a20a950096cd89df178864e644f4..fecbef1ffcc942c71e3a1daaad4c16e0c774be49 100644 +index 947bccb93f2a5baa6236e1da1a7ec0b27c072a14..337c43f08465cb84227ca02b99f972b47a9186f5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -273,6 +273,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/unapplied/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch similarity index 100% rename from patches/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch rename to patches/unapplied/server/0790-Ability-to-control-player-s-insomnia-and-phantoms.patch diff --git a/patches/server/0791-Fix-premature-player-kicks-on-shutdown.patch b/patches/unapplied/server/0791-Fix-premature-player-kicks-on-shutdown.patch similarity index 97% rename from patches/server/0791-Fix-premature-player-kicks-on-shutdown.patch rename to patches/unapplied/server/0791-Fix-premature-player-kicks-on-shutdown.patch index 7cdccaff49..108bf6dec2 100644 --- a/patches/server/0791-Fix-premature-player-kicks-on-shutdown.patch +++ b/patches/unapplied/server/0791-Fix-premature-player-kicks-on-shutdown.patch @@ -47,7 +47,7 @@ index fd2a5c829899d45641a5b5d30116f4f368953c15..f57679d88cd015caa8996d44b486da69 this.disconnect(Component.translatable("multiplayer.disconnect.server_shutdown")); } catch (ClassCastException classcastexception) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f67b48131ec7e18177f5daeda19389641f00193a..e463727cccc6931de822f62309090241c7abada4 100644 +index b2a46033d522f3122041cc2966105159c8869fdc..9ba2a71e5bedbf8e65f9dd1652639afd397439c7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2071,7 +2071,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= 2.0F) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 560a354451e1c027ce4df3f18d39e122be7f96ed..9716687ba5aa407d714389c50b00e8c7ecf88724 100644 +index 26534a2ed76cb6038e02671190848f0c9997b2fc..1ca6552705213ce193ab9ce50b2ffeaad1f08dfd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2563,6 +2563,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/unapplied/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch similarity index 94% rename from patches/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch rename to patches/unapplied/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch index 89d91e3b85..ff4f0cb39a 100644 --- a/patches/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch +++ b/patches/unapplied/server/0807-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Expose pre-collision moving velocity to diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 661f630b38dff4aa760e7939ff80b1361d426565..a6f0a1114da54f78ccb2fb6151bf14e34cd5c330 100644 +index 51f1f00e9e68abb9a098a193f8201715ae73a8e4..c15a08c6d9277dd1d6d63a25dacce0c43b8dad05 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -967,6 +967,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0808-config-for-disabling-entity-tag-tags.patch b/patches/unapplied/server/0808-config-for-disabling-entity-tag-tags.patch similarity index 100% rename from patches/server/0808-config-for-disabling-entity-tag-tags.patch rename to patches/unapplied/server/0808-config-for-disabling-entity-tag-tags.patch diff --git a/patches/server/0809-Use-single-player-info-update-packet-on-join.patch b/patches/unapplied/server/0809-Use-single-player-info-update-packet-on-join.patch similarity index 100% rename from patches/server/0809-Use-single-player-info-update-packet-on-join.patch rename to patches/unapplied/server/0809-Use-single-player-info-update-packet-on-join.patch diff --git a/patches/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/unapplied/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch similarity index 95% rename from patches/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch rename to patches/unapplied/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch index f6e4b8d537..2cbae368b3 100644 --- a/patches/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch +++ b/patches/unapplied/server/0810-Correctly-shrink-items-during-EntityResurrectEvent.patch @@ -22,7 +22,7 @@ This patch corrects this behaviour by only shrinking the item if a totem of undying was found and the event was called uncancelled. diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 8a4977bf4d5b87ca30e048d749b6a878b1a17911..6c502f67234eee9c1446d490acde1dbe6f34119e 100644 +index 337c43f08465cb84227ca02b99f972b47a9186f5..ca5dd07e74d1ecf303091faeb4d7796bbc7a57c8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1638,7 +1638,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0811-Win-Screen-API.patch b/patches/unapplied/server/0811-Win-Screen-API.patch similarity index 93% rename from patches/server/0811-Win-Screen-API.patch rename to patches/unapplied/server/0811-Win-Screen-API.patch index 57cc12a7dc..7c9e92ecea 100644 --- a/patches/server/0811-Win-Screen-API.patch +++ b/patches/unapplied/server/0811-Win-Screen-API.patch @@ -7,7 +7,7 @@ Subject: [PATCH] Win Screen API public net.minecraft.server.level.ServerPlayer seenCredits diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 9716687ba5aa407d714389c50b00e8c7ecf88724..79ab080e496df2b8d11c777427863bd775e60b91 100644 +index 1ca6552705213ce193ab9ce50b2ffeaad1f08dfd..952728c30f8871f8ed1f27800feba7db038ad420 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1292,6 +1292,25 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/unapplied/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch similarity index 93% rename from patches/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch rename to patches/unapplied/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch index b95442b660..01e629abd6 100644 --- a/patches/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch +++ b/patches/unapplied/server/0812-Remove-CraftItemStack-setAmount-null-assignment.patch @@ -16,7 +16,7 @@ with less than zero amounts, so this code doesn't create a problem with operations on the vanilla ItemStack. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 6352e56fa3e69690846842d474a1ae51ad4059c6..a1173823b3a95b973ae742f886b0555b3203288c 100644 +index 2a7996f5cfb1eacf098e73f35bafc4327b041c51..fa223d2381986cb260c79f074fb7b123396f1f86 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -160,7 +160,7 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0813-Fix-force-opening-enchantment-tables.patch b/patches/unapplied/server/0813-Fix-force-opening-enchantment-tables.patch similarity index 100% rename from patches/server/0813-Fix-force-opening-enchantment-tables.patch rename to patches/unapplied/server/0813-Fix-force-opening-enchantment-tables.patch diff --git a/patches/server/0814-Add-Entity-Body-Yaw-API.patch b/patches/unapplied/server/0814-Add-Entity-Body-Yaw-API.patch similarity index 95% rename from patches/server/0814-Add-Entity-Body-Yaw-API.patch rename to patches/unapplied/server/0814-Add-Entity-Body-Yaw-API.patch index 7e9aba16c7..e6f4478e8a 100644 --- a/patches/server/0814-Add-Entity-Body-Yaw-API.patch +++ b/patches/unapplied/server/0814-Add-Entity-Body-Yaw-API.patch @@ -43,7 +43,7 @@ index 365281dfc0308c5db0c72b56208d9b87be0e955e..991b94ff1186b1071a94b2662873dc07 @Override public boolean isInvisible() { // Paper - moved up from LivingEntity diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 8f987c87032fad49835d51cd747f40df2bb5aa32..a231543cf4fcc442e3675ece0d4c4950f4ed3126 100644 +index 112d54e1789d30ef89b34f53a60b0124538d3cda..37b62a45bbe2db725f24330f1f03e8cf09ab208c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1161,4 +1161,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/unapplied/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch similarity index 100% rename from patches/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch rename to patches/unapplied/server/0815-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch diff --git a/patches/server/0816-Add-EntityFertilizeEggEvent.patch b/patches/unapplied/server/0816-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/server/0816-Add-EntityFertilizeEggEvent.patch rename to patches/unapplied/server/0816-Add-EntityFertilizeEggEvent.patch diff --git a/patches/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/unapplied/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch similarity index 100% rename from patches/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch rename to patches/unapplied/server/0817-Fix-HumanEntity-drop-not-updating-the-client-inv.patch diff --git a/patches/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/unapplied/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/unapplied/server/0818-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/server/0819-Correctly-handle-ArmorStand-invisibility.patch b/patches/unapplied/server/0819-Correctly-handle-ArmorStand-invisibility.patch similarity index 100% rename from patches/server/0819-Correctly-handle-ArmorStand-invisibility.patch rename to patches/unapplied/server/0819-Correctly-handle-ArmorStand-invisibility.patch diff --git a/patches/server/0820-Fix-advancement-triggers-for-entity-damage.patch b/patches/unapplied/server/0820-Fix-advancement-triggers-for-entity-damage.patch similarity index 100% rename from patches/server/0820-Fix-advancement-triggers-for-entity-damage.patch rename to patches/unapplied/server/0820-Fix-advancement-triggers-for-entity-damage.patch diff --git a/patches/server/0821-Fix-text-display-error-on-spawn.patch b/patches/unapplied/server/0821-Fix-text-display-error-on-spawn.patch similarity index 100% rename from patches/server/0821-Fix-text-display-error-on-spawn.patch rename to patches/unapplied/server/0821-Fix-text-display-error-on-spawn.patch diff --git a/patches/server/0822-Fix-inventories-returning-null-Locations.patch b/patches/unapplied/server/0822-Fix-inventories-returning-null-Locations.patch similarity index 100% rename from patches/server/0822-Fix-inventories-returning-null-Locations.patch rename to patches/unapplied/server/0822-Fix-inventories-returning-null-Locations.patch diff --git a/patches/server/0823-Add-Shearable-API.patch b/patches/unapplied/server/0823-Add-Shearable-API.patch similarity index 100% rename from patches/server/0823-Add-Shearable-API.patch rename to patches/unapplied/server/0823-Add-Shearable-API.patch diff --git a/patches/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/unapplied/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/unapplied/server/0824-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/unapplied/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch similarity index 100% rename from patches/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch rename to patches/unapplied/server/0825-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch diff --git a/patches/server/0826-Treat-sequence-violations-like-they-should-be.patch b/patches/unapplied/server/0826-Treat-sequence-violations-like-they-should-be.patch similarity index 100% rename from patches/server/0826-Treat-sequence-violations-like-they-should-be.patch rename to patches/unapplied/server/0826-Treat-sequence-violations-like-they-should-be.patch diff --git a/patches/server/0827-remove-duplicate-animate-packet-for-records.patch b/patches/unapplied/server/0827-remove-duplicate-animate-packet-for-records.patch similarity index 100% rename from patches/server/0827-remove-duplicate-animate-packet-for-records.patch rename to patches/unapplied/server/0827-remove-duplicate-animate-packet-for-records.patch diff --git a/patches/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/unapplied/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch similarity index 100% rename from patches/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch rename to patches/unapplied/server/0828-Prevent-causing-expired-keys-from-impacting-new-join.patch diff --git a/patches/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/unapplied/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch similarity index 100% rename from patches/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch rename to patches/unapplied/server/0829-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch diff --git a/patches/server/0830-Use-array-for-gamerule-storage.patch b/patches/unapplied/server/0830-Use-array-for-gamerule-storage.patch similarity index 100% rename from patches/server/0830-Use-array-for-gamerule-storage.patch rename to patches/unapplied/server/0830-Use-array-for-gamerule-storage.patch diff --git a/patches/server/0831-Fix-a-couple-of-upstream-bed-issues.patch b/patches/unapplied/server/0831-Fix-a-couple-of-upstream-bed-issues.patch similarity index 100% rename from patches/server/0831-Fix-a-couple-of-upstream-bed-issues.patch rename to patches/unapplied/server/0831-Fix-a-couple-of-upstream-bed-issues.patch diff --git a/patches/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/unapplied/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch similarity index 100% rename from patches/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch rename to patches/unapplied/server/0832-Fix-demo-flag-not-enabling-demo-mode.patch diff --git a/patches/server/0833-Add-Mob-Experience-reward-API.patch b/patches/unapplied/server/0833-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/server/0833-Add-Mob-Experience-reward-API.patch rename to patches/unapplied/server/0833-Add-Mob-Experience-reward-API.patch diff --git a/patches/server/0834-Break-redstone-on-top-of-trap-doors-early.patch b/patches/unapplied/server/0834-Break-redstone-on-top-of-trap-doors-early.patch similarity index 100% rename from patches/server/0834-Break-redstone-on-top-of-trap-doors-early.patch rename to patches/unapplied/server/0834-Break-redstone-on-top-of-trap-doors-early.patch diff --git a/patches/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/unapplied/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch similarity index 100% rename from patches/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch rename to patches/unapplied/server/0835-Avoid-Lazy-Initialization-for-Enum-Fields.patch diff --git a/patches/server/0836-More-accurate-isInOpenWater-impl.patch b/patches/unapplied/server/0836-More-accurate-isInOpenWater-impl.patch similarity index 100% rename from patches/server/0836-More-accurate-isInOpenWater-impl.patch rename to patches/unapplied/server/0836-More-accurate-isInOpenWater-impl.patch diff --git a/patches/server/0837-Expand-PlayerItemMendEvent.patch b/patches/unapplied/server/0837-Expand-PlayerItemMendEvent.patch similarity index 94% rename from patches/server/0837-Expand-PlayerItemMendEvent.patch rename to patches/unapplied/server/0837-Expand-PlayerItemMendEvent.patch index 5017935fca..6d3b0124bb 100644 --- a/patches/server/0837-Expand-PlayerItemMendEvent.patch +++ b/patches/unapplied/server/0837-Expand-PlayerItemMendEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand PlayerItemMendEvent diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java -index 27b75172820c35b02fe6b63e379a5c9a9fa59159..fb2e9f832841a35b07db7bfe55ffd1c81322fe64 100644 +index a933061d4f0c45a34b5678c2b317b670f20b8a45..46d8bcad1545953757659870901cbbdf3340bc15 100644 --- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java +++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java @@ -350,7 +350,7 @@ public class ExperienceOrb extends Entity { @@ -33,7 +33,7 @@ index 27b75172820c35b02fe6b63e379a5c9a9fa59159..fb2e9f832841a35b07db7bfe55ffd1c8 return k > 0 ? this.repairPlayerItems(player, k) : 0; } else { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 79ab080e496df2b8d11c777427863bd775e60b91..c341c64950e2addfcf30655f1cf94bc543bbdba4 100644 +index 952728c30f8871f8ed1f27800feba7db038ad420..1b9e1038f729582117dc93736f9a089bf6481cff 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1835,11 +1835,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -51,7 +51,7 @@ index 79ab080e496df2b8d11c777427863bd775e60b91..c341c64950e2addfcf30655f1cf94bc5 } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 4c2a09f137a5cb508317b4a72ae82d6389ad6305..95b819ef8953b2d94a76e33328c967d21bf216b4 100644 +index cbf2cd3c7005fb4148c15966079922a8b18ece91..f4ca35e044e41b3fd1b83c482a5c19d188ea0bae 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1264,10 +1264,10 @@ public class CraftEventFactory { diff --git a/patches/server/0838-Refresh-ProjectileSource-for-projectiles.patch b/patches/unapplied/server/0838-Refresh-ProjectileSource-for-projectiles.patch similarity index 97% rename from patches/server/0838-Refresh-ProjectileSource-for-projectiles.patch rename to patches/unapplied/server/0838-Refresh-ProjectileSource-for-projectiles.patch index 4292aa9845..1f88e9728f 100644 --- a/patches/server/0838-Refresh-ProjectileSource-for-projectiles.patch +++ b/patches/unapplied/server/0838-Refresh-ProjectileSource-for-projectiles.patch @@ -14,7 +14,7 @@ clearing the owner. Co-authored-by: Warrior <50800980+Warriorrrr@users.noreply.github.com> diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index a6f0a1114da54f78ccb2fb6151bf14e34cd5c330..1d934225d6abbec6f231042b8a9c823ee4a26029 100644 +index c15a08c6d9277dd1d6d63a25dacce0c43b8dad05..73831000101765845c0881bba217b2ca54eb39dd 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -385,6 +385,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0839-Add-transient-modifier-API.patch b/patches/unapplied/server/0839-Add-transient-modifier-API.patch similarity index 100% rename from patches/server/0839-Add-transient-modifier-API.patch rename to patches/unapplied/server/0839-Add-transient-modifier-API.patch diff --git a/patches/server/0840-Fix-block-place-logic.patch b/patches/unapplied/server/0840-Fix-block-place-logic.patch similarity index 97% rename from patches/server/0840-Fix-block-place-logic.patch rename to patches/unapplied/server/0840-Fix-block-place-logic.patch index 6438856b91..2b6ced0aad 100644 --- a/patches/server/0840-Fix-block-place-logic.patch +++ b/patches/unapplied/server/0840-Fix-block-place-logic.patch @@ -22,7 +22,7 @@ index 7d76cdc59984b156628273c8357485eb10046007..7180996027f70aef7afe32fb2adfce64 itemstack.consume(1, entityhuman); return InteractionResult.sidedSuccess(world.isClientSide); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index acce1b72185d4687ef5a72dd4014d87149f4b092..0f0d35955827ffa8cdc7d947b316704a42242ad3 100644 +index a158642471ab037ea3b99cac09ba5f3bf282e2a7..7450c53f3d43e401e5219d5ff01868a28ee2c05f 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -515,13 +515,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/unapplied/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch similarity index 94% rename from patches/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch rename to patches/unapplied/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch index c2c946f528..5c09743836 100644 --- a/patches/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch +++ b/patches/unapplied/server/0841-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix spigot sound playing for BlockItem ItemStacks diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 0f0d35955827ffa8cdc7d947b316704a42242ad3..f099e677041daf795ffee35d3a4659274fc3f3d9 100644 +index 7450c53f3d43e401e5219d5ff01868a28ee2c05f..2038c6b5758d50216058d9e04398c42f658aba4a 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -566,7 +566,11 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/unapplied/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch similarity index 100% rename from patches/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch rename to patches/unapplied/server/0842-Call-BlockGrowEvent-for-missing-blocks.patch diff --git a/patches/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/unapplied/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch similarity index 100% rename from patches/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch rename to patches/unapplied/server/0843-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch diff --git a/patches/server/0844-fix-MapLike-spam-for-missing-key-selector.patch b/patches/unapplied/server/0844-fix-MapLike-spam-for-missing-key-selector.patch similarity index 100% rename from patches/server/0844-fix-MapLike-spam-for-missing-key-selector.patch rename to patches/unapplied/server/0844-fix-MapLike-spam-for-missing-key-selector.patch diff --git a/patches/server/0845-Fix-sniffer-removeExploredLocation.patch b/patches/unapplied/server/0845-Fix-sniffer-removeExploredLocation.patch similarity index 100% rename from patches/server/0845-Fix-sniffer-removeExploredLocation.patch rename to patches/unapplied/server/0845-Fix-sniffer-removeExploredLocation.patch diff --git a/patches/server/0846-Add-method-to-remove-all-active-potion-effects.patch b/patches/unapplied/server/0846-Add-method-to-remove-all-active-potion-effects.patch similarity index 91% rename from patches/server/0846-Add-method-to-remove-all-active-potion-effects.patch rename to patches/unapplied/server/0846-Add-method-to-remove-all-active-potion-effects.patch index 5ea4211d6a..cb276dcd2a 100644 --- a/patches/server/0846-Add-method-to-remove-all-active-potion-effects.patch +++ b/patches/unapplied/server/0846-Add-method-to-remove-all-active-potion-effects.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index a231543cf4fcc442e3675ece0d4c4950f4ed3126..18af8736f30780b48313257a09973e30df6d0e2f 100644 +index 37b62a45bbe2db725f24330f1f03e8cf09ab208c..0196a49a5822e257b0e065e2383ec92b1bc27bba 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -562,6 +562,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/patches/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/unapplied/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch similarity index 100% rename from patches/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename to patches/unapplied/server/0847-Fix-incorrect-crafting-result-amount-for-fireworks.patch diff --git a/patches/server/0848-Add-event-for-player-editing-sign.patch b/patches/unapplied/server/0848-Add-event-for-player-editing-sign.patch similarity index 98% rename from patches/server/0848-Add-event-for-player-editing-sign.patch rename to patches/unapplied/server/0848-Add-event-for-player-editing-sign.patch index ec1df39aea..277ce6259c 100644 --- a/patches/server/0848-Add-event-for-player-editing-sign.patch +++ b/patches/unapplied/server/0848-Add-event-for-player-editing-sign.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add event for player editing sign diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index f099e677041daf795ffee35d3a4659274fc3f3d9..d7693f2551ee4c5c3be6d3e77b18b7ddfbd6e36c 100644 +index 2038c6b5758d50216058d9e04398c42f658aba4a..c27ef32a3fc3edf5a4dd91d7cba93a78a5e762fa 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -545,7 +545,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0849-Only-tick-item-frames-if-players-can-see-it.patch b/patches/unapplied/server/0849-Only-tick-item-frames-if-players-can-see-it.patch similarity index 100% rename from patches/server/0849-Only-tick-item-frames-if-players-can-see-it.patch rename to patches/unapplied/server/0849-Only-tick-item-frames-if-players-can-see-it.patch diff --git a/patches/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/unapplied/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch similarity index 100% rename from patches/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch rename to patches/unapplied/server/0850-Fix-cmd-permission-levels-for-command-blocks.patch diff --git a/patches/server/0851-Add-option-to-disable-block-updates.patch b/patches/unapplied/server/0851-Add-option-to-disable-block-updates.patch similarity index 100% rename from patches/server/0851-Add-option-to-disable-block-updates.patch rename to patches/unapplied/server/0851-Add-option-to-disable-block-updates.patch diff --git a/patches/server/0852-Call-missing-BlockDispenseEvent.patch b/patches/unapplied/server/0852-Call-missing-BlockDispenseEvent.patch similarity index 100% rename from patches/server/0852-Call-missing-BlockDispenseEvent.patch rename to patches/unapplied/server/0852-Call-missing-BlockDispenseEvent.patch diff --git a/patches/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/unapplied/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch similarity index 90% rename from patches/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch rename to patches/unapplied/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch index 5e49d5fc94..936d1935f2 100644 --- a/patches/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch +++ b/patches/unapplied/server/0853-Don-t-load-chunks-for-supporting-block-checks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Don't load chunks for supporting block checks diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1d934225d6abbec6f231042b8a9c823ee4a26029..9541fbd06bc000023d6119eff03787ef068178ce 100644 +index 73831000101765845c0881bba217b2ca54eb39dd..9119bf1eac38f9b40d035f702150a7939095266c 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1210,7 +1210,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0854-Optimize-player-lookups-for-beacons.patch b/patches/unapplied/server/0854-Optimize-player-lookups-for-beacons.patch similarity index 100% rename from patches/server/0854-Optimize-player-lookups-for-beacons.patch rename to patches/unapplied/server/0854-Optimize-player-lookups-for-beacons.patch diff --git a/patches/server/0855-Add-Sign-getInteractableSideFor.patch b/patches/unapplied/server/0855-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/server/0855-Add-Sign-getInteractableSideFor.patch rename to patches/unapplied/server/0855-Add-Sign-getInteractableSideFor.patch diff --git a/patches/server/0856-fix-item-meta-for-tadpole-buckets.patch b/patches/unapplied/server/0856-fix-item-meta-for-tadpole-buckets.patch similarity index 100% rename from patches/server/0856-fix-item-meta-for-tadpole-buckets.patch rename to patches/unapplied/server/0856-fix-item-meta-for-tadpole-buckets.patch diff --git a/patches/server/0857-Fix-BanList-API.patch b/patches/unapplied/server/0857-Fix-BanList-API.patch similarity index 99% rename from patches/server/0857-Fix-BanList-API.patch rename to patches/unapplied/server/0857-Fix-BanList-API.patch index 8cd8ecd005..3250071e25 100644 --- a/patches/server/0857-Fix-BanList-API.patch +++ b/patches/unapplied/server/0857-Fix-BanList-API.patch @@ -208,7 +208,7 @@ index 172202accf4448a933fcf1ff820316c7910dd7f7..50ee7656580d386db473c054f5c5ec57 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index c341c64950e2addfcf30655f1cf94bc543bbdba4..abc9c4869994e97b0d6301dd58882f8f7e9383e1 100644 +index 1b9e1038f729582117dc93736f9a089bf6481cff..b41646469bcbde02a1c2254247748bbcbbabddad 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1733,23 +1733,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/unapplied/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch similarity index 100% rename from patches/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch rename to patches/unapplied/server/0858-Determine-lava-and-water-fluid-explosion-resistance-.patch diff --git a/patches/server/0859-Fix-possible-NPE-on-painting-creation.patch b/patches/unapplied/server/0859-Fix-possible-NPE-on-painting-creation.patch similarity index 100% rename from patches/server/0859-Fix-possible-NPE-on-painting-creation.patch rename to patches/unapplied/server/0859-Fix-possible-NPE-on-painting-creation.patch diff --git a/patches/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/unapplied/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch similarity index 100% rename from patches/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch rename to patches/unapplied/server/0860-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch diff --git a/patches/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/unapplied/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch similarity index 93% rename from patches/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch rename to patches/unapplied/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch index 8b1e62e4fc..636b845e45 100644 --- a/patches/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch +++ b/patches/unapplied/server/0861-ExperienceOrb-should-call-EntitySpawnEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] ExperienceOrb should call EntitySpawnEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 67604683e474701ac84b6e0a2f9c93a50978147b..332fb71629dfb281656e6473fb5504557848aab5 100644 +index 16f183c8e81b8c22ca51387e9e35282ed20d651c..97ce8663744041bd57bbb1000f77a05e01156a6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -735,7 +735,8 @@ public class CraftEventFactory { diff --git a/patches/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/unapplied/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch similarity index 100% rename from patches/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch rename to patches/unapplied/server/0862-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch diff --git a/patches/server/0863-Add-whitelist-events.patch b/patches/unapplied/server/0863-Add-whitelist-events.patch similarity index 100% rename from patches/server/0863-Add-whitelist-events.patch rename to patches/unapplied/server/0863-Add-whitelist-events.patch diff --git a/patches/server/0864-Implement-PlayerFailMoveEvent.patch b/patches/unapplied/server/0864-Implement-PlayerFailMoveEvent.patch similarity index 100% rename from patches/server/0864-Implement-PlayerFailMoveEvent.patch rename to patches/unapplied/server/0864-Implement-PlayerFailMoveEvent.patch diff --git a/patches/server/0865-Folia-scheduler-and-owned-region-API.patch b/patches/unapplied/server/0865-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/server/0865-Folia-scheduler-and-owned-region-API.patch rename to patches/unapplied/server/0865-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/server/0866-Only-erase-allay-memory-on-non-item-targets.patch b/patches/unapplied/server/0866-Only-erase-allay-memory-on-non-item-targets.patch similarity index 100% rename from patches/server/0866-Only-erase-allay-memory-on-non-item-targets.patch rename to patches/unapplied/server/0866-Only-erase-allay-memory-on-non-item-targets.patch diff --git a/patches/server/0867-API-for-updating-recipes-on-clients.patch b/patches/unapplied/server/0867-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/server/0867-API-for-updating-recipes-on-clients.patch rename to patches/unapplied/server/0867-API-for-updating-recipes-on-clients.patch diff --git a/patches/server/0868-Fix-rotation-when-spawning-display-entities.patch b/patches/unapplied/server/0868-Fix-rotation-when-spawning-display-entities.patch similarity index 100% rename from patches/server/0868-Fix-rotation-when-spawning-display-entities.patch rename to patches/unapplied/server/0868-Fix-rotation-when-spawning-display-entities.patch diff --git a/patches/server/0869-Only-capture-actual-tree-growth.patch b/patches/unapplied/server/0869-Only-capture-actual-tree-growth.patch similarity index 98% rename from patches/server/0869-Only-capture-actual-tree-growth.patch rename to patches/unapplied/server/0869-Only-capture-actual-tree-growth.patch index 9f209c027a..5c41527169 100644 --- a/patches/server/0869-Only-capture-actual-tree-growth.patch +++ b/patches/unapplied/server/0869-Only-capture-actual-tree-growth.patch @@ -17,7 +17,7 @@ index 5bbadc890a72f1cb22c6881ebcc163b0c06a367a..4fa838bf97ede6e1c893ba64f53aa7af } } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index d7693f2551ee4c5c3be6d3e77b18b7ddfbd6e36c..f309bd640dfac68b9a1cf59bb52d315285b91c2c 100644 +index c27ef32a3fc3edf5a4dd91d7cba93a78a5e762fa..4485199c90e3efbce3e6a18a75703e86a9bdde3c 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -445,6 +445,7 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/unapplied/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch similarity index 100% rename from patches/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch rename to patches/unapplied/server/0870-Use-correct-source-for-mushroom-block-spread-event.patch diff --git a/patches/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/unapplied/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch similarity index 100% rename from patches/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch rename to patches/unapplied/server/0871-Respect-randomizeData-on-more-entities-when-spawning.patch diff --git a/patches/server/0872-Use-correct-seed-on-api-world-load.patch b/patches/unapplied/server/0872-Use-correct-seed-on-api-world-load.patch similarity index 100% rename from patches/server/0872-Use-correct-seed-on-api-world-load.patch rename to patches/unapplied/server/0872-Use-correct-seed-on-api-world-load.patch diff --git a/patches/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/unapplied/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch similarity index 100% rename from patches/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch rename to patches/unapplied/server/0873-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch diff --git a/patches/server/0874-Cache-map-ids-on-item-frames.patch b/patches/unapplied/server/0874-Cache-map-ids-on-item-frames.patch similarity index 100% rename from patches/server/0874-Cache-map-ids-on-item-frames.patch rename to patches/unapplied/server/0874-Cache-map-ids-on-item-frames.patch diff --git a/patches/server/0875-Fix-custom-statistic-criteria-creation.patch b/patches/unapplied/server/0875-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/server/0875-Fix-custom-statistic-criteria-creation.patch rename to patches/unapplied/server/0875-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/server/0876-Bandaid-fix-for-Effect.patch b/patches/unapplied/server/0876-Bandaid-fix-for-Effect.patch similarity index 100% rename from patches/server/0876-Bandaid-fix-for-Effect.patch rename to patches/unapplied/server/0876-Bandaid-fix-for-Effect.patch diff --git a/patches/server/0877-SculkCatalyst-bloom-API.patch b/patches/unapplied/server/0877-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/server/0877-SculkCatalyst-bloom-API.patch rename to patches/unapplied/server/0877-SculkCatalyst-bloom-API.patch diff --git a/patches/server/0878-API-for-an-entity-s-scoreboard-name.patch b/patches/unapplied/server/0878-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/server/0878-API-for-an-entity-s-scoreboard-name.patch rename to patches/unapplied/server/0878-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/unapplied/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/unapplied/server/0879-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/unapplied/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch similarity index 100% rename from patches/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch rename to patches/unapplied/server/0880-Don-t-tab-complete-namespaced-commands-if-send-names.patch diff --git a/patches/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/unapplied/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch similarity index 100% rename from patches/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch rename to patches/unapplied/server/0881-Properly-handle-BlockBreakEvent-isDropItems.patch diff --git a/patches/server/0882-Fire-entity-death-event-for-ender-dragon.patch b/patches/unapplied/server/0882-Fire-entity-death-event-for-ender-dragon.patch similarity index 100% rename from patches/server/0882-Fire-entity-death-event-for-ender-dragon.patch rename to patches/unapplied/server/0882-Fire-entity-death-event-for-ender-dragon.patch diff --git a/patches/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/unapplied/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch similarity index 100% rename from patches/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch rename to patches/unapplied/server/0883-Configurable-entity-tracking-range-by-Y-coordinate.patch diff --git a/patches/server/0884-Add-Listing-API-for-Player.patch b/patches/unapplied/server/0884-Add-Listing-API-for-Player.patch similarity index 99% rename from patches/server/0884-Add-Listing-API-for-Player.patch rename to patches/unapplied/server/0884-Add-Listing-API-for-Player.patch index f380ada607..7e9ecaa392 100644 --- a/patches/server/0884-Add-Listing-API-for-Player.patch +++ b/patches/unapplied/server/0884-Add-Listing-API-for-Player.patch @@ -119,7 +119,7 @@ index ea04eb049e16d1027d15f9863d1fcd16f090c464..0aa28caa1254137c0bae8e213bd08c9a // Paper end - Use single player info update packet on join player.sentListPacket = true; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 1654c04c261f5591df4815423efb55751882de10..4e034c274964a651d6d91a7e1dc39c04e4fba184 100644 +index a06145c8ba3cd88c827bcc354e7dc2dafa3eda32..89268fc4a0570da27c53ad5f5a36cfbc1615c3fb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -199,6 +199,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0885-Configurable-Region-Compression-Format.patch b/patches/unapplied/server/0885-Configurable-Region-Compression-Format.patch similarity index 100% rename from patches/server/0885-Configurable-Region-Compression-Format.patch rename to patches/unapplied/server/0885-Configurable-Region-Compression-Format.patch diff --git a/patches/server/0886-Add-BlockFace-to-BlockDamageEvent.patch b/patches/unapplied/server/0886-Add-BlockFace-to-BlockDamageEvent.patch similarity index 96% rename from patches/server/0886-Add-BlockFace-to-BlockDamageEvent.patch rename to patches/unapplied/server/0886-Add-BlockFace-to-BlockDamageEvent.patch index 570b327293..888a2dd187 100644 --- a/patches/server/0886-Add-BlockFace-to-BlockDamageEvent.patch +++ b/patches/unapplied/server/0886-Add-BlockFace-to-BlockDamageEvent.patch @@ -18,7 +18,7 @@ index 266fd2874293091f7bf49dcb8c9295250ac7286c..dd78a1685bd841577aa9d5010fffda14 if (blockEvent.isCancelled()) { // Let the client know the block still exists diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index fc14a3a64fe18971dcac8d90a062407f1d978fef..ae4a7249adfe707693dea4d2748590b869c2d4f9 100644 +index 97ce8663744041bd57bbb1000f77a05e01156a6c..cdb5fd2642e7c5325f11633de8d58a5a8cdc2c77 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -650,13 +650,13 @@ public class CraftEventFactory { diff --git a/patches/server/0887-Fix-NPE-on-Boat-getStatus.patch b/patches/unapplied/server/0887-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/0887-Fix-NPE-on-Boat-getStatus.patch rename to patches/unapplied/server/0887-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/0888-Expand-Pose-API.patch b/patches/unapplied/server/0888-Expand-Pose-API.patch similarity index 95% rename from patches/server/0888-Expand-Pose-API.patch rename to patches/unapplied/server/0888-Expand-Pose-API.patch index 0cd10176d6..de1b0ed67e 100644 --- a/patches/server/0888-Expand-Pose-API.patch +++ b/patches/unapplied/server/0888-Expand-Pose-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Expand Pose API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 3aeb24963ce0415e97168196cbf53e8f26334013..de841b91b0a0c10c4b9f4dfdd3858c83f81ad183 100644 +index 27d736d34c91c08782fa8fd60742e296580e08f2..73669ce44d3b62183f983365df5a46c10e1458bf 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -420,6 +420,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0889-More-DragonBattle-API.patch b/patches/unapplied/server/0889-More-DragonBattle-API.patch similarity index 100% rename from patches/server/0889-More-DragonBattle-API.patch rename to patches/unapplied/server/0889-More-DragonBattle-API.patch diff --git a/patches/server/0890-Add-PlayerPickItemEvent.patch b/patches/unapplied/server/0890-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/server/0890-Add-PlayerPickItemEvent.patch rename to patches/unapplied/server/0890-Add-PlayerPickItemEvent.patch diff --git a/patches/server/0891-Allow-trident-custom-damage.patch b/patches/unapplied/server/0891-Allow-trident-custom-damage.patch similarity index 100% rename from patches/server/0891-Allow-trident-custom-damage.patch rename to patches/unapplied/server/0891-Allow-trident-custom-damage.patch diff --git a/patches/server/0892-Expose-hand-in-BlockCanBuildEvent.patch b/patches/unapplied/server/0892-Expose-hand-in-BlockCanBuildEvent.patch similarity index 100% rename from patches/server/0892-Expose-hand-in-BlockCanBuildEvent.patch rename to patches/unapplied/server/0892-Expose-hand-in-BlockCanBuildEvent.patch diff --git a/patches/server/0893-Optimize-nearest-structure-border-iteration.patch b/patches/unapplied/server/0893-Optimize-nearest-structure-border-iteration.patch similarity index 100% rename from patches/server/0893-Optimize-nearest-structure-border-iteration.patch rename to patches/unapplied/server/0893-Optimize-nearest-structure-border-iteration.patch diff --git a/patches/server/0894-Implement-OfflinePlayer-isConnected.patch b/patches/unapplied/server/0894-Implement-OfflinePlayer-isConnected.patch similarity index 94% rename from patches/server/0894-Implement-OfflinePlayer-isConnected.patch rename to patches/unapplied/server/0894-Implement-OfflinePlayer-isConnected.patch index 479e78450f..5c57b374ff 100644 --- a/patches/server/0894-Implement-OfflinePlayer-isConnected.patch +++ b/patches/unapplied/server/0894-Implement-OfflinePlayer-isConnected.patch @@ -23,7 +23,7 @@ index 4d654c4f0b6210a9841427789ba70ce5d1d308be..9d93130f23addb18b97d7f5ec013faef public String getName() { Player player = this.getPlayer(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 4e034c274964a651d6d91a7e1dc39c04e4fba184..5da5dc72a0ddb45515bce0ea81825f5368bbd997 100644 +index 89268fc4a0570da27c53ad5f5a36cfbc1615c3fb..357255d58c2ec1e20828a544e5ae9f0927485cef 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -254,6 +254,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0895-Fix-inventory-desync.patch b/patches/unapplied/server/0895-Fix-inventory-desync.patch similarity index 98% rename from patches/server/0895-Fix-inventory-desync.patch rename to patches/unapplied/server/0895-Fix-inventory-desync.patch index aaa16e68f2..27d0fc0515 100644 --- a/patches/server/0895-Fix-inventory-desync.patch +++ b/patches/unapplied/server/0895-Fix-inventory-desync.patch @@ -17,7 +17,7 @@ index a79023c9e3265221e55cae1879f9c0052dafbef6..88ea8ed1b81ece6315bc8dcde04b5fa1 this.containerMenu.findSlot(this.getInventory(), this.getInventory().selected).ifPresent(s -> { this.containerSynchronizer.sendSlotChange(this.containerMenu, s, this.getMainHandItem()); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index babbcee2892990b626afed76b75861f0d42cf571..13c4edabb3671357d07a27d3e6403ed66a5028d5 100644 +index 5b169de9c2a34044dcf46c613291ae56a83ad5d2..80f0831fbd78ece360fe5ea850146a61dbe8c23c 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1466,8 +1466,9 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti diff --git a/patches/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/unapplied/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 98% rename from patches/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/unapplied/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch index e00de009ff..9965aa3045 100644 --- a/patches/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch +++ b/patches/unapplied/server/0896-Add-titleOverride-to-InventoryOpenEvent.patch @@ -79,7 +79,7 @@ index 3d36d79a4e7f16f6face3465cdf54656984f3ebc..41f3cdec7deabf34358b8087df77169f if (!player.isImmobile()) player.connection.send(new ClientboundOpenScreenPacket(container.containerId, windowType, io.papermc.paper.adventure.PaperAdventure.asVanilla(adventure$title))); // Paper - Prevent opening inventories when frozen player.containerMenu = container; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index ae4a7249adfe707693dea4d2748590b869c2d4f9..31c35ccbd84fab60fcf30d0d00f1ee38c05e78ca 100644 +index cdb5fd2642e7c5325f11633de8d58a5a8cdc2c77..64d4246b9d13e6fe8b638c4a6b664f87fc0e66a0 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1381,10 +1381,21 @@ public class CraftEventFactory { diff --git a/patches/server/0897-Configure-sniffer-egg-hatch-time.patch b/patches/unapplied/server/0897-Configure-sniffer-egg-hatch-time.patch similarity index 100% rename from patches/server/0897-Configure-sniffer-egg-hatch-time.patch rename to patches/unapplied/server/0897-Configure-sniffer-egg-hatch-time.patch diff --git a/patches/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/unapplied/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch similarity index 100% rename from patches/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch rename to patches/unapplied/server/0898-Do-crystal-portal-proximity-check-before-entity-look.patch diff --git a/patches/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/unapplied/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch similarity index 100% rename from patches/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch rename to patches/unapplied/server/0899-Skip-POI-finding-if-stuck-in-vehicle.patch diff --git a/patches/server/0900-Add-slot-sanity-checks-in-container-clicks.patch b/patches/unapplied/server/0900-Add-slot-sanity-checks-in-container-clicks.patch similarity index 100% rename from patches/server/0900-Add-slot-sanity-checks-in-container-clicks.patch rename to patches/unapplied/server/0900-Add-slot-sanity-checks-in-container-clicks.patch diff --git a/patches/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/unapplied/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch similarity index 100% rename from patches/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch rename to patches/unapplied/server/0901-Call-BlockRedstoneEvents-for-lecterns.patch diff --git a/patches/server/0902-Allow-proper-checking-of-empty-item-stacks.patch b/patches/unapplied/server/0902-Allow-proper-checking-of-empty-item-stacks.patch similarity index 93% rename from patches/server/0902-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/unapplied/server/0902-Allow-proper-checking-of-empty-item-stacks.patch index 96786bb1b5..4a7f6baa7b 100644 --- a/patches/server/0902-Allow-proper-checking-of-empty-item-stacks.patch +++ b/patches/unapplied/server/0902-Allow-proper-checking-of-empty-item-stacks.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow proper checking of empty item stacks diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 55ae50f99a891a26dcdc0ec6266e3c05b3d12a5e..819e237a8797ab51b7f888b42a013c5198d8fcf6 100644 +index 7c510d673253e53c1cebbe7af2aacbcaa59cb9de..776437ae42865baccab4fb5d3f2715c8f0519b8a 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -36,12 +36,19 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0903-Fix-silent-equipment-change-for-mobs.patch b/patches/unapplied/server/0903-Fix-silent-equipment-change-for-mobs.patch similarity index 98% rename from patches/server/0903-Fix-silent-equipment-change-for-mobs.patch rename to patches/unapplied/server/0903-Fix-silent-equipment-change-for-mobs.patch index 1db9162577..08e06c8e45 100644 --- a/patches/server/0903-Fix-silent-equipment-change-for-mobs.patch +++ b/patches/unapplied/server/0903-Fix-silent-equipment-change-for-mobs.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix silent equipment change for mobs diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 13c4edabb3671357d07a27d3e6403ed66a5028d5..f9a8bcbd58ba450bf6f5f82ae9e08b8bec9a9c4d 100644 +index 80f0831fbd78ece360fe5ea850146a61dbe8c23c..5581fd6656fc13ea1d036d6caab2aba39c5320ac 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -1153,19 +1153,26 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti diff --git a/patches/server/0904-Fix-spigot-s-Forced-Stats.patch b/patches/unapplied/server/0904-Fix-spigot-s-Forced-Stats.patch similarity index 100% rename from patches/server/0904-Fix-spigot-s-Forced-Stats.patch rename to patches/unapplied/server/0904-Fix-spigot-s-Forced-Stats.patch diff --git a/patches/server/0905-Add-missing-InventoryHolders-to-inventories.patch b/patches/unapplied/server/0905-Add-missing-InventoryHolders-to-inventories.patch similarity index 100% rename from patches/server/0905-Add-missing-InventoryHolders-to-inventories.patch rename to patches/unapplied/server/0905-Add-missing-InventoryHolders-to-inventories.patch diff --git a/patches/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/unapplied/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch similarity index 100% rename from patches/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch rename to patches/unapplied/server/0906-Do-not-read-tile-entities-in-chunks-that-are-positio.patch diff --git a/patches/server/0907-Add-missing-logs-for-log-ips-config-option.patch b/patches/unapplied/server/0907-Add-missing-logs-for-log-ips-config-option.patch similarity index 100% rename from patches/server/0907-Add-missing-logs-for-log-ips-config-option.patch rename to patches/unapplied/server/0907-Add-missing-logs-for-log-ips-config-option.patch diff --git a/patches/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/unapplied/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch similarity index 100% rename from patches/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch rename to patches/unapplied/server/0908-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch diff --git a/patches/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/unapplied/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch similarity index 100% rename from patches/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch rename to patches/unapplied/server/0909-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch diff --git a/patches/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/unapplied/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch similarity index 100% rename from patches/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch rename to patches/unapplied/server/0910-Fix-team-sidebar-objectives-not-being-cleared.patch diff --git a/patches/server/0911-Fix-missing-map-initialize-event-call.patch b/patches/unapplied/server/0911-Fix-missing-map-initialize-event-call.patch similarity index 100% rename from patches/server/0911-Fix-missing-map-initialize-event-call.patch rename to patches/unapplied/server/0911-Fix-missing-map-initialize-event-call.patch diff --git a/patches/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/unapplied/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch similarity index 100% rename from patches/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch rename to patches/unapplied/server/0912-Update-entity-data-when-attaching-firework-to-entity.patch diff --git a/patches/server/0913-Fix-UnsafeValues-loadAdvancement.patch b/patches/unapplied/server/0913-Fix-UnsafeValues-loadAdvancement.patch similarity index 100% rename from patches/server/0913-Fix-UnsafeValues-loadAdvancement.patch rename to patches/unapplied/server/0913-Fix-UnsafeValues-loadAdvancement.patch diff --git a/patches/server/0914-Add-player-idle-duration-API.patch b/patches/unapplied/server/0914-Add-player-idle-duration-API.patch similarity index 100% rename from patches/server/0914-Add-player-idle-duration-API.patch rename to patches/unapplied/server/0914-Add-player-idle-duration-API.patch diff --git a/patches/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/unapplied/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch similarity index 100% rename from patches/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch rename to patches/unapplied/server/0915-Don-t-check-if-we-can-see-non-visible-entities.patch diff --git a/patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/unapplied/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch similarity index 100% rename from patches/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch rename to patches/unapplied/server/0916-Fix-NPE-in-SculkBloomEvent-world-access.patch diff --git a/patches/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/unapplied/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch similarity index 90% rename from patches/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch rename to patches/unapplied/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch index 0f038d99ce..5c8534a63f 100644 --- a/patches/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch +++ b/patches/unapplied/server/0917-Allow-null-itemstack-for-Player-sendEquipmentChange.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow null itemstack for Player#sendEquipmentChange diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 027abbde974ff2c4844c3d815230d600140690a4..7fca299a92d330a46336c9fc88156d2ff18f3903 100644 +index af14b09630af4a092491e6b9a7b3f418cc82c0de..e9bd24861bca4554898306117bb533d19171cedf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1125,7 +1125,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0918-Optimize-VarInts.patch b/patches/unapplied/server/0918-Optimize-VarInts.patch similarity index 100% rename from patches/server/0918-Optimize-VarInts.patch rename to patches/unapplied/server/0918-Optimize-VarInts.patch diff --git a/patches/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/unapplied/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/unapplied/server/0919-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/server/0920-Add-predicate-for-blocks-when-raytracing.patch b/patches/unapplied/server/0920-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/server/0920-Add-predicate-for-blocks-when-raytracing.patch rename to patches/unapplied/server/0920-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/unapplied/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch similarity index 100% rename from patches/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch rename to patches/unapplied/server/0921-Broadcast-take-item-packets-with-collector-as-source.patch diff --git a/patches/server/0922-Expand-LingeringPotion-API.patch b/patches/unapplied/server/0922-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/server/0922-Expand-LingeringPotion-API.patch rename to patches/unapplied/server/0922-Expand-LingeringPotion-API.patch diff --git a/patches/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/unapplied/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch similarity index 100% rename from patches/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch rename to patches/unapplied/server/0923-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch diff --git a/patches/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/unapplied/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/unapplied/server/0924-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/server/0925-Fix-several-issues-with-EntityBreedEvent.patch b/patches/unapplied/server/0925-Fix-several-issues-with-EntityBreedEvent.patch similarity index 100% rename from patches/server/0925-Fix-several-issues-with-EntityBreedEvent.patch rename to patches/unapplied/server/0925-Fix-several-issues-with-EntityBreedEvent.patch diff --git a/patches/server/0926-Add-UUID-attribute-modifier-API.patch b/patches/unapplied/server/0926-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/server/0926-Add-UUID-attribute-modifier-API.patch rename to patches/unapplied/server/0926-Add-UUID-attribute-modifier-API.patch diff --git a/patches/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/unapplied/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch similarity index 100% rename from patches/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch rename to patches/unapplied/server/0927-Fix-missing-event-call-for-entity-teleport-API.patch diff --git a/patches/server/0928-Lazily-create-LootContext-for-criterions.patch b/patches/unapplied/server/0928-Lazily-create-LootContext-for-criterions.patch similarity index 100% rename from patches/server/0928-Lazily-create-LootContext-for-criterions.patch rename to patches/unapplied/server/0928-Lazily-create-LootContext-for-criterions.patch diff --git a/patches/server/0929-Don-t-fire-sync-events-during-worldgen.patch b/patches/unapplied/server/0929-Don-t-fire-sync-events-during-worldgen.patch similarity index 98% rename from patches/server/0929-Don-t-fire-sync-events-during-worldgen.patch rename to patches/unapplied/server/0929-Don-t-fire-sync-events-during-worldgen.patch index dc885d181f..2ded3acb8e 100644 --- a/patches/server/0929-Don-t-fire-sync-events-during-worldgen.patch +++ b/patches/unapplied/server/0929-Don-t-fire-sync-events-during-worldgen.patch @@ -31,7 +31,7 @@ index 2da315d288efa66f7bff96923ebd5eac5130ba39..39cf7ae086108d8077121829368b8160 if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on {}", entity, new Throwable()); diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index de841b91b0a0c10c4b9f4dfdd3858c83f81ad183..9e3fef06ff458d8df327acb9eb740f755e2b34de 100644 +index 73669ce44d3b62183f983365df5a46c10e1458bf..948d17b13f07ca0b9160770e3b92d903d1b70407 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -649,7 +649,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -68,7 +68,7 @@ index d769dc472d3f12bf1e30ddd767a76659b734caac..8c7cc9c5af0b8d8bef9b6e2d3d3e723c }, () -> { EntityType.LOGGER.warn("Skipping Entity with id {}", nbt.getString("id")); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b08a7a3ab30a6e4bf8d4dd90022e446444fafa46..853196418b29bb6013fcf22b3bc873a5b06820b7 100644 +index 844da8d55e43607239b54c7cb823cf26f2b04ed1..d0adf2740fe493af2486f78cf015db8bab47e642 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1163,6 +1163,11 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0930-Add-Structure-check-API.patch b/patches/unapplied/server/0930-Add-Structure-check-API.patch similarity index 93% rename from patches/server/0930-Add-Structure-check-API.patch rename to patches/unapplied/server/0930-Add-Structure-check-API.patch index b1501eb55b..faa75398b6 100644 --- a/patches/server/0930-Add-Structure-check-API.patch +++ b/patches/unapplied/server/0930-Add-Structure-check-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Structure check API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 039efd0b8eb141de044668a5633f26eee238c2b0..4a62482b7c73728de8a94542e8978e836540b328 100644 +index 8b4b4017f9874a153c27a96a7df1a966c5bdf4f3..2536a37ab9e5a7aa7373b1880f55cdb8c32a6f53 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -237,6 +237,20 @@ public class CraftWorld extends CraftRegionAccessor implements World { diff --git a/patches/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/unapplied/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch similarity index 100% rename from patches/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch rename to patches/unapplied/server/0931-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch diff --git a/patches/server/0932-Restore-vanilla-entity-drops-behavior.patch b/patches/unapplied/server/0932-Restore-vanilla-entity-drops-behavior.patch similarity index 98% rename from patches/server/0932-Restore-vanilla-entity-drops-behavior.patch rename to patches/unapplied/server/0932-Restore-vanilla-entity-drops-behavior.patch index 860e4ede46..8be1eca73e 100644 --- a/patches/server/0932-Restore-vanilla-entity-drops-behavior.patch +++ b/patches/unapplied/server/0932-Restore-vanilla-entity-drops-behavior.patch @@ -50,7 +50,7 @@ index 9179434d490bc8546ba3a35434998b9fc916e6b2..b032ce115b98af0e0384fb88ca88075e if (entityitem == null) { return null; diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 9e3fef06ff458d8df327acb9eb740f755e2b34de..6342b9142ca6c3e17020911f95a81a4be3ca0401 100644 +index 948d17b13f07ca0b9160770e3b92d903d1b70407..d6ec2fe1a4a004a2d2f7d6e5bfd8fd45b27ebb7a 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2523,6 +2523,25 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -104,7 +104,7 @@ index 9e3fef06ff458d8df327acb9eb740f755e2b34de..6342b9142ca6c3e17020911f95a81a4b return this.spawnAtLocation(entityitem); } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 853196418b29bb6013fcf22b3bc873a5b06820b7..ae63033bab20bec39e0562421e7a3f449648a69d 100644 +index d0adf2740fe493af2486f78cf015db8bab47e642..cb07999629ba2d56602b3ae06ef06e350a8d1fb1 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -266,7 +266,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -165,7 +165,7 @@ index 767f076c6fad7a1146bc409bf47f1d2fc3caf3ce..095a678e3ff7b2bd713fe5bc8542b35a } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 31c35ccbd84fab60fcf30d0d00f1ee38c05e78ca..d94f59e6de51da2c4b261957e8bb21ba90ef9f91 100644 +index 64d4246b9d13e6fe8b638c4a6b664f87fc0e66a0..8b322ade83e8e571af7c2e91a3c0d0784a7b9fad 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -964,18 +964,24 @@ public class CraftEventFactory { diff --git a/patches/server/0933-Dont-resend-blocks-on-interactions.patch b/patches/unapplied/server/0933-Dont-resend-blocks-on-interactions.patch similarity index 99% rename from patches/server/0933-Dont-resend-blocks-on-interactions.patch rename to patches/unapplied/server/0933-Dont-resend-blocks-on-interactions.patch index 5cca0bf242..53693f4954 100644 --- a/patches/server/0933-Dont-resend-blocks-on-interactions.patch +++ b/patches/unapplied/server/0933-Dont-resend-blocks-on-interactions.patch @@ -149,7 +149,7 @@ index 6d494b80ae002aea00afa44adf83dad1ae5bbbc1..49557d6f22c5725c663a231deab019d4 return false; } diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index f309bd640dfac68b9a1cf59bb52d315285b91c2c..3e9caee7322d7ffdb93fd7d063675dddc4c71226 100644 +index 4485199c90e3efbce3e6a18a75703e86a9bdde3c..3f6082b656ec8c9b96b40fbd1c926d5211ffe4c6 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -479,10 +479,12 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/0934-add-more-scoreboard-API.patch b/patches/unapplied/server/0934-add-more-scoreboard-API.patch similarity index 100% rename from patches/server/0934-add-more-scoreboard-API.patch rename to patches/unapplied/server/0934-add-more-scoreboard-API.patch diff --git a/patches/server/0935-Improve-Registry.patch b/patches/unapplied/server/0935-Improve-Registry.patch similarity index 100% rename from patches/server/0935-Improve-Registry.patch rename to patches/unapplied/server/0935-Improve-Registry.patch diff --git a/patches/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/unapplied/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch similarity index 100% rename from patches/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch rename to patches/unapplied/server/0936-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch diff --git a/patches/server/0937-Add-experience-points-API.patch b/patches/unapplied/server/0937-Add-experience-points-API.patch similarity index 95% rename from patches/server/0937-Add-experience-points-API.patch rename to patches/unapplied/server/0937-Add-experience-points-API.patch index 01c02c32f8..177e7f51b5 100644 --- a/patches/server/0937-Add-experience-points-API.patch +++ b/patches/unapplied/server/0937-Add-experience-points-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add experience points API diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 83a205387cb902121aabf0f5082c650debcb734c..dad2b84a2220368f2da005e217d73c63bb540a08 100644 +index 77624e34143dc37ca3b523a81b9a041ffb3199bd..32f6c029bf2f9a16d48ac73ff217c7462c64f175 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -1855,7 +1855,7 @@ public abstract class Player extends LivingEntity { @@ -18,7 +18,7 @@ index 83a205387cb902121aabf0f5082c650debcb734c..dad2b84a2220368f2da005e217d73c63 // Paper start - send while respecting visibility private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 7fca299a92d330a46336c9fc88156d2ff18f3903..8016976d226a421b3e16d281fa3c01be2f8d3eb0 100644 +index e9bd24861bca4554898306117bb533d19171cedf..68a0b6b8650e9e80e8e8c4037d92389cae899d72 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1902,6 +1902,49 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0938-Add-drops-to-shear-events.patch b/patches/unapplied/server/0938-Add-drops-to-shear-events.patch similarity index 99% rename from patches/server/0938-Add-drops-to-shear-events.patch rename to patches/unapplied/server/0938-Add-drops-to-shear-events.patch index 5ad1532f94..a271043b47 100644 --- a/patches/server/0938-Add-drops-to-shear-events.patch +++ b/patches/unapplied/server/0938-Add-drops-to-shear-events.patch @@ -275,7 +275,7 @@ index 9c0bfddd479eef688d2509ad700371c3c860ff1a..e9f9b041ae7195e9d23bd446454b1d8c public boolean readyForShearing() { return !this.isSheared() && this.isAlive(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index d94f59e6de51da2c4b261957e8bb21ba90ef9f91..df82d811e94ee466f2336b8e04bc3441474cc3d2 100644 +index 8b322ade83e8e571af7c2e91a3c0d0784a7b9fad..e20feab675d05ae5b5b19870546585936c757970 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1666,20 +1666,20 @@ public class CraftEventFactory { @@ -306,7 +306,7 @@ index d94f59e6de51da2c4b261957e8bb21ba90ef9f91..df82d811e94ee466f2336b8e04bc3441 public static Cancellable handleStatisticsIncrease(net.minecraft.world.entity.player.Player entityHuman, net.minecraft.stats.Stat statistic, int current, int newValue) { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 819e237a8797ab51b7f888b42a013c5198d8fcf6..f53d6587b2bab3ed8428338950795a62b356c694 100644 +index 776437ae42865baccab4fb5d3f2715c8f0519b8a..520b637e0f281d3d3018681ec7b48b06c47f621e 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -65,6 +65,16 @@ public final class CraftItemStack extends ItemStack { diff --git a/patches/server/0939-Add-PlayerShieldDisableEvent.patch b/patches/unapplied/server/0939-Add-PlayerShieldDisableEvent.patch similarity index 96% rename from patches/server/0939-Add-PlayerShieldDisableEvent.patch rename to patches/unapplied/server/0939-Add-PlayerShieldDisableEvent.patch index 5d2b15dfcb..0d87c9cbf7 100644 --- a/patches/server/0939-Add-PlayerShieldDisableEvent.patch +++ b/patches/unapplied/server/0939-Add-PlayerShieldDisableEvent.patch @@ -16,7 +16,7 @@ sideeffects, meaning the disable event cannot share a handlerlist with the cooldown event diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index dad2b84a2220368f2da005e217d73c63bb540a08..ebb70bfa34750227cda55b56764446833d3e1df6 100644 +index 32f6c029bf2f9a16d48ac73ff217c7462c64f175..9952da86af1a1a050e7485675ca2d6fb83d02422 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -989,7 +989,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0940-Validate-ResourceLocation-in-NBT-reading.patch b/patches/unapplied/server/0940-Validate-ResourceLocation-in-NBT-reading.patch similarity index 97% rename from patches/server/0940-Validate-ResourceLocation-in-NBT-reading.patch rename to patches/unapplied/server/0940-Validate-ResourceLocation-in-NBT-reading.patch index f1217f22a8..80c525575b 100644 --- a/patches/server/0940-Validate-ResourceLocation-in-NBT-reading.patch +++ b/patches/unapplied/server/0940-Validate-ResourceLocation-in-NBT-reading.patch @@ -66,7 +66,7 @@ index 8c7cc9c5af0b8d8bef9b6e2d3d3e723cd76f3212..56b51096ca4147363a843accf6ef2510 @Nullable diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c256b4307e896b3e9f0a399a93db761a8c5c593f..5eda2e858b309d2be704db1015c9c114ed9e63a9 100644 +index b7af45eac986097ef53fa90bb4edd67f8829f13c..958b25e62b040943c346114ef19d56104ae0a844 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -911,12 +911,13 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -85,7 +85,7 @@ index c256b4307e896b3e9f0a399a93db761a8c5c593f..5eda2e858b309d2be704db1015c9c114 if (nbt.contains("Brain", 10)) { diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index f9a8bcbd58ba450bf6f5f82ae9e08b8bec9a9c4d..d680ad6ce6cfc58753a3754a1bd5113fa9778cdc 100644 +index 5581fd6656fc13ea1d036d6caab2aba39c5320ac..748a6d81f409cf91a7aa2c88ded04f1d428cf0f6 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -645,7 +645,7 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Targeti @@ -98,7 +98,7 @@ index f9a8bcbd58ba450bf6f5f82ae9e08b8bec9a9c4d..d680ad6ce6cfc58753a3754a1bd5113f } diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index fc5913910f5614cd3e10cd9c1aa482a4b70ac260..31b8a8bf78d52b5f11b68e780ec09bf78e7bda84 100644 +index f1bf129aecb6840d79c537338e4057557f07790b..5bc4ba7c055992a32197db96d86a3906c11900d8 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -561,7 +561,7 @@ public abstract class AbstractArrow extends Projectile { diff --git a/patches/server/0941-Properly-handle-experience-dropping-on-block-break.patch b/patches/unapplied/server/0941-Properly-handle-experience-dropping-on-block-break.patch similarity index 100% rename from patches/server/0941-Properly-handle-experience-dropping-on-block-break.patch rename to patches/unapplied/server/0941-Properly-handle-experience-dropping-on-block-break.patch diff --git a/patches/server/0942-Fixup-NamespacedKey-handling.patch b/patches/unapplied/server/0942-Fixup-NamespacedKey-handling.patch similarity index 100% rename from patches/server/0942-Fixup-NamespacedKey-handling.patch rename to patches/unapplied/server/0942-Fixup-NamespacedKey-handling.patch diff --git a/patches/server/0943-Expose-LootTable-of-DecoratedPot.patch b/patches/unapplied/server/0943-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/server/0943-Expose-LootTable-of-DecoratedPot.patch rename to patches/unapplied/server/0943-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/unapplied/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch similarity index 100% rename from patches/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch rename to patches/unapplied/server/0944-Reduce-allocation-of-Vec3D-by-entity-tracker.patch diff --git a/patches/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/unapplied/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch similarity index 100% rename from patches/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch rename to patches/unapplied/server/0945-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch diff --git a/patches/server/0946-Add-ShulkerDuplicateEvent.patch b/patches/unapplied/server/0946-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/server/0946-Add-ShulkerDuplicateEvent.patch rename to patches/unapplied/server/0946-Add-ShulkerDuplicateEvent.patch diff --git a/patches/server/0947-Add-api-for-spawn-egg-texture-colors.patch b/patches/unapplied/server/0947-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/server/0947-Add-api-for-spawn-egg-texture-colors.patch rename to patches/unapplied/server/0947-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/server/0948-Add-Lifecycle-Event-system.patch b/patches/unapplied/server/0948-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/server/0948-Add-Lifecycle-Event-system.patch rename to patches/unapplied/server/0948-Add-Lifecycle-Event-system.patch diff --git a/patches/server/0949-ItemStack-Tooltip-API.patch b/patches/unapplied/server/0949-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/server/0949-ItemStack-Tooltip-API.patch rename to patches/unapplied/server/0949-ItemStack-Tooltip-API.patch diff --git a/patches/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/unapplied/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/unapplied/server/0950-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/server/0951-Add-FluidState-API.patch b/patches/unapplied/server/0951-Add-FluidState-API.patch similarity index 98% rename from patches/server/0951-Add-FluidState-API.patch rename to patches/unapplied/server/0951-Add-FluidState-API.patch index de7b959ccc..1eab37c119 100644 --- a/patches/server/0951-Add-FluidState-API.patch +++ b/patches/unapplied/server/0951-Add-FluidState-API.patch @@ -173,7 +173,7 @@ index 0000000000000000000000000000000000000000..c0c2805cb045cdd835b402776a6923fe + +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java -index 0e307c2bb788c1ec856613b0203f5fc7aca7e85d..1d16cd01e55f3e5bb8f49ad4c9f777d30180aab5 100644 +index 5cdc44c73b536f2ed2dcd49dbeccf0f69f614dba..ef1bfab74e93f48c621e7b4a3a54f59b84bdd064 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -107,6 +107,13 @@ public abstract class CraftRegionAccessor implements RegionAccessor { diff --git a/patches/server/0952-add-number-format-api.patch b/patches/unapplied/server/0952-add-number-format-api.patch similarity index 100% rename from patches/server/0952-add-number-format-api.patch rename to patches/unapplied/server/0952-add-number-format-api.patch diff --git a/patches/server/0953-improve-BanList-types.patch b/patches/unapplied/server/0953-improve-BanList-types.patch similarity index 100% rename from patches/server/0953-improve-BanList-types.patch rename to patches/unapplied/server/0953-improve-BanList-types.patch diff --git a/patches/server/0954-Expanded-Hopper-API.patch b/patches/unapplied/server/0954-Expanded-Hopper-API.patch similarity index 100% rename from patches/server/0954-Expanded-Hopper-API.patch rename to patches/unapplied/server/0954-Expanded-Hopper-API.patch diff --git a/patches/server/0955-Add-BlockBreakProgressUpdateEvent.patch b/patches/unapplied/server/0955-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/server/0955-Add-BlockBreakProgressUpdateEvent.patch rename to patches/unapplied/server/0955-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/server/0956-Deprecate-ItemStack-setType.patch b/patches/unapplied/server/0956-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/server/0956-Deprecate-ItemStack-setType.patch rename to patches/unapplied/server/0956-Deprecate-ItemStack-setType.patch diff --git a/patches/server/0957-Add-CartographyItemEvent.patch b/patches/unapplied/server/0957-Add-CartographyItemEvent.patch similarity index 100% rename from patches/server/0957-Add-CartographyItemEvent.patch rename to patches/unapplied/server/0957-Add-CartographyItemEvent.patch diff --git a/patches/server/0958-More-Raid-API.patch b/patches/unapplied/server/0958-More-Raid-API.patch similarity index 100% rename from patches/server/0958-More-Raid-API.patch rename to patches/unapplied/server/0958-More-Raid-API.patch diff --git a/patches/server/0959-Add-onboarding-message-for-initial-server-start.patch b/patches/unapplied/server/0959-Add-onboarding-message-for-initial-server-start.patch similarity index 98% rename from patches/server/0959-Add-onboarding-message-for-initial-server-start.patch rename to patches/unapplied/server/0959-Add-onboarding-message-for-initial-server-start.patch index a409b84b72..ef61e377b2 100644 --- a/patches/server/0959-Add-onboarding-message-for-initial-server-start.patch +++ b/patches/unapplied/server/0959-Add-onboarding-message-for-initial-server-start.patch @@ -29,7 +29,7 @@ index ab5089781b8866cd6ad1b9570634ba84d936cfe7..4de88f74182bb596c6b5ad0351cc0dac return instance; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 187421d19a6d3422612edad650ef15b40ba8c9b9..093a5d49d1a001b3ad5b4a880c60c0cb18874531 100644 +index 2a92268dfc8ee264e4ee6ffc56b40a87e334acc8..1a9e323659dcff12ce53919eb3d6d6f66f835292 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1129,6 +1129,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { String s = String.valueOf(worldserver); diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index ea5a36a192258b2f147b4a820f5cc988eb0e1180..86dcad62f59f68d2eefe2d5df1cdaee0955dc6e3 100644 +index 3f6082b656ec8c9b96b40fbd1c926d5211ffe4c6..066feef97f92b3f788dd6d25d188f2cc36fc4c80 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -801,10 +801,16 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/1016-Improve-performance-of-mass-crafts.patch b/patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch similarity index 100% rename from patches/server/1016-Improve-performance-of-mass-crafts.patch rename to patches/unapplied/server/1016-Improve-performance-of-mass-crafts.patch diff --git a/patches/server/1017-Actually-optimise-explosions.patch b/patches/unapplied/server/1017-Actually-optimise-explosions.patch similarity index 99% rename from patches/server/1017-Actually-optimise-explosions.patch rename to patches/unapplied/server/1017-Actually-optimise-explosions.patch index c770d1ea8e..fa8536ea3c 100644 --- a/patches/server/1017-Actually-optimise-explosions.patch +++ b/patches/unapplied/server/1017-Actually-optimise-explosions.patch @@ -34,7 +34,7 @@ The results indicate that this logic is 5 times faster than Vanilla and 2.3 times faster than Lithium. diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index ff0eb772fb272b0bcdf948e79b284039b55311b0..8611725989cff89d809e6b8837d8dbd7e4da2494 100644 +index ef40b996864c81d7e8fbb0727ea0a96f866c725f..638447e8cb74b26f4f8e3862c2fb4a3048979ebc 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -112,6 +112,271 @@ public class Explosion { diff --git a/patches/server/1018-Optimise-chunk-tick-iteration.patch b/patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch similarity index 99% rename from patches/server/1018-Optimise-chunk-tick-iteration.patch rename to patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch index 6b17ae655d..bc67b755cd 100644 --- a/patches/server/1018-Optimise-chunk-tick-iteration.patch +++ b/patches/unapplied/server/1018-Optimise-chunk-tick-iteration.patch @@ -187,7 +187,7 @@ index ed5154e41ca858f4d6b4d1c276c66831c038d2a6..cdb3c2cde5d9133ef60cf96d91762e6a public String getDebugStatus() { diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 7fbeebe63f755624b967374072aa2e0565ce8c35..36caf354634d6675a3f1ec6829f4778e1d0623bc 100644 +index 01577dbb16ff6abc9edcf897f7fadaad14350184..e2c67c011503c9c37b9d637c0268717baac13e32 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -499,18 +499,10 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/1019-Lag-compensation-ticks.patch b/patches/unapplied/server/1019-Lag-compensation-ticks.patch similarity index 98% rename from patches/server/1019-Lag-compensation-ticks.patch rename to patches/unapplied/server/1019-Lag-compensation-ticks.patch index fdc2829e61..b841ae267d 100644 --- a/patches/server/1019-Lag-compensation-ticks.patch +++ b/patches/unapplied/server/1019-Lag-compensation-ticks.patch @@ -8,7 +8,7 @@ Areas affected by lag comepnsation: - Eating food items diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 810b6099e734a5524e696beb3f25d6ca686625ea..0408d5d54fef7767ecf70e70686ad520d890ff26 100644 +index 6d7224787d328540319c76f904e00cbe96d53565..5df535aae94bbba940da5d21eb72afc945915f4c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -315,6 +315,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java -index 36caf354634d6675a3f1ec6829f4778e1d0623bc..b99f50604bafecbc68835974c9ed0caa91911a40 100644 +index e2c67c011503c9c37b9d637c0268717baac13e32..fcecfda569d2a8d6b8a7e228831f822fb7327748 100644 --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java @@ -447,6 +447,13 @@ public class ServerChunkCache extends ChunkSource { diff --git a/patches/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch b/patches/unapplied/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch similarity index 100% rename from patches/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch rename to patches/unapplied/server/1030-Don-t-lose-removed-data-components-in-ItemMeta.patch diff --git a/patches/server/1031-Add-experimental-improved-give-command.patch b/patches/unapplied/server/1031-Add-experimental-improved-give-command.patch similarity index 100% rename from patches/server/1031-Add-experimental-improved-give-command.patch rename to patches/unapplied/server/1031-Add-experimental-improved-give-command.patch diff --git a/patches/server/1032-Handle-Large-Packets-disconnecting-client.patch b/patches/unapplied/server/1032-Handle-Large-Packets-disconnecting-client.patch similarity index 100% rename from patches/server/1032-Handle-Large-Packets-disconnecting-client.patch rename to patches/unapplied/server/1032-Handle-Large-Packets-disconnecting-client.patch diff --git a/patches/server/1033-Fix-ItemFlags.patch b/patches/unapplied/server/1033-Fix-ItemFlags.patch similarity index 100% rename from patches/server/1033-Fix-ItemFlags.patch rename to patches/unapplied/server/1033-Fix-ItemFlags.patch diff --git a/patches/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/unapplied/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch similarity index 92% rename from patches/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch rename to patches/unapplied/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch index aaade14d1f..76f8306225 100644 --- a/patches/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch +++ b/patches/unapplied/server/1034-Fix-helmet-damage-reduction-inconsistencies.patch @@ -7,7 +7,7 @@ Affect the falling stalactite damage type where the reduction is not applied like in Vanilla diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 9f1c34ea44d00530713baf9fd40993cc5018e999..0cc8e7aa1b1bf29765709c883d11ec8601423737 100644 +index 96070da795755f71e99979288e32b7d7e2d869fb..dfbe0914ab2771ac632fd064719878ac47559e9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1212,7 +1212,7 @@ public class CraftEventFactory { diff --git a/patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/unapplied/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch similarity index 100% rename from patches/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch rename to patches/unapplied/server/1035-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch diff --git a/patches/server/1036-improve-checking-handled-tags-in-itemmeta.patch b/patches/unapplied/server/1036-improve-checking-handled-tags-in-itemmeta.patch similarity index 100% rename from patches/server/1036-improve-checking-handled-tags-in-itemmeta.patch rename to patches/unapplied/server/1036-improve-checking-handled-tags-in-itemmeta.patch diff --git a/patches/server/1037-General-ItemMeta-fixes.patch b/patches/unapplied/server/1037-General-ItemMeta-fixes.patch similarity index 99% rename from patches/server/1037-General-ItemMeta-fixes.patch rename to patches/unapplied/server/1037-General-ItemMeta-fixes.patch index 610c8be06f..0c4bb01b9e 100644 --- a/patches/server/1037-General-ItemMeta-fixes.patch +++ b/patches/unapplied/server/1037-General-ItemMeta-fixes.patch @@ -830,7 +830,7 @@ index 8e0dd4b7a7a25a8beb27b507047bc48d8227627c..77489c3ffaa3a72d4cf105499a77150f } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 705d7365a7bab9fe29b90a175040e6a1623e21a7..8ccb8d71ee489891e8d9128a5520675dd3a62786 100644 +index 5d86861a0df7308ae9b8440e5d9136fa7c8f1835..60aa9dd1617d302c3b49af21d581a32313c171cc 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -175,9 +175,10 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/1038-Expose-hasColor-to-leather-armor.patch b/patches/unapplied/server/1038-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/server/1038-Expose-hasColor-to-leather-armor.patch rename to patches/unapplied/server/1038-Expose-hasColor-to-leather-armor.patch diff --git a/patches/server/1039-Added-API-to-get-player-ha-proxy-address.patch b/patches/unapplied/server/1039-Added-API-to-get-player-ha-proxy-address.patch similarity index 97% rename from patches/server/1039-Added-API-to-get-player-ha-proxy-address.patch rename to patches/unapplied/server/1039-Added-API-to-get-player-ha-proxy-address.patch index a9b47406aa..0c70ba8179 100644 --- a/patches/server/1039-Added-API-to-get-player-ha-proxy-address.patch +++ b/patches/unapplied/server/1039-Added-API-to-get-player-ha-proxy-address.patch @@ -35,7 +35,7 @@ index 52f537b7bfbdeaad9d17c0e88a1ed1c8925a833f..8aff5129f85ab5729b3da2e465871be6 } else { super.channelRead(ctx, msg); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 84ed5dc8c82e28aa93fa0440d90ddb44dc5f3d40..7e6116963d835d4606ef3d93b69d3e44b61288e1 100644 +index 815bcfd90218b932ca004c0f18db8b4de5d35c19..40155cc70ba959eea8011626a30e26f44298c99d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -273,6 +273,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/1040-More-Chest-Block-API.patch b/patches/unapplied/server/1040-More-Chest-Block-API.patch similarity index 100% rename from patches/server/1040-More-Chest-Block-API.patch rename to patches/unapplied/server/1040-More-Chest-Block-API.patch diff --git a/patches/server/1041-Print-data-component-type-on-encoding-error.patch b/patches/unapplied/server/1041-Print-data-component-type-on-encoding-error.patch similarity index 100% rename from patches/server/1041-Print-data-component-type-on-encoding-error.patch rename to patches/unapplied/server/1041-Print-data-component-type-on-encoding-error.patch diff --git a/patches/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/unapplied/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch similarity index 100% rename from patches/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch rename to patches/unapplied/server/1042-Fix-entity-tracker-desync-when-new-players-are-added.patch diff --git a/patches/server/1043-Brigadier-based-command-API.patch b/patches/unapplied/server/1043-Brigadier-based-command-API.patch similarity index 99% rename from patches/server/1043-Brigadier-based-command-API.patch rename to patches/unapplied/server/1043-Brigadier-based-command-API.patch index ea4c736e9f..53a3f8b498 100644 --- a/patches/server/1043-Brigadier-based-command-API.patch +++ b/patches/unapplied/server/1043-Brigadier-based-command-API.patch @@ -2315,7 +2315,7 @@ index a0ec6c3d122ad28d65d37f1b9f82541997b37d37..c6d7ee0d498bd92d4321acd30ade10ab public void tick() { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index eb4fc900164d1fb3a78653ae8bc42ea30323f5b7..2eb9c584cc77237f1c82d880a51a3f8b51008d73 100644 +index 5678414a608623a7698f72173fef87bde44f6aaa..ad967cc2283f902c76e48a59d59cf0dbdacbb5e3 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -233,7 +233,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/1044-Fix-issues-with-Recipe-API.patch b/patches/unapplied/server/1044-Fix-issues-with-Recipe-API.patch similarity index 100% rename from patches/server/1044-Fix-issues-with-Recipe-API.patch rename to patches/unapplied/server/1044-Fix-issues-with-Recipe-API.patch diff --git a/patches/server/1045-Fix-equipment-slot-and-group-API.patch b/patches/unapplied/server/1045-Fix-equipment-slot-and-group-API.patch similarity index 98% rename from patches/server/1045-Fix-equipment-slot-and-group-API.patch rename to patches/unapplied/server/1045-Fix-equipment-slot-and-group-API.patch index 68fc2e9c0f..09ab2e3eed 100644 --- a/patches/server/1045-Fix-equipment-slot-and-group-API.patch +++ b/patches/unapplied/server/1045-Fix-equipment-slot-and-group-API.patch @@ -32,7 +32,7 @@ index 9d74577af071954e1e37201a96368c1360076209..eafa54c870c3e2aef30c3f9f96f51660 throw new IllegalArgumentException("Not implemented. This is a bug"); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 8ccb8d71ee489891e8d9128a5520675dd3a62786..ad51c62b80bfd8f09c57e9ed1e73aad12341293a 100644 +index 60aa9dd1617d302c3b49af21d581a32313c171cc..b6cd6897844aa9c8b9a94e41c56c4cfe4ac78780 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1367,7 +1367,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/unapplied/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/unapplied/server/1046-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/unapplied/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch similarity index 100% rename from patches/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch rename to patches/unapplied/server/1047-Prevent-sending-oversized-item-data-in-equipment-and.patch diff --git a/patches/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/unapplied/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch similarity index 100% rename from patches/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch rename to patches/unapplied/server/1048-Prevent-NPE-if-hooked-entity-was-cleared.patch diff --git a/patches/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/unapplied/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch similarity index 97% rename from patches/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch rename to patches/unapplied/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch index 96084e7275..c740827e5f 100644 --- a/patches/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch +++ b/patches/unapplied/server/1049-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix cancelling BlockPlaceEvent calling onRemove diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java -index 893efb2c4a07c33d41e934279dd914a9dbd4ef79..58c38bc4361ddf24716f326b0c6fc626d434756e 100644 +index 7c7b9b1e0b604b0164b431873e6753b60421f970..f8589837070039b4911a9532b92fa959c7af6352 100644 --- a/src/main/java/net/minecraft/world/item/ItemStack.java +++ b/src/main/java/net/minecraft/world/item/ItemStack.java @@ -473,9 +473,11 @@ public final class ItemStack implements DataComponentHolder { diff --git a/patches/server/1050-Add-missing-fishing-event-state.patch b/patches/unapplied/server/1050-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/server/1050-Add-missing-fishing-event-state.patch rename to patches/unapplied/server/1050-Add-missing-fishing-event-state.patch diff --git a/patches/server/1051-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/unapplied/server/1051-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/server/1051-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/unapplied/server/1051-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/server/1052-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/unapplied/server/1052-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch similarity index 100% rename from patches/server/1052-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch rename to patches/unapplied/server/1052-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch diff --git a/patches/server/1053-Adopt-MaterialRerouting.patch b/patches/unapplied/server/1053-Adopt-MaterialRerouting.patch similarity index 100% rename from patches/server/1053-Adopt-MaterialRerouting.patch rename to patches/unapplied/server/1053-Adopt-MaterialRerouting.patch diff --git a/work/BuildData b/work/BuildData index 32d1baf2f4..ae1e7b1e31 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 32d1baf2f4e0e7cd1ac22c7b2f6eb4c387e8a343 +Subproject commit ae1e7b1e31cd3a3892bb05a6ccdcecc48c73c455 diff --git a/work/Bukkit b/work/Bukkit index 376e37db4b..b0a1d5b748 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 376e37db4b23b1fc18f93d3aeccaa40b8bb16ed2 +Subproject commit b0a1d5b74806be6c64ac48b16fa91b3667fe7541 diff --git a/work/CraftBukkit b/work/CraftBukkit index ee95e171a0..a4c2ee70db 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit ee95e171a0761467c09e0657583a5636d7ae7d3c +Subproject commit a4c2ee70db50ade62436c7eaf6ec1f5376dce192 diff --git a/work/Spigot b/work/Spigot index fcd94e2117..146439e88c 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit fcd94e2117c41a2ff382fc7747bf8776a54d0389 +Subproject commit 146439e88cdda2de5ce54c2a9d6a6cdd9aa8bc1b