aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api')
-rw-r--r--patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch (renamed from patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch)0
-rw-r--r--patches/api/0201-Improve-Arrow-API.patch43
-rw-r--r--patches/api/0202-Support-components-in-ItemMeta.patch (renamed from patches/api/0203-Support-components-in-ItemMeta.patch)2
-rw-r--r--patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch (renamed from patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch)0
-rw-r--r--patches/api/0204-Add-entity-liquid-API.patch (renamed from patches/api/0205-Add-entity-liquid-API.patch)0
-rw-r--r--patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch (renamed from patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch)0
-rw-r--r--patches/api/0206-Add-BellRingEvent.patch (renamed from patches/api/0207-Add-BellRingEvent.patch)0
-rw-r--r--patches/api/0207-Brand-support.patch (renamed from patches/api/0208-Brand-support.patch)0
-rw-r--r--patches/api/0208-Add-moon-phase-API.patch (renamed from patches/api/0209-Add-moon-phase-API.patch)0
-rw-r--r--patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch (renamed from patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch)2
-rw-r--r--patches/api/0210-Add-more-Evoker-API.patch (renamed from patches/api/0211-Add-more-Evoker-API.patch)0
-rw-r--r--patches/api/0211-Add-methods-to-get-translation-keys.patch (renamed from patches/api/0212-Add-methods-to-get-translation-keys.patch)2
-rw-r--r--patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch (renamed from patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch)0
-rw-r--r--patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch (renamed from patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch)0
-rw-r--r--patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch (renamed from patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch)0
-rw-r--r--patches/api/0215-Entity-isTicking.patch (renamed from patches/api/0216-Entity-isTicking.patch)0
-rw-r--r--patches/api/0216-Villager-resetOffers.patch (renamed from patches/api/0217-Villager-resetOffers.patch)0
-rw-r--r--patches/api/0217-Player-elytra-boost-API.patch (renamed from patches/api/0218-Player-elytra-boost-API.patch)0
-rw-r--r--patches/api/0218-Add-getOfflinePlayerIfCached-String.patch (renamed from patches/api/0219-Add-getOfflinePlayerIfCached-String.patch)0
-rw-r--r--patches/api/0219-Add-ignore-discounts-API.patch (renamed from patches/api/0220-Add-ignore-discounts-API.patch)0
-rw-r--r--patches/api/0220-Item-no-age-no-player-pickup.patch (renamed from patches/api/0221-Item-no-age-no-player-pickup.patch)2
-rw-r--r--patches/api/0221-Beacon-API-custom-effect-ranges.patch (renamed from patches/api/0222-Beacon-API-custom-effect-ranges.patch)0
-rw-r--r--patches/api/0222-Add-API-for-quit-reason.patch (renamed from patches/api/0223-Add-API-for-quit-reason.patch)0
-rw-r--r--patches/api/0223-Add-Destroy-Speed-API.patch (renamed from patches/api/0224-Add-Destroy-Speed-API.patch)2
-rw-r--r--patches/api/0224-Add-LivingEntity-clearActiveItem.patch (renamed from patches/api/0225-Add-LivingEntity-clearActiveItem.patch)2
-rw-r--r--patches/api/0225-Add-PlayerItemCooldownEvent.patch (renamed from patches/api/0226-Add-PlayerItemCooldownEvent.patch)0
-rw-r--r--patches/api/0226-More-lightning-API.patch (renamed from patches/api/0227-More-lightning-API.patch)0
-rw-r--r--patches/api/0227-Add-PlayerShearBlockEvent.patch (renamed from patches/api/0228-Add-PlayerShearBlockEvent.patch)0
-rw-r--r--patches/api/0228-Player-Chunk-Load-Unload-Events.patch (renamed from patches/api/0229-Player-Chunk-Load-Unload-Events.patch)0
-rw-r--r--patches/api/0229-Expose-LivingEntity-hurt-direction.patch (renamed from patches/api/0230-Expose-LivingEntity-hurt-direction.patch)2
-rw-r--r--patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch (renamed from patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch)0
-rw-r--r--patches/api/0231-Added-PlayerTradeEvent.patch (renamed from patches/api/0232-Added-PlayerTradeEvent.patch)0
-rw-r--r--patches/api/0232-Add-TargetHitEvent-API.patch (renamed from patches/api/0233-Add-TargetHitEvent-API.patch)0
-rw-r--r--patches/api/0233-Additional-Block-Material-API-s.patch (renamed from patches/api/0234-Additional-Block-Material-API-s.patch)2
-rw-r--r--patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch (renamed from patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch)0
-rw-r--r--patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch (renamed from patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch)0
-rw-r--r--patches/api/0236-Zombie-API-breaking-doors.patch (renamed from patches/api/0237-Zombie-API-breaking-doors.patch)0
-rw-r--r--patches/api/0237-Add-EntityLoadCrossbowEvent.patch (renamed from patches/api/0238-Add-EntityLoadCrossbowEvent.patch)0
-rw-r--r--patches/api/0238-Added-WorldGameRuleChangeEvent.patch (renamed from patches/api/0239-Added-WorldGameRuleChangeEvent.patch)0
-rw-r--r--patches/api/0239-Added-ServerResourcesReloadedEvent.patch (renamed from patches/api/0240-Added-ServerResourcesReloadedEvent.patch)0
-rw-r--r--patches/api/0240-Add-BlockFailedDispenseEvent.patch (renamed from patches/api/0241-Add-BlockFailedDispenseEvent.patch)0
-rw-r--r--patches/api/0241-Added-PlayerLecternPageChangeEvent.patch (renamed from patches/api/0242-Added-PlayerLecternPageChangeEvent.patch)0
-rw-r--r--patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch (renamed from patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch)0
-rw-r--r--patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch (renamed from patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch)0
-rw-r--r--patches/api/0244-Add-sendOpLevel-API.patch (renamed from patches/api/0245-Add-sendOpLevel-API.patch)0
-rw-r--r--patches/api/0245-Add-PaperRegistry.patch (renamed from patches/api/0246-Add-PaperRegistry.patch)0
-rw-r--r--patches/api/0246-Add-StructuresLocateEvent.patch (renamed from patches/api/0247-Add-StructuresLocateEvent.patch)0
-rw-r--r--patches/api/0247-Add-BlockPreDispenseEvent.patch (renamed from patches/api/0248-Add-BlockPreDispenseEvent.patch)0
-rw-r--r--patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch (renamed from patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch)0
-rw-r--r--patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch (renamed from patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch)0
-rw-r--r--patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch (renamed from patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch)0
-rw-r--r--patches/api/0251-add-DragonEggFormEvent.patch (renamed from patches/api/0252-add-DragonEggFormEvent.patch)0
-rw-r--r--patches/api/0252-EntityMoveEvent.patch (renamed from patches/api/0253-EntityMoveEvent.patch)0
-rw-r--r--patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch (renamed from patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch)0
-rw-r--r--patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch (renamed from patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch)0
-rw-r--r--patches/api/0255-living-entity-allow-attribute-registration.patch (renamed from patches/api/0256-living-entity-allow-attribute-registration.patch)0
-rw-r--r--patches/api/0256-Add-missing-effects.patch (renamed from patches/api/0257-Add-missing-effects.patch)0
-rw-r--r--patches/api/0257-Expose-Tracked-Players.patch (renamed from patches/api/0258-Expose-Tracked-Players.patch)0
-rw-r--r--patches/api/0258-Cache-the-result-of-Material-isBlock.patch (renamed from patches/api/0259-Cache-the-result-of-Material-isBlock.patch)0
-rw-r--r--patches/api/0259-Add-worldborder-events.patch (renamed from patches/api/0260-Add-worldborder-events.patch)0
-rw-r--r--patches/api/0260-added-PlayerNameEntityEvent.patch (renamed from patches/api/0261-added-PlayerNameEntityEvent.patch)0
-rw-r--r--patches/api/0261-Add-recipe-to-cook-events.patch (renamed from patches/api/0262-Add-recipe-to-cook-events.patch)0
-rw-r--r--patches/api/0262-Add-Block-isValidTool.patch (renamed from patches/api/0263-Add-Block-isValidTool.patch)0
-rw-r--r--patches/api/0263-Expand-world-key-API.patch (renamed from patches/api/0264-Expand-world-key-API.patch)0
-rw-r--r--patches/api/0264-Item-Rarity-API.patch (renamed from patches/api/0265-Item-Rarity-API.patch)0
-rw-r--r--patches/api/0265-Expose-protocol-version.patch (renamed from patches/api/0266-Expose-protocol-version.patch)0
-rw-r--r--patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch (renamed from patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch)0
-rw-r--r--patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch (renamed from patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch)0
-rw-r--r--patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch (renamed from patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch)0
-rw-r--r--patches/api/0269-Added-PlayerDeepSleepEvent.patch (renamed from patches/api/0270-Added-PlayerDeepSleepEvent.patch)0
-rw-r--r--patches/api/0270-More-World-API.patch (renamed from patches/api/0271-More-World-API.patch)0
-rw-r--r--patches/api/0271-Added-PlayerBedFailEnterEvent.patch (renamed from patches/api/0272-Added-PlayerBedFailEnterEvent.patch)0
-rw-r--r--patches/api/0272-Introduce-beacon-activation-deactivation-events.patch (renamed from patches/api/0273-Introduce-beacon-activation-deactivation-events.patch)0
-rw-r--r--patches/api/0273-PlayerMoveEvent-Improvements.patch (renamed from patches/api/0274-PlayerMoveEvent-Improvements.patch)0
-rw-r--r--patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch (renamed from patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch)0
-rw-r--r--patches/api/0275-Add-more-WanderingTrader-API.patch (renamed from patches/api/0276-Add-more-WanderingTrader-API.patch)0
-rw-r--r--patches/api/0276-Add-EntityBlockStorage-clearEntities.patch (renamed from patches/api/0277-Add-EntityBlockStorage-clearEntities.patch)0
-rw-r--r--patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch (renamed from patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch)0
-rw-r--r--patches/api/0278-Inventory-close.patch (renamed from patches/api/0279-Inventory-close.patch)0
-rw-r--r--patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch (renamed from patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch)0
-rw-r--r--patches/api/0280-Add-basic-Datapack-API.patch (renamed from patches/api/0281-Add-basic-Datapack-API.patch)0
-rw-r--r--patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch (renamed from patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch)0
-rw-r--r--patches/api/0282-ItemStack-repair-check-API.patch (renamed from patches/api/0283-ItemStack-repair-check-API.patch)0
-rw-r--r--patches/api/0283-More-Enchantment-API.patch (renamed from patches/api/0284-More-Enchantment-API.patch)0
-rw-r--r--patches/api/0284-Add-Mob-lookAt-API.patch (renamed from patches/api/0285-Add-Mob-lookAt-API.patch)0
-rw-r--r--patches/api/0285-ItemStack-editMeta.patch (renamed from patches/api/0286-ItemStack-editMeta.patch)0
-rw-r--r--patches/api/0286-Add-EntityInsideBlockEvent.patch (renamed from patches/api/0287-Add-EntityInsideBlockEvent.patch)0
-rw-r--r--patches/api/0287-Attributes-API-for-item-defaults.patch (renamed from patches/api/0288-Attributes-API-for-item-defaults.patch)0
-rw-r--r--patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch (renamed from patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch)0
-rw-r--r--patches/api/0289-More-Lidded-Block-API.patch (renamed from patches/api/0290-More-Lidded-Block-API.patch)0
-rw-r--r--patches/api/0290-Add-PlayerKickEvent-causes.patch (renamed from patches/api/0291-Add-PlayerKickEvent-causes.patch)2
-rw-r--r--patches/api/0291-Add-PufferFishStateChangeEvent.patch (renamed from patches/api/0292-Add-PufferFishStateChangeEvent.patch)0
-rw-r--r--patches/api/0292-Add-BellRevealRaiderEvent.patch (renamed from patches/api/0293-Add-BellRevealRaiderEvent.patch)0
-rw-r--r--patches/api/0293-Add-ElderGuardianAppearanceEvent.patch (renamed from patches/api/0294-Add-ElderGuardianAppearanceEvent.patch)0
-rw-r--r--patches/api/0294-Add-more-line-of-sight-methods.patch (renamed from patches/api/0295-Add-more-line-of-sight-methods.patch)0
-rw-r--r--patches/api/0295-Add-WaterBottleSplashEvent.patch (renamed from patches/api/0296-Add-WaterBottleSplashEvent.patch)0
-rw-r--r--patches/api/0296-Add-more-LimitedRegion-API.patch (renamed from patches/api/0297-Add-more-LimitedRegion-API.patch)0
-rw-r--r--patches/api/0297-Missing-Entity-API.patch (renamed from patches/api/0298-Missing-Entity-API.patch)27
-rw-r--r--patches/api/0298-Adds-PlayerArmSwingEvent.patch (renamed from patches/api/0299-Adds-PlayerArmSwingEvent.patch)0
-rw-r--r--patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch (renamed from patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch)0
-rw-r--r--patches/api/0300-fix-empty-array-elements-in-command-arguments.patch (renamed from patches/api/0301-fix-empty-array-elements-in-command-arguments.patch)0
-rw-r--r--patches/api/0301-Stinger-API.patch (renamed from patches/api/0302-Stinger-API.patch)2
-rw-r--r--patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch (renamed from patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch)0
-rw-r--r--patches/api/0303-Add-PlayerSetSpawnEvent.patch (renamed from patches/api/0304-Add-PlayerSetSpawnEvent.patch)0
-rw-r--r--patches/api/0304-Added-EntityDamageItemEvent.patch (renamed from patches/api/0305-Added-EntityDamageItemEvent.patch)0
-rw-r--r--patches/api/0305-Make-EntityUnleashEvent-cancellable.patch (renamed from patches/api/0306-Make-EntityUnleashEvent-cancellable.patch)0
-rw-r--r--patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch (renamed from patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch)0
-rw-r--r--patches/api/0307-Add-BlockBreakBlockEvent.patch (renamed from patches/api/0308-Add-BlockBreakBlockEvent.patch)0
-rw-r--r--patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch (renamed from patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch)0
-rw-r--r--patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch (renamed from patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch)0
-rw-r--r--patches/api/0310-More-CommandBlock-API.patch (renamed from patches/api/0311-More-CommandBlock-API.patch)0
-rw-r--r--patches/api/0311-Add-missing-team-sidebar-display-slots.patch (renamed from patches/api/0312-Add-missing-team-sidebar-display-slots.patch)0
-rw-r--r--patches/api/0312-add-back-EntityPortalExitEvent.patch (renamed from patches/api/0313-add-back-EntityPortalExitEvent.patch)0
-rw-r--r--patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch (renamed from patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch)0
-rw-r--r--patches/api/0314-Get-entity-default-attributes.patch (renamed from patches/api/0315-Get-entity-default-attributes.patch)0
-rw-r--r--patches/api/0315-Left-handed-API.patch (renamed from patches/api/0316-Left-handed-API.patch)0
-rw-r--r--patches/api/0316-Add-critical-damage-API.patch (renamed from patches/api/0317-Add-critical-damage-API.patch)0
-rw-r--r--patches/api/0317-Add-more-advancement-API.patch (renamed from patches/api/0318-Add-more-advancement-API.patch)0
-rw-r--r--patches/api/0318-Fix-issues-with-mob-conversion.patch (renamed from patches/api/0319-Fix-issues-with-mob-conversion.patch)0
-rw-r--r--patches/api/0319-Add-isCollidable-methods-to-various-places.patch (renamed from patches/api/0320-Add-isCollidable-methods-to-various-places.patch)0
-rw-r--r--patches/api/0320-Goat-ram-API.patch (renamed from patches/api/0321-Goat-ram-API.patch)0
-rw-r--r--patches/api/0321-Add-API-for-resetting-a-single-score.patch (renamed from patches/api/0322-Add-API-for-resetting-a-single-score.patch)0
-rw-r--r--patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch (renamed from patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch)4
-rw-r--r--patches/api/0323-Add-PlayerItemFrameChangeEvent.patch (renamed from patches/api/0324-Add-PlayerItemFrameChangeEvent.patch)0
-rw-r--r--patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch (renamed from patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch)0
-rw-r--r--patches/api/0325-Add-more-Campfire-API.patch (renamed from patches/api/0326-Add-more-Campfire-API.patch)0
-rw-r--r--patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch (renamed from patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch)0
-rw-r--r--patches/api/0327-Improve-scoreboard-entries.patch (renamed from patches/api/0328-Improve-scoreboard-entries.patch)0
-rw-r--r--patches/api/0328-Entity-powdered-snow-API.patch (renamed from patches/api/0329-Entity-powdered-snow-API.patch)4
-rw-r--r--patches/api/0329-Add-API-for-item-entity-health.patch (renamed from patches/api/0330-Add-API-for-item-entity-health.patch)0
-rw-r--r--patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch (renamed from patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch)0
-rw-r--r--patches/api/0331-Bucketable-API.patch (renamed from patches/api/0332-Bucketable-API.patch)0
-rw-r--r--patches/api/0332-System-prop-for-default-config-comment-parsing.patch (renamed from patches/api/0333-System-prop-for-default-config-comment-parsing.patch)0
-rw-r--r--patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch (renamed from patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch)0
-rw-r--r--patches/api/0334-Multiple-Entries-with-Scoreboards.patch (renamed from patches/api/0335-Multiple-Entries-with-Scoreboards.patch)0
-rw-r--r--patches/api/0335-Warn-on-strange-EventHandler-return-types.patch (renamed from patches/api/0336-Warn-on-strange-EventHandler-return-types.patch)0
-rw-r--r--patches/api/0336-Multi-Block-Change-API.patch (renamed from patches/api/0337-Multi-Block-Change-API.patch)2
-rw-r--r--patches/api/0337-Fix-NotePlayEvent.patch (renamed from patches/api/0338-Fix-NotePlayEvent.patch)0
-rw-r--r--patches/api/0338-Freeze-Tick-Lock-API.patch (renamed from patches/api/0339-Freeze-Tick-Lock-API.patch)8
-rw-r--r--patches/api/0339-Dolphin-API.patch (renamed from patches/api/0340-Dolphin-API.patch)0
-rw-r--r--patches/api/0340-More-PotionEffectType-API.patch (renamed from patches/api/0341-More-PotionEffectType-API.patch)0
-rw-r--r--patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch (renamed from patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch)0
-rw-r--r--patches/api/0342-Implement-regenerateChunk.patch (renamed from patches/api/0343-Implement-regenerateChunk.patch)0
-rw-r--r--patches/api/0343-Add-GameEvent-tags.patch (renamed from patches/api/0344-Add-GameEvent-tags.patch)0
-rw-r--r--patches/api/0344-Furnace-RecipesUsed-API.patch (renamed from patches/api/0345-Furnace-RecipesUsed-API.patch)0
-rw-r--r--patches/api/0345-Configurable-sculk-sensor-listener-range.patch (renamed from patches/api/0346-Configurable-sculk-sensor-listener-range.patch)0
-rw-r--r--patches/api/0346-Add-missing-block-data-mins-and-maxes.patch (renamed from patches/api/0347-Add-missing-block-data-mins-and-maxes.patch)0
-rw-r--r--patches/api/0347-Custom-Potion-Mixes.patch (renamed from patches/api/0348-Custom-Potion-Mixes.patch)0
-rw-r--r--patches/api/0348-Expose-furnace-minecart-push-values.patch (renamed from patches/api/0349-Expose-furnace-minecart-push-values.patch)0
-rw-r--r--patches/api/0349-More-Projectile-API.patch (renamed from patches/api/0350-More-Projectile-API.patch)25
-rw-r--r--patches/api/0350-Add-getComputedBiome-API.patch (renamed from patches/api/0351-Add-getComputedBiome-API.patch)0
-rw-r--r--patches/api/0351-Add-enchantWithLevels-API.patch (renamed from patches/api/0352-Add-enchantWithLevels-API.patch)0
-rw-r--r--patches/api/0352-Add-TameableDeathMessageEvent.patch (renamed from patches/api/0353-Add-TameableDeathMessageEvent.patch)0
-rw-r--r--patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch (renamed from patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch)0
-rw-r--r--patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch (renamed from patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch)0
-rw-r--r--patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch (renamed from patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch)0
-rw-r--r--patches/api/0356-WorldCreator-keepSpawnLoaded.patch (renamed from patches/api/0357-WorldCreator-keepSpawnLoaded.patch)0
-rw-r--r--patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch (renamed from patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch)0
-rw-r--r--patches/api/0358-Add-PlayerStopUsingItemEvent.patch (renamed from patches/api/0359-Add-PlayerStopUsingItemEvent.patch)0
-rw-r--r--patches/api/0359-Expand-FallingBlock-API.patch (renamed from patches/api/0360-Expand-FallingBlock-API.patch)0
-rw-r--r--patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch (renamed from patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch)0
-rw-r--r--patches/api/0361-Add-WardenAngerChangeEvent.patch (renamed from patches/api/0362-Add-WardenAngerChangeEvent.patch)0
-rw-r--r--patches/api/0362-Nameable-Banner-API.patch (renamed from patches/api/0363-Nameable-Banner-API.patch)0
-rw-r--r--patches/api/0363-Add-Player-getFishHook.patch (renamed from patches/api/0364-Add-Player-getFishHook.patch)0
-rw-r--r--patches/api/0364-More-Teleport-API.patch (renamed from patches/api/0365-More-Teleport-API.patch)2
-rw-r--r--patches/api/0365-Add-EntityPortalReadyEvent.patch (renamed from patches/api/0366-Add-EntityPortalReadyEvent.patch)0
-rw-r--r--patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch (renamed from patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch)0
-rw-r--r--patches/api/0367-Collision-API.patch (renamed from patches/api/0368-Collision-API.patch)4
-rw-r--r--patches/api/0368-Block-Ticking-API.patch (renamed from patches/api/0369-Block-Ticking-API.patch)0
-rw-r--r--patches/api/0369-Add-NamespacedKey-biome-methods.patch (renamed from patches/api/0370-Add-NamespacedKey-biome-methods.patch)0
-rw-r--r--patches/api/0370-Also-load-resources-from-LibraryLoader.patch (renamed from patches/api/0371-Also-load-resources-from-LibraryLoader.patch)0
-rw-r--r--patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch (renamed from patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch)0
-rw-r--r--patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch (renamed from patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch)0
-rw-r--r--patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch (renamed from patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch)0
-rw-r--r--patches/api/0374-Add-getDrops-to-BlockState.patch (renamed from patches/api/0375-Add-getDrops-to-BlockState.patch)0
-rw-r--r--patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch (renamed from patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch)0
-rw-r--r--patches/api/0376-Elder-Guardian-appearance-API.patch (renamed from patches/api/0377-Elder-Guardian-appearance-API.patch)0
-rw-r--r--patches/api/0377-Allow-changing-bed-s-occupied-property.patch (renamed from patches/api/0378-Allow-changing-bed-s-occupied-property.patch)0
-rw-r--r--patches/api/0378-Add-EquipmentSlot-convenience-methods.patch (renamed from patches/api/0379-Add-EquipmentSlot-convenience-methods.patch)0
-rw-r--r--patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch (renamed from patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch)0
-rw-r--r--patches/api/0380-Add-entity-knockback-API.patch (renamed from patches/api/0381-Add-entity-knockback-API.patch)0
-rw-r--r--patches/api/0381-Added-EntityToggleSitEvent.patch (renamed from patches/api/0382-Added-EntityToggleSitEvent.patch)0
-rw-r--r--patches/api/0382-Add-Moving-Piston-API.patch (renamed from patches/api/0383-Add-Moving-Piston-API.patch)0
-rw-r--r--patches/api/0383-Add-PrePlayerAttackEntityEvent.patch (renamed from patches/api/0384-Add-PrePlayerAttackEntityEvent.patch)0
-rw-r--r--patches/api/0384-Add-Player-Warden-Warning-API.patch (renamed from patches/api/0385-Add-Player-Warden-Warning-API.patch)0
-rw-r--r--patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch (renamed from patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch)0
-rw-r--r--patches/api/0386-Add-paper-dumplisteners-command.patch (renamed from patches/api/0387-Add-paper-dumplisteners-command.patch)0
-rw-r--r--patches/api/0387-ItemStack-damage-API.patch (renamed from patches/api/0388-ItemStack-damage-API.patch)0
-rw-r--r--patches/api/0388-Add-Tick-TemporalUnit.patch (renamed from patches/api/0389-Add-Tick-TemporalUnit.patch)0
-rw-r--r--patches/api/0389-Friction-API.patch (renamed from patches/api/0390-Friction-API.patch)2
-rw-r--r--patches/api/0390-Player-Entity-Tracking-Events.patch (renamed from patches/api/0391-Player-Entity-Tracking-Events.patch)0
-rw-r--r--patches/api/0391-Add-missing-Fluid-type.patch (renamed from patches/api/0392-Add-missing-Fluid-type.patch)0
-rw-r--r--patches/api/0392-fix-Instruments.patch (renamed from patches/api/0393-fix-Instruments.patch)0
-rw-r--r--patches/api/0393-Add-BlockLockCheckEvent.patch (renamed from patches/api/0394-Add-BlockLockCheckEvent.patch)0
-rw-r--r--patches/api/0394-Add-Sneaking-API-for-Entities.patch (renamed from patches/api/0395-Add-Sneaking-API-for-Entities.patch)4
-rw-r--r--patches/api/0395-Improve-PortalEvents.patch (renamed from patches/api/0396-Improve-PortalEvents.patch)0
-rw-r--r--patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch (renamed from patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch)0
-rw-r--r--patches/api/0397-Flying-Fall-Damage-API.patch (renamed from patches/api/0398-Flying-Fall-Damage-API.patch)0
-rw-r--r--patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch (renamed from patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch)0
-rw-r--r--patches/api/0399-Win-Screen-API.patch (renamed from patches/api/0400-Win-Screen-API.patch)2
-rw-r--r--patches/api/0400-Add-Entity-Body-Yaw-API.patch (renamed from patches/api/0401-Add-Entity-Body-Yaw-API.patch)4
-rw-r--r--patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch (renamed from patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch)0
-rw-r--r--patches/api/0402-Add-EntityFertilizeEggEvent.patch (renamed from patches/api/0403-Add-EntityFertilizeEggEvent.patch)0
-rw-r--r--patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch (renamed from patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch)0
-rw-r--r--patches/api/0404-Add-Shearable-API.patch (renamed from patches/api/0405-Add-Shearable-API.patch)2
-rw-r--r--patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch (renamed from patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch)0
-rw-r--r--patches/api/0406-Add-Mob-Experience-reward-API.patch (renamed from patches/api/0407-Add-Mob-Experience-reward-API.patch)0
-rw-r--r--patches/api/0407-Expand-PlayerItemMendEvent.patch (renamed from patches/api/0408-Expand-PlayerItemMendEvent.patch)0
-rw-r--r--patches/api/0408-Add-transient-modifier-API.patch (renamed from patches/api/0409-Add-transient-modifier-API.patch)0
-rw-r--r--patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch (renamed from patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch)0
-rw-r--r--patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch (renamed from patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch)2
-rw-r--r--patches/api/0411-Folia-scheduler-and-owned-region-API.patch (renamed from patches/api/0412-Folia-scheduler-and-owned-region-API.patch)4
-rw-r--r--patches/api/0412-Add-event-for-player-editing-sign.patch (renamed from patches/api/0413-Add-event-for-player-editing-sign.patch)0
-rw-r--r--patches/api/0413-Add-Sign-getInteractableSideFor.patch (renamed from patches/api/0414-Add-Sign-getInteractableSideFor.patch)0
-rw-r--r--patches/api/0414-Fix-BanList-API.patch (renamed from patches/api/0415-Fix-BanList-API.patch)0
-rw-r--r--patches/api/0415-Add-whitelist-events.patch (renamed from patches/api/0416-Add-whitelist-events.patch)0
-rw-r--r--patches/api/0416-API-for-updating-recipes-on-clients.patch (renamed from patches/api/0417-API-for-updating-recipes-on-clients.patch)0
-rw-r--r--patches/api/0417-Add-PlayerFailMoveEvent.patch (renamed from patches/api/0418-Add-PlayerFailMoveEvent.patch)0
-rw-r--r--patches/api/0418-Fix-custom-statistic-criteria-creation.patch (renamed from patches/api/0419-Fix-custom-statistic-criteria-creation.patch)0
-rw-r--r--patches/api/0419-SculkCatalyst-bloom-API.patch (renamed from patches/api/0420-SculkCatalyst-bloom-API.patch)0
-rw-r--r--patches/api/0420-API-for-an-entity-s-scoreboard-name.patch (renamed from patches/api/0421-API-for-an-entity-s-scoreboard-name.patch)4
-rw-r--r--patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch (renamed from patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch)0
-rw-r--r--patches/api/0422-Add-Listing-API-for-Player.patch (renamed from patches/api/0423-Add-Listing-API-for-Player.patch)0
-rw-r--r--patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch (renamed from patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch)0
-rw-r--r--patches/api/0424-Fix-NPE-on-Boat-getStatus.patch (renamed from patches/api/0425-Fix-NPE-on-Boat-getStatus.patch)0
-rw-r--r--patches/api/0425-Expand-Pose-API.patch (renamed from patches/api/0426-Expand-Pose-API.patch)4
-rw-r--r--patches/api/0426-MerchantRecipe-add-copy-constructor.patch (renamed from patches/api/0427-MerchantRecipe-add-copy-constructor.patch)0
-rw-r--r--patches/api/0427-More-DragonBattle-API.patch (renamed from patches/api/0428-More-DragonBattle-API.patch)0
-rw-r--r--patches/api/0428-Add-PlayerPickItemEvent.patch (renamed from patches/api/0429-Add-PlayerPickItemEvent.patch)0
-rw-r--r--patches/api/0429-Allow-trident-custom-damage.patch (renamed from patches/api/0430-Allow-trident-custom-damage.patch)0
-rw-r--r--patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch (renamed from patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch)0
-rw-r--r--patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch (renamed from patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch)0
-rw-r--r--patches/api/0432-Add-OfflinePlayer-isConnected.patch (renamed from patches/api/0433-Add-OfflinePlayer-isConnected.patch)2
-rw-r--r--patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch (renamed from patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch)0
-rw-r--r--patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch (renamed from patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch)0
-rw-r--r--patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch (renamed from patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch)0
-rw-r--r--patches/api/0436-Add-player-idle-duration-API.patch (renamed from patches/api/0437-Add-player-idle-duration-API.patch)0
-rw-r--r--patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch (renamed from patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch)0
-rw-r--r--patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch (renamed from patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch)0
-rw-r--r--patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch (renamed from patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch)0
-rw-r--r--patches/api/0440-Add-UUID-attribute-modifier-API.patch (renamed from patches/api/0441-Add-UUID-attribute-modifier-API.patch)0
-rw-r--r--patches/api/0441-Expand-LingeringPotion-API.patch (renamed from patches/api/0442-Expand-LingeringPotion-API.patch)0
-rw-r--r--patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch (renamed from patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch)0
-rw-r--r--patches/api/0443-Add-Structure-check-API.patch (renamed from patches/api/0444-Add-Structure-check-API.patch)0
-rw-r--r--patches/api/0444-add-missing-Experimental-annotations.patch (renamed from patches/api/0445-add-missing-Experimental-annotations.patch)0
-rw-r--r--patches/api/0445-Add-more-scoreboard-API.patch (renamed from patches/api/0446-Add-more-scoreboard-API.patch)0
-rw-r--r--patches/api/0446-Improve-Registry.patch (renamed from patches/api/0447-Improve-Registry.patch)0
-rw-r--r--patches/api/0447-Add-experience-points-API.patch (renamed from patches/api/0448-Add-experience-points-API.patch)0
-rw-r--r--patches/api/0448-Add-missing-InventoryType.patch (renamed from patches/api/0449-Add-missing-InventoryType.patch)0
-rw-r--r--patches/api/0449-Add-drops-to-shear-events.patch (renamed from patches/api/0450-Add-drops-to-shear-events.patch)0
-rw-r--r--patches/api/0450-Add-HiddenPotionEffect-API.patch (renamed from patches/api/0451-Add-HiddenPotionEffect-API.patch)2
-rw-r--r--patches/api/0451-Add-PlayerShieldDisableEvent.patch (renamed from patches/api/0452-Add-PlayerShieldDisableEvent.patch)0
-rw-r--r--patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch (renamed from patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch)0
-rw-r--r--patches/api/0453-Add-BlockStateMeta-clearBlockState.patch (renamed from patches/api/0454-Add-BlockStateMeta-clearBlockState.patch)0
-rw-r--r--patches/api/0454-Expose-LootTable-of-DecoratedPot.patch (renamed from patches/api/0455-Expose-LootTable-of-DecoratedPot.patch)0
-rw-r--r--patches/api/0455-Add-ShulkerDuplicateEvent.patch (renamed from patches/api/0456-Add-ShulkerDuplicateEvent.patch)0
-rw-r--r--patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch (renamed from patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch)0
-rw-r--r--patches/api/0457-Add-Lifecycle-Event-system.patch (renamed from patches/api/0458-Add-Lifecycle-Event-system.patch)0
-rw-r--r--patches/api/0458-Conduit-API.patch (renamed from patches/api/0459-Conduit-API.patch)0
-rw-r--r--patches/api/0459-ItemStack-Tooltip-API.patch (renamed from patches/api/0460-ItemStack-Tooltip-API.patch)0
-rw-r--r--patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch (renamed from patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch)0
-rw-r--r--patches/api/0461-Add-FluidState-API.patch (renamed from patches/api/0462-Add-FluidState-API.patch)0
-rw-r--r--patches/api/0462-add-number-format-api.patch (renamed from patches/api/0463-add-number-format-api.patch)0
-rw-r--r--patches/api/0463-improve-BanList-types.patch (renamed from patches/api/0464-improve-BanList-types.patch)0
-rw-r--r--patches/api/0464-Suspicious-Effect-Entry-API.patch (renamed from patches/api/0465-Suspicious-Effect-Entry-API.patch)0
-rw-r--r--patches/api/0465-Fix-DamageSource-API.patch (renamed from patches/api/0466-Fix-DamageSource-API.patch)0
-rw-r--r--patches/api/0466-Expanded-Hopper-API.patch (renamed from patches/api/0467-Expanded-Hopper-API.patch)0
-rw-r--r--patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch (renamed from patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch)0
268 files changed, 75 insertions, 96 deletions
diff --git a/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch
index 4fe75c486c..4fe75c486c 100644
--- a/patches/api/0202-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0201-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0201-Improve-Arrow-API.patch b/patches/api/0201-Improve-Arrow-API.patch
deleted file mode 100644
index 1c70418e98..0000000000
--- a/patches/api/0201-Improve-Arrow-API.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nesaak <[email protected]>
-Date: Fri, 22 May 2020 13:35:21 -0400
-Subject: [PATCH] Improve Arrow API
-
-Add method to get the arrow's itemstack and a method
-to set the arrow's "noclip" status
-
-Co-authored-by: Jake Potrebic <[email protected]>
-
-diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index e8e56e89e32d84af0639fe2e9b0eeabd747b6007..225a24898acd25038ea2a8448f9f3b57643d3026 100644
---- a/src/main/java/org/bukkit/entity/AbstractArrow.java
-+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
-@@ -143,6 +143,28 @@ public interface AbstractArrow extends Projectile {
- }
-
- // Paper start
-+ /**
-+ * Gets the ItemStack for this arrow.
-+ *
-+ * @return The ItemStack, as if a player picked up the arrow
-+ */
-+ @NotNull
-+ org.bukkit.inventory.ItemStack getItemStack();
-+
-+ /**
-+ * Sets this arrow to "noclip" status.
-+ *
-+ * @param noPhysics true to set "noclip"
-+ */
-+ void setNoPhysics(boolean noPhysics);
-+
-+ /**
-+ * Gets if this arrow has "noclip".
-+ *
-+ * @return true if noclip is active
-+ */
-+ boolean hasNoPhysics();
-+
- /**
- * Gets the {@link PickupRule} for this arrow.
- *
diff --git a/patches/api/0203-Support-components-in-ItemMeta.patch b/patches/api/0202-Support-components-in-ItemMeta.patch
index 00f7942262..dc804cc5b2 100644
--- a/patches/api/0203-Support-components-in-ItemMeta.patch
+++ b/patches/api/0202-Support-components-in-ItemMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Support components in ItemMeta
diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
-index 420a91a834016d3af95efd79ca92ae45c4f081c4..ea64d5b1ebaa652785ddbc7b515808174f636a62 100644
+index f23c0c942f200a68d2620f225ab90399a9057dfc..478b6d2acbc5788f72db81f387daa08df7837a5d 100644
--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
+++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java
@@ -5,6 +5,7 @@ import java.util.Collection;
diff --git a/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
index 6c725bc833..6c725bc833 100644
--- a/patches/api/0204-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0203-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0205-Add-entity-liquid-API.patch b/patches/api/0204-Add-entity-liquid-API.patch
index ec3be0e7d1..ec3be0e7d1 100644
--- a/patches/api/0205-Add-entity-liquid-API.patch
+++ b/patches/api/0204-Add-entity-liquid-API.patch
diff --git a/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
index 3906e443da..3906e443da 100644
--- a/patches/api/0206-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0205-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0207-Add-BellRingEvent.patch b/patches/api/0206-Add-BellRingEvent.patch
index 2d5cb2a8b3..2d5cb2a8b3 100644
--- a/patches/api/0207-Add-BellRingEvent.patch
+++ b/patches/api/0206-Add-BellRingEvent.patch
diff --git a/patches/api/0208-Brand-support.patch b/patches/api/0207-Brand-support.patch
index 9b1680d885..9b1680d885 100644
--- a/patches/api/0208-Brand-support.patch
+++ b/patches/api/0207-Brand-support.patch
diff --git a/patches/api/0209-Add-moon-phase-API.patch b/patches/api/0208-Add-moon-phase-API.patch
index d949b274a6..d949b274a6 100644
--- a/patches/api/0209-Add-moon-phase-API.patch
+++ b/patches/api/0208-Add-moon-phase-API.patch
diff --git a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0209-Add-playPickupItemAnimation-to-LivingEntity.patch
index 2db07bbf4c..cc0b04bb45 100644
--- a/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0209-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 3f062e0fe9cb632dece9ce3fdc985ab1bf5a425f..590d69f57722a40addf73131fa60e952f303230b 100644
+index 10d76fcd509702042c528fab96b963e9c6d210a5..3969f3c188211838cb576465bd64c0f63ae85080 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1045,5 +1045,28 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0211-Add-more-Evoker-API.patch b/patches/api/0210-Add-more-Evoker-API.patch
index 0d6f0f7328..0d6f0f7328 100644
--- a/patches/api/0211-Add-more-Evoker-API.patch
+++ b/patches/api/0210-Add-more-Evoker-API.patch
diff --git a/patches/api/0212-Add-methods-to-get-translation-keys.patch b/patches/api/0211-Add-methods-to-get-translation-keys.patch
index f203ee5d2c..5af19e4030 100644
--- a/patches/api/0212-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0211-Add-methods-to-get-translation-keys.patch
@@ -282,7 +282,7 @@ index d3087d60378822cdd7cea25fd63d3f496e3cd2fb..5d8fa5b39a5d50cca48ba63af3a84b80
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index a7c58adb6404e04a673bf91d491d7fef56dc890e..85a5e9a3b41798cb3cb6687ed379a5e3eedd698a 100644
+index bf29d9b733afc7c62725d259f4920c4f211cc6d0..1d3812db989a55b6f31bb30dffe70323eb592a15 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch
index 2ed2600f9a..2ed2600f9a 100644
--- a/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0212-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch
index 9512168843..9512168843 100644
--- a/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0213-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
index 8d1a16ed42..8d1a16ed42 100644
--- a/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0214-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0216-Entity-isTicking.patch b/patches/api/0215-Entity-isTicking.patch
index bd622ba9b5..bd622ba9b5 100644
--- a/patches/api/0216-Entity-isTicking.patch
+++ b/patches/api/0215-Entity-isTicking.patch
diff --git a/patches/api/0217-Villager-resetOffers.patch b/patches/api/0216-Villager-resetOffers.patch
index 60fedfba0f..60fedfba0f 100644
--- a/patches/api/0217-Villager-resetOffers.patch
+++ b/patches/api/0216-Villager-resetOffers.patch
diff --git a/patches/api/0218-Player-elytra-boost-API.patch b/patches/api/0217-Player-elytra-boost-API.patch
index 62287ccf59..62287ccf59 100644
--- a/patches/api/0218-Player-elytra-boost-API.patch
+++ b/patches/api/0217-Player-elytra-boost-API.patch
diff --git a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
index de11733eec..de11733eec 100644
--- a/patches/api/0219-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0218-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0220-Add-ignore-discounts-API.patch b/patches/api/0219-Add-ignore-discounts-API.patch
index 89655ddef8..89655ddef8 100644
--- a/patches/api/0220-Add-ignore-discounts-API.patch
+++ b/patches/api/0219-Add-ignore-discounts-API.patch
diff --git a/patches/api/0221-Item-no-age-no-player-pickup.patch b/patches/api/0220-Item-no-age-no-player-pickup.patch
index 5dd7572120..d3be2301af 100644
--- a/patches/api/0221-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0220-Item-no-age-no-player-pickup.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item no age & no player pickup
diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java
-index ab06c640cef1309ab44b0fae8d95df48cdc869a7..48858e1c58c13d786bbc935abedb0f059837833c 100644
+index bfecd0633458586c0352eeb1a95bb57b12f9101e..6239aec4f6c625a814fa4fd610cdc5ab1a9f6e0f 100644
--- a/src/main/java/org/bukkit/entity/Item.java
+++ b/src/main/java/org/bukkit/entity/Item.java
@@ -104,5 +104,34 @@ public interface Item extends Entity {
diff --git a/patches/api/0222-Beacon-API-custom-effect-ranges.patch b/patches/api/0221-Beacon-API-custom-effect-ranges.patch
index effd7b3ae9..effd7b3ae9 100644
--- a/patches/api/0222-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0221-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0223-Add-API-for-quit-reason.patch b/patches/api/0222-Add-API-for-quit-reason.patch
index 0350afaf92..0350afaf92 100644
--- a/patches/api/0223-Add-API-for-quit-reason.patch
+++ b/patches/api/0222-Add-API-for-quit-reason.patch
diff --git a/patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0223-Add-Destroy-Speed-API.patch
index d3bcb47524..cdf304d00b 100644
--- a/patches/api/0224-Add-Destroy-Speed-API.patch
+++ b/patches/api/0223-Add-Destroy-Speed-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Destroy Speed API
Co-authored-by: Jake Potrebic <[email protected]>
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
-index 85a5e9a3b41798cb3cb6687ed379a5e3eedd698a..c1705e518af08841e8154caf183bc808366feb2e 100644
+index 1d3812db989a55b6f31bb30dffe70323eb592a15..4aea4be0677d93e17a4ce98dd340dd9921f996a0 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/0225-Add-LivingEntity-clearActiveItem.patch b/patches/api/0224-Add-LivingEntity-clearActiveItem.patch
index efb08addcb..aa60fb7335 100644
--- a/patches/api/0225-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0224-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 590d69f57722a40addf73131fa60e952f303230b..191a3c3ee46649d2a539597258485752b34fac02 100644
+index 3969f3c188211838cb576465bd64c0f63ae85080..9d58da4686a22893455b9cc75fb8e73a87d2d06d 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -996,6 +996,13 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0226-Add-PlayerItemCooldownEvent.patch b/patches/api/0225-Add-PlayerItemCooldownEvent.patch
index ae5118c7da..ae5118c7da 100644
--- a/patches/api/0226-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0225-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0227-More-lightning-API.patch b/patches/api/0226-More-lightning-API.patch
index c4924dcdf2..c4924dcdf2 100644
--- a/patches/api/0227-More-lightning-API.patch
+++ b/patches/api/0226-More-lightning-API.patch
diff --git a/patches/api/0228-Add-PlayerShearBlockEvent.patch b/patches/api/0227-Add-PlayerShearBlockEvent.patch
index 1506924937..1506924937 100644
--- a/patches/api/0228-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0227-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0229-Player-Chunk-Load-Unload-Events.patch b/patches/api/0228-Player-Chunk-Load-Unload-Events.patch
index c1779bb840..c1779bb840 100644
--- a/patches/api/0229-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0228-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
index 948b10631f..e99a7ce6bb 100644
--- a/patches/api/0230-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0229-Expose-LivingEntity-hurt-direction.patch
@@ -26,7 +26,7 @@ index 94f2c3167f4ce7f5f2b4ecc067739c64af0a2508..4054d2c836342f0e4bcbd33adb13f50d
* 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 191a3c3ee46649d2a539597258485752b34fac02..62d0d2fe3c6dfc9faaa821bde074b623914e4a44 100644
+index 9d58da4686a22893455b9cc75fb8e73a87d2d06d..e9919fce380ec1d0d48b3ac706e7fd31af0be26b 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1075,5 +1075,21 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index 00552e9137..00552e9137 100644
--- a/patches/api/0231-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0230-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0232-Added-PlayerTradeEvent.patch b/patches/api/0231-Added-PlayerTradeEvent.patch
index 11ad019021..11ad019021 100644
--- a/patches/api/0232-Added-PlayerTradeEvent.patch
+++ b/patches/api/0231-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0233-Add-TargetHitEvent-API.patch b/patches/api/0232-Add-TargetHitEvent-API.patch
index 6c68224363..6c68224363 100644
--- a/patches/api/0233-Add-TargetHitEvent-API.patch
+++ b/patches/api/0232-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0234-Additional-Block-Material-API-s.patch b/patches/api/0233-Additional-Block-Material-API-s.patch
index f20f4d9d39..ab3e6f9ac6 100644
--- a/patches/api/0234-Additional-Block-Material-API-s.patch
+++ b/patches/api/0233-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 137a40c708bb67de4608447975867a07240ddc88..3fd364e5875f95296e75dede4c610d3dd3e0038e 100644
+index 4aea4be0677d93e17a4ce98dd340dd9921f996a0..c68ed7de2d50da4105dd38c0986f237e8c56b2d6 100644
--- a/src/main/java/org/bukkit/block/Block.java
+++ b/src/main/java/org/bukkit/block/Block.java
@@ -439,6 +439,42 @@ public interface Block extends Metadatable, Translatable, net.kyori.adventure.tr
diff --git a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
index d297dd5c24..d297dd5c24 100644
--- a/patches/api/0235-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0234-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch
index cb08fd1404..cb08fd1404 100644
--- a/patches/api/0236-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0235-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0237-Zombie-API-breaking-doors.patch b/patches/api/0236-Zombie-API-breaking-doors.patch
index 24118c13ee..24118c13ee 100644
--- a/patches/api/0237-Zombie-API-breaking-doors.patch
+++ b/patches/api/0236-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0238-Add-EntityLoadCrossbowEvent.patch b/patches/api/0237-Add-EntityLoadCrossbowEvent.patch
index 2a60c84538..2a60c84538 100644
--- a/patches/api/0238-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0237-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0239-Added-WorldGameRuleChangeEvent.patch b/patches/api/0238-Added-WorldGameRuleChangeEvent.patch
index 348efda0ca..348efda0ca 100644
--- a/patches/api/0239-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0238-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0240-Added-ServerResourcesReloadedEvent.patch b/patches/api/0239-Added-ServerResourcesReloadedEvent.patch
index 150b70e6cc..150b70e6cc 100644
--- a/patches/api/0240-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0239-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0241-Add-BlockFailedDispenseEvent.patch b/patches/api/0240-Add-BlockFailedDispenseEvent.patch
index 4f480e7417..4f480e7417 100644
--- a/patches/api/0241-Add-BlockFailedDispenseEvent.patch
+++ b/patches/api/0240-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch
index 3c9f223aa5..3c9f223aa5 100644
--- a/patches/api/0242-Added-PlayerLecternPageChangeEvent.patch
+++ b/patches/api/0241-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch
index 766e838ec8..766e838ec8 100644
--- a/patches/api/0243-Added-PlayerLoomPatternSelectEvent.patch
+++ b/patches/api/0242-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
index c25fbd796f..c25fbd796f 100644
--- a/patches/api/0244-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
+++ b/patches/api/0243-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0244-Add-sendOpLevel-API.patch
index 3ea062cd8c..3ea062cd8c 100644
--- a/patches/api/0245-Add-sendOpLevel-API.patch
+++ b/patches/api/0244-Add-sendOpLevel-API.patch
diff --git a/patches/api/0246-Add-PaperRegistry.patch b/patches/api/0245-Add-PaperRegistry.patch
index 8cc1e1b931..8cc1e1b931 100644
--- a/patches/api/0246-Add-PaperRegistry.patch
+++ b/patches/api/0245-Add-PaperRegistry.patch
diff --git a/patches/api/0247-Add-StructuresLocateEvent.patch b/patches/api/0246-Add-StructuresLocateEvent.patch
index 746b674c5d..746b674c5d 100644
--- a/patches/api/0247-Add-StructuresLocateEvent.patch
+++ b/patches/api/0246-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0248-Add-BlockPreDispenseEvent.patch b/patches/api/0247-Add-BlockPreDispenseEvent.patch
index 6a8e491828..6a8e491828 100644
--- a/patches/api/0248-Add-BlockPreDispenseEvent.patch
+++ b/patches/api/0247-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch
index 4d84c9e1b1..4d84c9e1b1 100644
--- a/patches/api/0249-Added-PlayerChangeBeaconEffectEvent.patch
+++ b/patches/api/0248-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch
index 46377a6798..46377a6798 100644
--- a/patches/api/0250-Added-PlayerStonecutterRecipeSelectEvent.patch
+++ b/patches/api/0249-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f85f2a4f26..f85f2a4f26 100644
--- a/patches/api/0251-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/api/0250-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0252-add-DragonEggFormEvent.patch b/patches/api/0251-add-DragonEggFormEvent.patch
index 3b40a9f99d..3b40a9f99d 100644
--- a/patches/api/0252-add-DragonEggFormEvent.patch
+++ b/patches/api/0251-add-DragonEggFormEvent.patch
diff --git a/patches/api/0253-EntityMoveEvent.patch b/patches/api/0252-EntityMoveEvent.patch
index d9e828eb8c..d9e828eb8c 100644
--- a/patches/api/0253-EntityMoveEvent.patch
+++ b/patches/api/0252-EntityMoveEvent.patch
diff --git a/patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch
index c6b7565fe4..c6b7565fe4 100644
--- a/patches/api/0254-Allow-adding-items-to-BlockDropItemEvent.patch
+++ b/patches/api/0253-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch
index 7cc686da5a..7cc686da5a 100644
--- a/patches/api/0255-Add-getMainThreadExecutor-to-BukkitScheduler.patch
+++ b/patches/api/0254-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0256-living-entity-allow-attribute-registration.patch b/patches/api/0255-living-entity-allow-attribute-registration.patch
index e7ded6dabb..e7ded6dabb 100644
--- a/patches/api/0256-living-entity-allow-attribute-registration.patch
+++ b/patches/api/0255-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0257-Add-missing-effects.patch b/patches/api/0256-Add-missing-effects.patch
index 63c42ebfec..63c42ebfec 100644
--- a/patches/api/0257-Add-missing-effects.patch
+++ b/patches/api/0256-Add-missing-effects.patch
diff --git a/patches/api/0258-Expose-Tracked-Players.patch b/patches/api/0257-Expose-Tracked-Players.patch
index f3f9ff4532..f3f9ff4532 100644
--- a/patches/api/0258-Expose-Tracked-Players.patch
+++ b/patches/api/0257-Expose-Tracked-Players.patch
diff --git a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch b/patches/api/0258-Cache-the-result-of-Material-isBlock.patch
index ee04af53bb..ee04af53bb 100644
--- a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0258-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0260-Add-worldborder-events.patch b/patches/api/0259-Add-worldborder-events.patch
index 9f3ae70435..9f3ae70435 100644
--- a/patches/api/0260-Add-worldborder-events.patch
+++ b/patches/api/0259-Add-worldborder-events.patch
diff --git a/patches/api/0261-added-PlayerNameEntityEvent.patch b/patches/api/0260-added-PlayerNameEntityEvent.patch
index 69bd20d13e..69bd20d13e 100644
--- a/patches/api/0261-added-PlayerNameEntityEvent.patch
+++ b/patches/api/0260-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0262-Add-recipe-to-cook-events.patch b/patches/api/0261-Add-recipe-to-cook-events.patch
index 8c8712541e..8c8712541e 100644
--- a/patches/api/0262-Add-recipe-to-cook-events.patch
+++ b/patches/api/0261-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0263-Add-Block-isValidTool.patch b/patches/api/0262-Add-Block-isValidTool.patch
index 835cf73b7a..835cf73b7a 100644
--- a/patches/api/0263-Add-Block-isValidTool.patch
+++ b/patches/api/0262-Add-Block-isValidTool.patch
diff --git a/patches/api/0264-Expand-world-key-API.patch b/patches/api/0263-Expand-world-key-API.patch
index ee70bbcfd2..ee70bbcfd2 100644
--- a/patches/api/0264-Expand-world-key-API.patch
+++ b/patches/api/0263-Expand-world-key-API.patch
diff --git a/patches/api/0265-Item-Rarity-API.patch b/patches/api/0264-Item-Rarity-API.patch
index 5e00725324..5e00725324 100644
--- a/patches/api/0265-Item-Rarity-API.patch
+++ b/patches/api/0264-Item-Rarity-API.patch
diff --git a/patches/api/0266-Expose-protocol-version.patch b/patches/api/0265-Expose-protocol-version.patch
index 0d34eacc4c..0d34eacc4c 100644
--- a/patches/api/0266-Expose-protocol-version.patch
+++ b/patches/api/0265-Expose-protocol-version.patch
diff --git a/patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch
index fc6f6dcab3..fc6f6dcab3 100644
--- a/patches/api/0267-add-isDeeplySleeping-to-HumanEntity.patch
+++ b/patches/api/0266-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch
index 07036efb43..07036efb43 100644
--- a/patches/api/0268-add-consumeFuel-to-FurnaceBurnEvent.patch
+++ b/patches/api/0267-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch
index 836af12518..836af12518 100644
--- a/patches/api/0269-add-get-set-drop-chance-to-EntityEquipment.patch
+++ b/patches/api/0268-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0270-Added-PlayerDeepSleepEvent.patch b/patches/api/0269-Added-PlayerDeepSleepEvent.patch
index b333894788..b333894788 100644
--- a/patches/api/0270-Added-PlayerDeepSleepEvent.patch
+++ b/patches/api/0269-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0271-More-World-API.patch b/patches/api/0270-More-World-API.patch
index a3d88eb648..a3d88eb648 100644
--- a/patches/api/0271-More-World-API.patch
+++ b/patches/api/0270-More-World-API.patch
diff --git a/patches/api/0272-Added-PlayerBedFailEnterEvent.patch b/patches/api/0271-Added-PlayerBedFailEnterEvent.patch
index 6f9decf5fc..6f9decf5fc 100644
--- a/patches/api/0272-Added-PlayerBedFailEnterEvent.patch
+++ b/patches/api/0271-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0273-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch
index 4e173b3d6c..4e173b3d6c 100644
--- a/patches/api/0273-Introduce-beacon-activation-deactivation-events.patch
+++ b/patches/api/0272-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0274-PlayerMoveEvent-Improvements.patch b/patches/api/0273-PlayerMoveEvent-Improvements.patch
index 33cf16e54b..33cf16e54b 100644
--- a/patches/api/0274-PlayerMoveEvent-Improvements.patch
+++ b/patches/api/0273-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch
index c596be8b98..c596be8b98 100644
--- a/patches/api/0275-add-RespawnFlags-to-PlayerRespawnEvent.patch
+++ b/patches/api/0274-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0276-Add-more-WanderingTrader-API.patch b/patches/api/0275-Add-more-WanderingTrader-API.patch
index 99045d4949..99045d4949 100644
--- a/patches/api/0276-Add-more-WanderingTrader-API.patch
+++ b/patches/api/0275-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0277-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch
index 7032ba6155..7032ba6155 100644
--- a/patches/api/0277-Add-EntityBlockStorage-clearEntities.patch
+++ b/patches/api/0276-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
index 16af3a7728..16af3a7728 100644
--- a/patches/api/0278-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
+++ b/patches/api/0277-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0279-Inventory-close.patch b/patches/api/0278-Inventory-close.patch
index 87dfa1a083..87dfa1a083 100644
--- a/patches/api/0279-Inventory-close.patch
+++ b/patches/api/0278-Inventory-close.patch
diff --git a/patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
index 3103f1ce2c..3103f1ce2c 100644
--- a/patches/api/0280-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ b/patches/api/0279-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0281-Add-basic-Datapack-API.patch b/patches/api/0280-Add-basic-Datapack-API.patch
index dafb02a98d..dafb02a98d 100644
--- a/patches/api/0281-Add-basic-Datapack-API.patch
+++ b/patches/api/0280-Add-basic-Datapack-API.patch
diff --git a/patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch
index b2e65ae490..b2e65ae490 100644
--- a/patches/api/0282-additions-to-PlayerGameModeChangeEvent.patch
+++ b/patches/api/0281-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0283-ItemStack-repair-check-API.patch b/patches/api/0282-ItemStack-repair-check-API.patch
index 46650ec4b7..46650ec4b7 100644
--- a/patches/api/0283-ItemStack-repair-check-API.patch
+++ b/patches/api/0282-ItemStack-repair-check-API.patch
diff --git a/patches/api/0284-More-Enchantment-API.patch b/patches/api/0283-More-Enchantment-API.patch
index 98c3ef060b..98c3ef060b 100644
--- a/patches/api/0284-More-Enchantment-API.patch
+++ b/patches/api/0283-More-Enchantment-API.patch
diff --git a/patches/api/0285-Add-Mob-lookAt-API.patch b/patches/api/0284-Add-Mob-lookAt-API.patch
index 0dd5126905..0dd5126905 100644
--- a/patches/api/0285-Add-Mob-lookAt-API.patch
+++ b/patches/api/0284-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0286-ItemStack-editMeta.patch b/patches/api/0285-ItemStack-editMeta.patch
index 5996dc1000..5996dc1000 100644
--- a/patches/api/0286-ItemStack-editMeta.patch
+++ b/patches/api/0285-ItemStack-editMeta.patch
diff --git a/patches/api/0287-Add-EntityInsideBlockEvent.patch b/patches/api/0286-Add-EntityInsideBlockEvent.patch
index 2805c40dcc..2805c40dcc 100644
--- a/patches/api/0287-Add-EntityInsideBlockEvent.patch
+++ b/patches/api/0286-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0288-Attributes-API-for-item-defaults.patch b/patches/api/0287-Attributes-API-for-item-defaults.patch
index 66172a6027..66172a6027 100644
--- a/patches/api/0288-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0287-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch
index 8e5d45d87b..8e5d45d87b 100644
--- a/patches/api/0289-Add-cause-to-Weather-ThunderChangeEvents.patch
+++ b/patches/api/0288-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0290-More-Lidded-Block-API.patch b/patches/api/0289-More-Lidded-Block-API.patch
index a89f206f9a..a89f206f9a 100644
--- a/patches/api/0290-More-Lidded-Block-API.patch
+++ b/patches/api/0289-More-Lidded-Block-API.patch
diff --git a/patches/api/0291-Add-PlayerKickEvent-causes.patch b/patches/api/0290-Add-PlayerKickEvent-causes.patch
index 39657e4039..b23128c57d 100644
--- a/patches/api/0291-Add-PlayerKickEvent-causes.patch
+++ b/patches/api/0290-Add-PlayerKickEvent-causes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerKickEvent causes
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 59821aba66edbef2644bdd21646f556e773a898b..793df7533096efb0f60bddcb3e4e1575cbcc1069 100644
+index d735ed635022d170c6b1080ed87f3c2a799202f6..4906bec154d0f60420fbe2cffa8c7df0918ca61b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -277,6 +277,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0292-Add-PufferFishStateChangeEvent.patch b/patches/api/0291-Add-PufferFishStateChangeEvent.patch
index 7a719777e3..7a719777e3 100644
--- a/patches/api/0292-Add-PufferFishStateChangeEvent.patch
+++ b/patches/api/0291-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0293-Add-BellRevealRaiderEvent.patch b/patches/api/0292-Add-BellRevealRaiderEvent.patch
index c45f89fd4b..c45f89fd4b 100644
--- a/patches/api/0293-Add-BellRevealRaiderEvent.patch
+++ b/patches/api/0292-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0294-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch
index 23897b7390..23897b7390 100644
--- a/patches/api/0294-Add-ElderGuardianAppearanceEvent.patch
+++ b/patches/api/0293-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0295-Add-more-line-of-sight-methods.patch b/patches/api/0294-Add-more-line-of-sight-methods.patch
index 6540c2d0f4..6540c2d0f4 100644
--- a/patches/api/0295-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0294-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0296-Add-WaterBottleSplashEvent.patch b/patches/api/0295-Add-WaterBottleSplashEvent.patch
index f5525245fa..f5525245fa 100644
--- a/patches/api/0296-Add-WaterBottleSplashEvent.patch
+++ b/patches/api/0295-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0297-Add-more-LimitedRegion-API.patch b/patches/api/0296-Add-more-LimitedRegion-API.patch
index 292f95c890..292f95c890 100644
--- a/patches/api/0297-Add-more-LimitedRegion-API.patch
+++ b/patches/api/0296-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0298-Missing-Entity-API.patch b/patches/api/0297-Missing-Entity-API.patch
index 1a3f1b5e63..f9455519bb 100644
--- a/patches/api/0298-Missing-Entity-API.patch
+++ b/patches/api/0297-Missing-Entity-API.patch
@@ -11,6 +11,7 @@ Co-authored-by: booky10 <[email protected]>
Co-authored-by: Amin <[email protected]>
Co-authored-by: TrollyLoki <[email protected]>
Co-authored-by: FireInstall <[email protected]>
+Co-authored-by: maxcom1 <[email protected]>
diff --git a/src/main/java/io/papermc/paper/entity/SchoolableFish.java b/src/main/java/io/papermc/paper/entity/SchoolableFish.java
new file mode 100644
@@ -416,14 +417,14 @@ index 9e7f42caab1204036f4203354c115fd40c6def92..138d2530de2410f4a9424dabd3e5ce0c
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dcd20f180f 100644
+index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..578c22b0aef9c89a3c33b75c33bcdc60bdab6b49 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -283,6 +283,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -283,6 +283,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean isFrozen();
-+ // Paper start - move invisibility up to Entity
++ // Paper start - missing entity api
+ /**
+ * Sets whether the entity is invisible or not.
+ * <p>
@@ -433,15 +434,29 @@ index d68ccecaadcf7a906058e66a750f4cfce5dd7b3f..efe812b4d47df6f8b5ba54ec4526f3dc
+ *
+ * @param invisible If the entity is invisible
+ */
-+ void setInvisible(boolean invisible);
++ void setInvisible(boolean invisible); // Paper - moved up from LivingEntity
+
+ /**
+ * Gets whether the entity is invisible or not.
+ *
+ * @return Whether the entity is invisible
+ */
-+ boolean isInvisible();
-+ // Paper end - move invisibility up to Entity
++ boolean isInvisible(); // Paper - moved up from LivingEntity
++
++ /**
++ * Sets this entities no physics status.
++ *
++ * @param noPhysics boolean indicating if the entity should not have physics.
++ */
++ void setNoPhysics(boolean noPhysics);
++
++ /**
++ * Gets if this entity has no physics.
++ *
++ * @return true if the entity does not have physics.
++ */
++ boolean hasNoPhysics();
++ // Paper end - missing entity api
+
/**
* Mark the entity's removal.
diff --git a/patches/api/0299-Adds-PlayerArmSwingEvent.patch b/patches/api/0298-Adds-PlayerArmSwingEvent.patch
index 48e43517eb..48e43517eb 100644
--- a/patches/api/0299-Adds-PlayerArmSwingEvent.patch
+++ b/patches/api/0298-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch
index 8882c35337..8882c35337 100644
--- a/patches/api/0300-Add-PlayerSignCommandPreprocessEvent.patch
+++ b/patches/api/0299-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0301-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch
index 4b66990211..4b66990211 100644
--- a/patches/api/0301-fix-empty-array-elements-in-command-arguments.patch
+++ b/patches/api/0300-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0302-Stinger-API.patch b/patches/api/0301-Stinger-API.patch
index d2dc349f90..4966f6d228 100644
--- a/patches/api/0302-Stinger-API.patch
+++ b/patches/api/0301-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 6e6b80843a8669b422f93e98343e1da9f8546ee7..d083cffe0b61642bf4c4ea0fecc529090702042f 100644
+index ff89fc699b7aaba982c59ace4effaffc5285ca17..41ca8fea2aede178bdbe87c05588bce4f2faf8e6 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -419,6 +419,52 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
index aefa20a2d9..aefa20a2d9 100644
--- a/patches/api/0303-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
+++ b/patches/api/0302-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0304-Add-PlayerSetSpawnEvent.patch b/patches/api/0303-Add-PlayerSetSpawnEvent.patch
index 42bce4d456..42bce4d456 100644
--- a/patches/api/0304-Add-PlayerSetSpawnEvent.patch
+++ b/patches/api/0303-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0305-Added-EntityDamageItemEvent.patch b/patches/api/0304-Added-EntityDamageItemEvent.patch
index 60513a1cbd..60513a1cbd 100644
--- a/patches/api/0305-Added-EntityDamageItemEvent.patch
+++ b/patches/api/0304-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0306-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch
index e99584c277..e99584c277 100644
--- a/patches/api/0306-Make-EntityUnleashEvent-cancellable.patch
+++ b/patches/api/0305-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch
index d8e53593ae..d8e53593ae 100644
--- a/patches/api/0307-Change-EnderEye-target-without-changing-other-things.patch
+++ b/patches/api/0306-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0308-Add-BlockBreakBlockEvent.patch b/patches/api/0307-Add-BlockBreakBlockEvent.patch
index dd02c33432..dd02c33432 100644
--- a/patches/api/0308-Add-BlockBreakBlockEvent.patch
+++ b/patches/api/0307-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch
index 9dac2fe612..9dac2fe612 100644
--- a/patches/api/0309-Add-helpers-for-left-right-click-to-Action.patch
+++ b/patches/api/0308-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
index 7e61d68783..7e61d68783 100644
--- a/patches/api/0310-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
+++ b/patches/api/0309-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0311-More-CommandBlock-API.patch b/patches/api/0310-More-CommandBlock-API.patch
index c8c52c7587..c8c52c7587 100644
--- a/patches/api/0311-More-CommandBlock-API.patch
+++ b/patches/api/0310-More-CommandBlock-API.patch
diff --git a/patches/api/0312-Add-missing-team-sidebar-display-slots.patch b/patches/api/0311-Add-missing-team-sidebar-display-slots.patch
index cdecbd1764..cdecbd1764 100644
--- a/patches/api/0312-Add-missing-team-sidebar-display-slots.patch
+++ b/patches/api/0311-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0313-add-back-EntityPortalExitEvent.patch b/patches/api/0312-add-back-EntityPortalExitEvent.patch
index 5a153e2345..5a153e2345 100644
--- a/patches/api/0313-add-back-EntityPortalExitEvent.patch
+++ b/patches/api/0312-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch
index c84e83d2de..c84e83d2de 100644
--- a/patches/api/0314-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ b/patches/api/0313-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/0315-Get-entity-default-attributes.patch b/patches/api/0314-Get-entity-default-attributes.patch
index 60dc6739f1..60dc6739f1 100644
--- a/patches/api/0315-Get-entity-default-attributes.patch
+++ b/patches/api/0314-Get-entity-default-attributes.patch
diff --git a/patches/api/0316-Left-handed-API.patch b/patches/api/0315-Left-handed-API.patch
index cae17a697b..cae17a697b 100644
--- a/patches/api/0316-Left-handed-API.patch
+++ b/patches/api/0315-Left-handed-API.patch
diff --git a/patches/api/0317-Add-critical-damage-API.patch b/patches/api/0316-Add-critical-damage-API.patch
index f04ac65ac5..f04ac65ac5 100644
--- a/patches/api/0317-Add-critical-damage-API.patch
+++ b/patches/api/0316-Add-critical-damage-API.patch
diff --git a/patches/api/0318-Add-more-advancement-API.patch b/patches/api/0317-Add-more-advancement-API.patch
index 179dbdc225..179dbdc225 100644
--- a/patches/api/0318-Add-more-advancement-API.patch
+++ b/patches/api/0317-Add-more-advancement-API.patch
diff --git a/patches/api/0319-Fix-issues-with-mob-conversion.patch b/patches/api/0318-Fix-issues-with-mob-conversion.patch
index f451d967b6..f451d967b6 100644
--- a/patches/api/0319-Fix-issues-with-mob-conversion.patch
+++ b/patches/api/0318-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0320-Add-isCollidable-methods-to-various-places.patch b/patches/api/0319-Add-isCollidable-methods-to-various-places.patch
index a3abc4242a..a3abc4242a 100644
--- a/patches/api/0320-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0319-Add-isCollidable-methods-to-various-places.patch
diff --git a/patches/api/0321-Goat-ram-API.patch b/patches/api/0320-Goat-ram-API.patch
index 06d426a786..06d426a786 100644
--- a/patches/api/0321-Goat-ram-API.patch
+++ b/patches/api/0320-Goat-ram-API.patch
diff --git a/patches/api/0322-Add-API-for-resetting-a-single-score.patch b/patches/api/0321-Add-API-for-resetting-a-single-score.patch
index 14142e8f6c..14142e8f6c 100644
--- a/patches/api/0322-Add-API-for-resetting-a-single-score.patch
+++ b/patches/api/0321-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch
index f378113a44..0f3a5bae4e 100644
--- a/patches/api/0323-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0322-Add-Raw-Byte-Entity-Serialization.patch
@@ -24,10 +24,10 @@ index 434fde52986ba07d7209ff47483f74fe31e8ebe7..0c7204e390f44b649fc26cd46152abeb
* Creates and returns the next EntityId available.
* <p>
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index efe812b4d47df6f8b5ba54ec4526f3dcd20f180f..a09640dce6f61f808f516f5569e08e9e6a2f2b53 100644
+index 9272c15619f623dc39d9c9046fd6463674c37264..9cb84eababf159b04618a605ff03cdaee72c9502 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -911,5 +911,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -925,5 +925,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@Deprecated
@NotNull Set<Player> getTrackedPlayers();
diff --git a/patches/api/0324-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch
index b5d6cf7bd1..b5d6cf7bd1 100644
--- a/patches/api/0324-Add-PlayerItemFrameChangeEvent.patch
+++ b/patches/api/0323-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
index e8f75d98e2..e8f75d98e2 100644
--- a/patches/api/0325-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0324-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0326-Add-more-Campfire-API.patch b/patches/api/0325-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0326-Add-more-Campfire-API.patch
+++ b/patches/api/0325-Add-more-Campfire-API.patch
diff --git a/patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 5f5a4f4140..5f5a4f4140 100644
--- a/patches/api/0327-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
+++ b/patches/api/0326-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0328-Improve-scoreboard-entries.patch b/patches/api/0327-Improve-scoreboard-entries.patch
index 0dcc796b4d..0dcc796b4d 100644
--- a/patches/api/0328-Improve-scoreboard-entries.patch
+++ b/patches/api/0327-Improve-scoreboard-entries.patch
diff --git a/patches/api/0329-Entity-powdered-snow-API.patch b/patches/api/0328-Entity-powdered-snow-API.patch
index b5b1dbedbd..2b48461850 100644
--- a/patches/api/0329-Entity-powdered-snow-API.patch
+++ b/patches/api/0328-Entity-powdered-snow-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity powdered snow API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a09640dce6f61f808f516f5569e08e9e6a2f2b53..336cd1830182d4aac0fc7b5be629da4fc78c5cf8 100644
+index 9cb84eababf159b04618a605ff03cdaee72c9502..a7b37ba26d8999a78a747fe5a41e15327ae3a2ee 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -938,5 +938,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -952,5 +952,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return Whether the entity was successfully spawned.
*/
public boolean spawnAt(@NotNull Location location, @NotNull org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason);
diff --git a/patches/api/0330-Add-API-for-item-entity-health.patch b/patches/api/0329-Add-API-for-item-entity-health.patch
index 572034e557..572034e557 100644
--- a/patches/api/0330-Add-API-for-item-entity-health.patch
+++ b/patches/api/0329-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0331-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0330-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0332-Bucketable-API.patch b/patches/api/0331-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0332-Bucketable-API.patch
+++ b/patches/api/0331-Bucketable-API.patch
diff --git a/patches/api/0333-System-prop-for-default-config-comment-parsing.patch b/patches/api/0332-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0333-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0332-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0334-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0333-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0335-Multiple-Entries-with-Scoreboards.patch b/patches/api/0334-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0335-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0334-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0336-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0336-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0335-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0337-Multi-Block-Change-API.patch b/patches/api/0336-Multi-Block-Change-API.patch
index 45664f22b3..8aa5be5a5c 100644
--- a/patches/api/0337-Multi-Block-Change-API.patch
+++ b/patches/api/0336-Multi-Block-Change-API.patch
@@ -5,7 +5,7 @@ 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 793df7533096efb0f60bddcb3e4e1575cbcc1069..c8a50647d34c70bc927c33c602f938a01bf6e7a9 100644
+index 4906bec154d0f60420fbe2cffa8c7df0918ca61b..2501533048e4de25672d9cc0a52fa1150e6d8adb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -895,6 +895,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0338-Fix-NotePlayEvent.patch b/patches/api/0337-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0338-Fix-NotePlayEvent.patch
+++ b/patches/api/0337-Fix-NotePlayEvent.patch
diff --git a/patches/api/0339-Freeze-Tick-Lock-API.patch b/patches/api/0338-Freeze-Tick-Lock-API.patch
index ae7c328cc6..f7ef909291 100644
--- a/patches/api/0339-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0338-Freeze-Tick-Lock-API.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Freeze Tick Lock API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 336cd1830182d4aac0fc7b5be629da4fc78c5cf8..5be7daff9077f35aa1d3abf747f7d147a1532b55 100644
+index a7b37ba26d8999a78a747fe5a41e15327ae3a2ee..9b5fe55399594c57c1b1521bea03781fd99fdf60 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -303,6 +303,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
- boolean isInvisible();
- // Paper end - move invisibility up to Entity
+@@ -317,6 +317,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+ boolean hasNoPhysics();
+ // Paper end - missing entity api
+ // Paper start - Freeze Tick Lock API
+ /**
diff --git a/patches/api/0340-Dolphin-API.patch b/patches/api/0339-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0340-Dolphin-API.patch
+++ b/patches/api/0339-Dolphin-API.patch
diff --git a/patches/api/0341-More-PotionEffectType-API.patch b/patches/api/0340-More-PotionEffectType-API.patch
index 7e3682f8b4..7e3682f8b4 100644
--- a/patches/api/0341-More-PotionEffectType-API.patch
+++ b/patches/api/0340-More-PotionEffectType-API.patch
diff --git a/patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
index 5c1c336819..5c1c336819 100644
--- a/patches/api/0342-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0341-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0343-Implement-regenerateChunk.patch b/patches/api/0342-Implement-regenerateChunk.patch
index 8023a26d0f..8023a26d0f 100644
--- a/patches/api/0343-Implement-regenerateChunk.patch
+++ b/patches/api/0342-Implement-regenerateChunk.patch
diff --git a/patches/api/0344-Add-GameEvent-tags.patch b/patches/api/0343-Add-GameEvent-tags.patch
index 1bbdc9c696..1bbdc9c696 100644
--- a/patches/api/0344-Add-GameEvent-tags.patch
+++ b/patches/api/0343-Add-GameEvent-tags.patch
diff --git a/patches/api/0345-Furnace-RecipesUsed-API.patch b/patches/api/0344-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0345-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0344-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0346-Configurable-sculk-sensor-listener-range.patch b/patches/api/0345-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0346-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0345-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0347-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch
index 600497b952..600497b952 100644
--- a/patches/api/0347-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0346-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0348-Custom-Potion-Mixes.patch b/patches/api/0347-Custom-Potion-Mixes.patch
index 3881038adb..3881038adb 100644
--- a/patches/api/0348-Custom-Potion-Mixes.patch
+++ b/patches/api/0347-Custom-Potion-Mixes.patch
diff --git a/patches/api/0349-Expose-furnace-minecart-push-values.patch b/patches/api/0348-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0349-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0348-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0350-More-Projectile-API.patch b/patches/api/0349-More-Projectile-API.patch
index 569c337346..dcad065186 100644
--- a/patches/api/0350-More-Projectile-API.patch
+++ b/patches/api/0349-More-Projectile-API.patch
@@ -6,13 +6,22 @@ Subject: [PATCH] More Projectile API
Co-authored-by: Nassim Jahnke <[email protected]>
diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java
-index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce221ec474 100644
+index e8e56e89e32d84af0639fe2e9b0eeabd747b6007..2d7521b71ec16e1b229bbe4c05d51673720df475 100644
--- a/src/main/java/org/bukkit/entity/AbstractArrow.java
+++ b/src/main/java/org/bukkit/entity/AbstractArrow.java
-@@ -151,6 +151,36 @@ public interface AbstractArrow extends Projectile {
- @NotNull
- org.bukkit.inventory.ItemStack getItemStack();
-
+@@ -174,5 +174,43 @@ public interface AbstractArrow extends Projectile {
+ ALLOWED,
+ CREATIVE_ONLY;
+ }
++
++ /**
++ * Gets the ItemStack for this arrow.
++ *
++ * @return The ItemStack, as if a player picked up the arrow
++ */
++ @NotNull
++ org.bukkit.inventory.ItemStack getItemStack();
++
+ /**
+ * Sets the amount of ticks this arrow has been alive in the world
+ * This is used to determine when the arrow should be automatically despawned.
@@ -42,10 +51,8 @@ index 225a24898acd25038ea2a8448f9f3b57643d3026..d173010d51d05928c35bb4bf5fbc08ce
+ * @param sound sound that is played
+ */
+ void setHitSound(@NotNull org.bukkit.Sound sound);
-+
- /**
- * Sets this arrow to "noclip" status.
- *
+ // Paper end
+ }
diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java
index 0d31aa0b22cf1e849572294e2cfe38b48c9210af..217d348ad0bbef720b25d3b507a55ca8105b7731 100644
--- a/src/main/java/org/bukkit/entity/Firework.java
diff --git a/patches/api/0351-Add-getComputedBiome-API.patch b/patches/api/0350-Add-getComputedBiome-API.patch
index 6d24c2c66a..6d24c2c66a 100644
--- a/patches/api/0351-Add-getComputedBiome-API.patch
+++ b/patches/api/0350-Add-getComputedBiome-API.patch
diff --git a/patches/api/0352-Add-enchantWithLevels-API.patch b/patches/api/0351-Add-enchantWithLevels-API.patch
index 1c94264d8f..1c94264d8f 100644
--- a/patches/api/0352-Add-enchantWithLevels-API.patch
+++ b/patches/api/0351-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0353-Add-TameableDeathMessageEvent.patch b/patches/api/0352-Add-TameableDeathMessageEvent.patch
index aec53f13ba..aec53f13ba 100644
--- a/patches/api/0353-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0352-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0354-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0353-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0355-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/api/0354-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0356-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0355-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0357-WorldCreator-keepSpawnLoaded.patch b/patches/api/0356-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0357-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0356-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index 9b70c2dc74..9b70c2dc74 100644
--- a/patches/api/0358-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0357-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0359-Add-PlayerStopUsingItemEvent.patch b/patches/api/0358-Add-PlayerStopUsingItemEvent.patch
index c8de1f6ed0..c8de1f6ed0 100644
--- a/patches/api/0359-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0358-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0360-Expand-FallingBlock-API.patch b/patches/api/0359-Expand-FallingBlock-API.patch
index bbff3129a4..bbff3129a4 100644
--- a/patches/api/0360-Expand-FallingBlock-API.patch
+++ b/patches/api/0359-Expand-FallingBlock-API.patch
diff --git a/patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch
index 91e4d0fdac..91e4d0fdac 100644
--- a/patches/api/0361-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0360-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0362-Add-WardenAngerChangeEvent.patch b/patches/api/0361-Add-WardenAngerChangeEvent.patch
index 4291ccd615..4291ccd615 100644
--- a/patches/api/0362-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0361-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0363-Nameable-Banner-API.patch b/patches/api/0362-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0363-Nameable-Banner-API.patch
+++ b/patches/api/0362-Nameable-Banner-API.patch
diff --git a/patches/api/0364-Add-Player-getFishHook.patch b/patches/api/0363-Add-Player-getFishHook.patch
index 291eac5db5..291eac5db5 100644
--- a/patches/api/0364-Add-Player-getFishHook.patch
+++ b/patches/api/0363-Add-Player-getFishHook.patch
diff --git a/patches/api/0365-More-Teleport-API.patch b/patches/api/0364-More-Teleport-API.patch
index e3595a1947..f158c47e4e 100644
--- a/patches/api/0365-More-Teleport-API.patch
+++ b/patches/api/0364-More-Teleport-API.patch
@@ -120,7 +120,7 @@ index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae5
+
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7..948d6a08ff459afd5d4d5b151c41d94d1d5847b6 100644
+index 9b5fe55399594c57c1b1521bea03781fd99fdf60..e2f315db8d137d7bc1b6fc83ed29032152f881f2 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
diff --git a/patches/api/0366-Add-EntityPortalReadyEvent.patch b/patches/api/0365-Add-EntityPortalReadyEvent.patch
index b9321a8e0d..b9321a8e0d 100644
--- a/patches/api/0366-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0365-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch
index 90d9c68dee..90d9c68dee 100644
--- a/patches/api/0367-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0366-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0368-Collision-API.patch b/patches/api/0367-Collision-API.patch
index 61881abf50..b7bf3a1ae3 100644
--- a/patches/api/0368-Collision-API.patch
+++ b/patches/api/0367-Collision-API.patch
@@ -25,10 +25,10 @@ index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 82c9e07a059bc481d877c7fbb2fbf866bf607017..7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9 100644
+index e2f315db8d137d7bc1b6fc83ed29032152f881f2..4951afd12de6145f671bae40a4df6e2222bc3fd8 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -988,4 +988,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1002,4 +1002,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean isInPowderedSnow();
// Paper end
diff --git a/patches/api/0369-Block-Ticking-API.patch b/patches/api/0368-Block-Ticking-API.patch
index aba95a2d13..aba95a2d13 100644
--- a/patches/api/0369-Block-Ticking-API.patch
+++ b/patches/api/0368-Block-Ticking-API.patch
diff --git a/patches/api/0370-Add-NamespacedKey-biome-methods.patch b/patches/api/0369-Add-NamespacedKey-biome-methods.patch
index f11f727f1a..f11f727f1a 100644
--- a/patches/api/0370-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0369-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0371-Also-load-resources-from-LibraryLoader.patch b/patches/api/0370-Also-load-resources-from-LibraryLoader.patch
index c2a41c2e53..c2a41c2e53 100644
--- a/patches/api/0371-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0370-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch
index 9b71f12681..9b71f12681 100644
--- a/patches/api/0372-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0371-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0373-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0372-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0374-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0373-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0375-Add-getDrops-to-BlockState.patch b/patches/api/0374-Add-getDrops-to-BlockState.patch
index 0a8d8ad13a..0a8d8ad13a 100644
--- a/patches/api/0375-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0374-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0376-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0375-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0377-Elder-Guardian-appearance-API.patch b/patches/api/0376-Elder-Guardian-appearance-API.patch
index ca5e23620f..ca5e23620f 100644
--- a/patches/api/0377-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0376-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0378-Allow-changing-bed-s-occupied-property.patch b/patches/api/0377-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0378-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0377-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0379-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch
index 0ef6b4c9b0..0ef6b4c9b0 100644
--- a/patches/api/0379-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0378-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index 38a3a4452c..38a3a4452c 100644
--- a/patches/api/0380-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0379-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0381-Add-entity-knockback-API.patch b/patches/api/0380-Add-entity-knockback-API.patch
index cf91cd8304..cf91cd8304 100644
--- a/patches/api/0381-Add-entity-knockback-API.patch
+++ b/patches/api/0380-Add-entity-knockback-API.patch
diff --git a/patches/api/0382-Added-EntityToggleSitEvent.patch b/patches/api/0381-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0382-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0381-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0383-Add-Moving-Piston-API.patch b/patches/api/0382-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0383-Add-Moving-Piston-API.patch
+++ b/patches/api/0382-Add-Moving-Piston-API.patch
diff --git a/patches/api/0384-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0384-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0383-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0385-Add-Player-Warden-Warning-API.patch b/patches/api/0384-Add-Player-Warden-Warning-API.patch
index fdc917934f..fdc917934f 100644
--- a/patches/api/0385-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0384-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0386-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0385-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0387-Add-paper-dumplisteners-command.patch b/patches/api/0386-Add-paper-dumplisteners-command.patch
index a5d858851f..a5d858851f 100644
--- a/patches/api/0387-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0386-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0388-ItemStack-damage-API.patch b/patches/api/0387-ItemStack-damage-API.patch
index f2c4cc4355..f2c4cc4355 100644
--- a/patches/api/0388-ItemStack-damage-API.patch
+++ b/patches/api/0387-ItemStack-damage-API.patch
diff --git a/patches/api/0389-Add-Tick-TemporalUnit.patch b/patches/api/0388-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0389-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0388-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0390-Friction-API.patch b/patches/api/0389-Friction-API.patch
index 013ab9a8d3..23fa01d063 100644
--- a/patches/api/0390-Friction-API.patch
+++ b/patches/api/0389-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 cb5ba5d115406d12a2af0811fcfbf510f836b03b..b9f98279789fe26181aa9c7aa253877d916034be 100644
+index 041ff387a0f9e8037e2834118ef241ddb8970907..3a26b3c40f877a454c3c76b68b86776f05950002 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/0391-Player-Entity-Tracking-Events.patch b/patches/api/0390-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0391-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0390-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0392-Add-missing-Fluid-type.patch b/patches/api/0391-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0392-Add-missing-Fluid-type.patch
+++ b/patches/api/0391-Add-missing-Fluid-type.patch
diff --git a/patches/api/0393-fix-Instruments.patch b/patches/api/0392-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0393-fix-Instruments.patch
+++ b/patches/api/0392-fix-Instruments.patch
diff --git a/patches/api/0394-Add-BlockLockCheckEvent.patch b/patches/api/0393-Add-BlockLockCheckEvent.patch
index c5d560192c..c5d560192c 100644
--- a/patches/api/0394-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0393-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0395-Add-Sneaking-API-for-Entities.patch b/patches/api/0394-Add-Sneaking-API-for-Entities.patch
index 70178866ab..be37d7f75d 100644
--- a/patches/api/0395-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0394-Add-Sneaking-API-for-Entities.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Sneaking API for Entities
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 7ab1ffa2fa7a99ddf32f60ce4b48680eae698da9..e0e93cb945202890387c1dc3c32927525e40296c 100644
+index 4951afd12de6145f671bae40a4df6e2222bc3fd8..909926485a66e09988f7787b1d5ee2cf9c012558 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -799,6 +799,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -813,6 +813,25 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@NotNull
Pose getPose();
diff --git a/patches/api/0396-Improve-PortalEvents.patch b/patches/api/0395-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0396-Improve-PortalEvents.patch
+++ b/patches/api/0395-Improve-PortalEvents.patch
diff --git a/patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
index de7e84ef8b..de7e84ef8b 100644
--- a/patches/api/0397-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
+++ b/patches/api/0396-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/api/0398-Flying-Fall-Damage-API.patch b/patches/api/0397-Flying-Fall-Damage-API.patch
index 69dcbced37..69dcbced37 100644
--- a/patches/api/0398-Flying-Fall-Damage-API.patch
+++ b/patches/api/0397-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 3936bb4a92..3936bb4a92 100644
--- a/patches/api/0399-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0398-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0400-Win-Screen-API.patch b/patches/api/0399-Win-Screen-API.patch
index 3863beaa63..3741437041 100644
--- a/patches/api/0400-Win-Screen-API.patch
+++ b/patches/api/0399-Win-Screen-API.patch
@@ -5,7 +5,7 @@ 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 9d81aec1346d07faa47745a3cb79bac4a8a4ffa3..b49294027712e8d0b8aaaee1c041bc731b4cb184 100644
+index 6fc27c35f8533b37d82f0db5605d4d06e70af18b..0966eb33f0a1cf74a2f2fc3cbb74c756848e2eeb 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1205,6 +1205,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
diff --git a/patches/api/0401-Add-Entity-Body-Yaw-API.patch b/patches/api/0400-Add-Entity-Body-Yaw-API.patch
index 8d0776b93e..55b49feb0c 100644
--- a/patches/api/0401-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0400-Add-Entity-Body-Yaw-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add Entity Body Yaw API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index e0e93cb945202890387c1dc3c32927525e40296c..18a2f82ecf9ca3ecb80053666d0de192e5185531 100644
+index 909926485a66e09988f7787b1d5ee2cf9c012558..17d5a5458ee51d8db243326745875ef31ba95fb3 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1006,6 +1006,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1020,6 +1020,43 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @return true if in powdered snow.
*/
boolean isInPowderedSnow();
diff --git a/patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index 1ae7f17da6..1ae7f17da6 100644
--- a/patches/api/0402-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0401-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0403-Add-EntityFertilizeEggEvent.patch b/patches/api/0402-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0403-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0402-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0404-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0403-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0405-Add-Shearable-API.patch b/patches/api/0404-Add-Shearable-API.patch
index 4e49b17572..19ef9a4a36 100644
--- a/patches/api/0405-Add-Shearable-API.patch
+++ b/patches/api/0404-Add-Shearable-API.patch
@@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..0d5793790ab6a47525ad330335173612
+ boolean readyToBeSheared();
+}
diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java
-index 794b7b4a870a0d289476074e3a3f46552604c954..2f9aefd38c43755c79b30abddd6643b26880bd0d 100644
+index cef1700834643fe28ed5737578d91ecefbe99e2f..86c0043ef4e1288b6fe2f68a9b6d01c3de2c3454 100644
--- a/src/main/java/org/bukkit/entity/MushroomCow.java
+++ b/src/main/java/org/bukkit/entity/MushroomCow.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
diff --git a/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0406-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0405-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0407-Add-Mob-Experience-reward-API.patch b/patches/api/0406-Add-Mob-Experience-reward-API.patch
index 2e3a09921e..2e3a09921e 100644
--- a/patches/api/0407-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0406-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0408-Expand-PlayerItemMendEvent.patch b/patches/api/0407-Expand-PlayerItemMendEvent.patch
index 223922e05e..223922e05e 100644
--- a/patches/api/0408-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0407-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0409-Add-transient-modifier-API.patch b/patches/api/0408-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0409-Add-transient-modifier-API.patch
+++ b/patches/api/0408-Add-transient-modifier-API.patch
diff --git a/patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch
index 650b013220..650b013220 100644
--- a/patches/api/0410-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0409-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0410-Add-method-to-remove-all-active-potion-effects.patch
index f9f5110086..33a8a647a9 100644
--- a/patches/api/0411-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0410-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 2dbb61df25967739c5a8308d6d89be20136816ba..12926d36a409448ce5aaae955968dbc89825a2c5 100644
+index b7b87b2962eabcf2e8864335e4da22c0b9da8e5c..65dab533a33433bdd79601df4f109d9de6998fb8 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -625,6 +625,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
index 71062196c9..b94a139667 100644
--- a/patches/api/0412-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0411-Folia-scheduler-and-owned-region-API.patch
@@ -769,10 +769,10 @@ index d433a9d2fe0bb487865fec33307cc4c45af475a0..f819de247080d58803a2851a4cab28d2
+ // Paper end - Folia region threading API
}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 18a2f82ecf9ca3ecb80053666d0de192e5185531..a5602bf27965a8aac97aa5279a23e785729a4921 100644
+index 17d5a5458ee51d8db243326745875ef31ba95fb3..05076e0648407d026b3adba43756e57f7e925abe 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1066,4 +1066,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1080,4 +1080,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
// Paper end - Collision API
diff --git a/patches/api/0413-Add-event-for-player-editing-sign.patch b/patches/api/0412-Add-event-for-player-editing-sign.patch
index b534aebde9..b534aebde9 100644
--- a/patches/api/0413-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0412-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0414-Add-Sign-getInteractableSideFor.patch b/patches/api/0413-Add-Sign-getInteractableSideFor.patch
index 1e085323ca..1e085323ca 100644
--- a/patches/api/0414-Add-Sign-getInteractableSideFor.patch
+++ b/patches/api/0413-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0415-Fix-BanList-API.patch b/patches/api/0414-Fix-BanList-API.patch
index 1fb6e9abf8..1fb6e9abf8 100644
--- a/patches/api/0415-Fix-BanList-API.patch
+++ b/patches/api/0414-Fix-BanList-API.patch
diff --git a/patches/api/0416-Add-whitelist-events.patch b/patches/api/0415-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0416-Add-whitelist-events.patch
+++ b/patches/api/0415-Add-whitelist-events.patch
diff --git a/patches/api/0417-API-for-updating-recipes-on-clients.patch b/patches/api/0416-API-for-updating-recipes-on-clients.patch
index c1665b9ba0..c1665b9ba0 100644
--- a/patches/api/0417-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0416-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0418-Add-PlayerFailMoveEvent.patch b/patches/api/0417-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0418-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0417-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0419-Fix-custom-statistic-criteria-creation.patch b/patches/api/0418-Fix-custom-statistic-criteria-creation.patch
index 4ce5967963..4ce5967963 100644
--- a/patches/api/0419-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0418-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0420-SculkCatalyst-bloom-API.patch b/patches/api/0419-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0420-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0419-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch
index 85895ba202..67e76951f0 100644
--- a/patches/api/0421-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0420-API-for-an-entity-s-scoreboard-name.patch
@@ -7,10 +7,10 @@ Was obtainable through different methods, but you had to use different
methods depending on the implementation of Entity you were working with.
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a5602bf27965a8aac97aa5279a23e785729a4921..cbea8b9088fff5f08a47f6b26d7554d00710eb9f 100644
+index 05076e0648407d026b3adba43756e57f7e925abe..a7045fdf70e7dac94034ed6727a4eb29f31a9cdf 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1077,4 +1077,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1091,4 +1091,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull io.papermc.paper.threadedregions.scheduler.EntityScheduler getScheduler();
// Paper end - Folia schedulers
diff --git a/patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch
index 177761f8cd..177761f8cd 100644
--- a/patches/api/0422-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0421-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0423-Add-Listing-API-for-Player.patch b/patches/api/0422-Add-Listing-API-for-Player.patch
index 66d1e974c0..66d1e974c0 100644
--- a/patches/api/0423-Add-Listing-API-for-Player.patch
+++ b/patches/api/0422-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0424-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0423-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0425-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0425-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0424-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0426-Expand-Pose-API.patch b/patches/api/0425-Expand-Pose-API.patch
index b016f55d9b..0c88faca26 100644
--- a/patches/api/0426-Expand-Pose-API.patch
+++ b/patches/api/0425-Expand-Pose-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand Pose API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index cbea8b9088fff5f08a47f6b26d7554d00710eb9f..252ae4b7a002b34533988e0a574a24af8573a125 100644
+index a7045fdf70e7dac94034ed6727a4eb29f31a9cdf..66f9e50d96710a41ac009271a499318fcf119c54 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -816,6 +816,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -830,6 +830,42 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
* @param sneak true if the entity should be sneaking
*/
void setSneaking(boolean sneak);
diff --git a/patches/api/0427-MerchantRecipe-add-copy-constructor.patch b/patches/api/0426-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0427-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0426-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0428-More-DragonBattle-API.patch b/patches/api/0427-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0428-More-DragonBattle-API.patch
+++ b/patches/api/0427-More-DragonBattle-API.patch
diff --git a/patches/api/0429-Add-PlayerPickItemEvent.patch b/patches/api/0428-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0429-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0428-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0430-Allow-trident-custom-damage.patch b/patches/api/0429-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0430-Allow-trident-custom-damage.patch
+++ b/patches/api/0429-Allow-trident-custom-damage.patch
diff --git a/patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0431-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0430-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0432-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0431-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0433-Add-OfflinePlayer-isConnected.patch b/patches/api/0432-Add-OfflinePlayer-isConnected.patch
index f1e75ce3e4..fad59b6a54 100644
--- a/patches/api/0433-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0432-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 ef6cb124adc98cb5231dc44e243450a2340f74af..abb5109ed08a3a651c2c27d4d17a3d49eb06da1e 100644
+index 6a84c3d0d15251694bb7a05393b9ff7a4d8e0617..30298a629b39bd43ce14b414fc697b2dfcbea89c 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/0434-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0434-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0433-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch
index 716a6140d9..716a6140d9 100644
--- a/patches/api/0435-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0434-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0436-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0435-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0437-Add-player-idle-duration-API.patch b/patches/api/0436-Add-player-idle-duration-API.patch
index d8f5d40c3c..d8f5d40c3c 100644
--- a/patches/api/0437-Add-player-idle-duration-API.patch
+++ b/patches/api/0436-Add-player-idle-duration-API.patch
diff --git a/patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 0481690ad4..0481690ad4 100644
--- a/patches/api/0438-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0437-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch
index 67d10e420e..67d10e420e 100644
--- a/patches/api/0439-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0438-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0440-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0439-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0441-Add-UUID-attribute-modifier-API.patch b/patches/api/0440-Add-UUID-attribute-modifier-API.patch
index 251ae6e425..251ae6e425 100644
--- a/patches/api/0441-Add-UUID-attribute-modifier-API.patch
+++ b/patches/api/0440-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/api/0442-Expand-LingeringPotion-API.patch b/patches/api/0441-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0442-Expand-LingeringPotion-API.patch
+++ b/patches/api/0441-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 0ac5bf3ef0..0ac5bf3ef0 100644
--- a/patches/api/0443-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0442-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0444-Add-Structure-check-API.patch b/patches/api/0443-Add-Structure-check-API.patch
index 693f5dbf09..693f5dbf09 100644
--- a/patches/api/0444-Add-Structure-check-API.patch
+++ b/patches/api/0443-Add-Structure-check-API.patch
diff --git a/patches/api/0445-add-missing-Experimental-annotations.patch b/patches/api/0444-add-missing-Experimental-annotations.patch
index 568617597e..568617597e 100644
--- a/patches/api/0445-add-missing-Experimental-annotations.patch
+++ b/patches/api/0444-add-missing-Experimental-annotations.patch
diff --git a/patches/api/0446-Add-more-scoreboard-API.patch b/patches/api/0445-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0446-Add-more-scoreboard-API.patch
+++ b/patches/api/0445-Add-more-scoreboard-API.patch
diff --git a/patches/api/0447-Improve-Registry.patch b/patches/api/0446-Improve-Registry.patch
index da9c8aeaeb..da9c8aeaeb 100644
--- a/patches/api/0447-Improve-Registry.patch
+++ b/patches/api/0446-Improve-Registry.patch
diff --git a/patches/api/0448-Add-experience-points-API.patch b/patches/api/0447-Add-experience-points-API.patch
index 3dcd7df05d..3dcd7df05d 100644
--- a/patches/api/0448-Add-experience-points-API.patch
+++ b/patches/api/0447-Add-experience-points-API.patch
diff --git a/patches/api/0449-Add-missing-InventoryType.patch b/patches/api/0448-Add-missing-InventoryType.patch
index 67b4504ad3..67b4504ad3 100644
--- a/patches/api/0449-Add-missing-InventoryType.patch
+++ b/patches/api/0448-Add-missing-InventoryType.patch
diff --git a/patches/api/0450-Add-drops-to-shear-events.patch b/patches/api/0449-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0450-Add-drops-to-shear-events.patch
+++ b/patches/api/0449-Add-drops-to-shear-events.patch
diff --git a/patches/api/0451-Add-HiddenPotionEffect-API.patch b/patches/api/0450-Add-HiddenPotionEffect-API.patch
index 39585cefba..2c44d32af5 100644
--- a/patches/api/0451-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0450-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 12926d36a409448ce5aaae955968dbc89825a2c5..e67455efc84f1e06d3396291d104ce65fee4591b 100644
+index 65dab533a33433bdd79601df4f109d9de6998fb8..5cb82901a5d0c8ee673501fc53389d526d4a5b6f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -559,6 +559,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0452-Add-PlayerShieldDisableEvent.patch b/patches/api/0451-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0452-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0451-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 742314fff8..742314fff8 100644
--- a/patches/api/0453-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0452-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0454-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch
index 1a81132aa8..1a81132aa8 100644
--- a/patches/api/0454-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0453-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0455-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0455-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0454-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0456-Add-ShulkerDuplicateEvent.patch b/patches/api/0455-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0456-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0455-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch
index 22ba7c25bf..22ba7c25bf 100644
--- a/patches/api/0457-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0456-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0458-Add-Lifecycle-Event-system.patch b/patches/api/0457-Add-Lifecycle-Event-system.patch
index 635d4a7325..635d4a7325 100644
--- a/patches/api/0458-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0457-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0459-Conduit-API.patch b/patches/api/0458-Conduit-API.patch
index 57f43f96a3..57f43f96a3 100644
--- a/patches/api/0459-Conduit-API.patch
+++ b/patches/api/0458-Conduit-API.patch
diff --git a/patches/api/0460-ItemStack-Tooltip-API.patch b/patches/api/0459-ItemStack-Tooltip-API.patch
index 9aa55ce1a9..9aa55ce1a9 100644
--- a/patches/api/0460-ItemStack-Tooltip-API.patch
+++ b/patches/api/0459-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch
index 0437924b94..0437924b94 100644
--- a/patches/api/0461-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0460-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0462-Add-FluidState-API.patch b/patches/api/0461-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0462-Add-FluidState-API.patch
+++ b/patches/api/0461-Add-FluidState-API.patch
diff --git a/patches/api/0463-add-number-format-api.patch b/patches/api/0462-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0463-add-number-format-api.patch
+++ b/patches/api/0462-add-number-format-api.patch
diff --git a/patches/api/0464-improve-BanList-types.patch b/patches/api/0463-improve-BanList-types.patch
index 4fe0de3900..4fe0de3900 100644
--- a/patches/api/0464-improve-BanList-types.patch
+++ b/patches/api/0463-improve-BanList-types.patch
diff --git a/patches/api/0465-Suspicious-Effect-Entry-API.patch b/patches/api/0464-Suspicious-Effect-Entry-API.patch
index 410dfe9df1..410dfe9df1 100644
--- a/patches/api/0465-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0464-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0466-Fix-DamageSource-API.patch b/patches/api/0465-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0466-Fix-DamageSource-API.patch
+++ b/patches/api/0465-Fix-DamageSource-API.patch
diff --git a/patches/api/0467-Expanded-Hopper-API.patch b/patches/api/0466-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0467-Expanded-Hopper-API.patch
+++ b/patches/api/0466-Expanded-Hopper-API.patch
diff --git a/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch
index e84ea7d3aa..e84ea7d3aa 100644
--- a/patches/api/0468-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0467-Clone-mutables-to-prevent-unexpected-issues.patch