diff --git a/patches/api/0380-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/api/0380-Fixes-and-additions-to-the-SpawnReason-API.patch new file mode 100644 index 0000000000000..9a52334dee1c4 --- /dev/null +++ b/patches/api/0380-Fixes-and-additions-to-the-SpawnReason-API.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jakub Zacek +Date: Mon, 17 Jun 2024 19:07:00 +0200 +Subject: [PATCH] Fixes and additions to the SpawnReason API + + +diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +index 394ea92c1021d04e1687b8c12854356265e3d5de..a8423c12dfc088bfa5e2696dd0ef954c91a742d7 100644 +--- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java ++++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java +@@ -202,6 +202,12 @@ public class CreatureSpawnEvent extends EntitySpawnEvent { + * When a creature is spawned by an enchantment + */ + ENCHANTMENT, ++ // Paper start - Fixes and additions to the SpawnReason API ++ /** ++ * When an entity spawns from an ominous item spawner ++ */ ++ OMINOUS_ITEM_SPAWNER, ++ // Paper end - Fixes and additions to the SpawnReason API + /** + * When a creature is spawned by plugins + */ diff --git a/patches/api/0380-Add-missing-Fluid-type.patch b/patches/api/0381-Add-missing-Fluid-type.patch similarity index 100% rename from patches/api/0380-Add-missing-Fluid-type.patch rename to patches/api/0381-Add-missing-Fluid-type.patch diff --git a/patches/api/0381-fix-Instruments.patch b/patches/api/0382-fix-Instruments.patch similarity index 100% rename from patches/api/0381-fix-Instruments.patch rename to patches/api/0382-fix-Instruments.patch diff --git a/patches/api/0382-Add-BlockLockCheckEvent.patch b/patches/api/0383-Add-BlockLockCheckEvent.patch similarity index 100% rename from patches/api/0382-Add-BlockLockCheckEvent.patch rename to patches/api/0383-Add-BlockLockCheckEvent.patch diff --git a/patches/api/0383-Add-Sneaking-API-for-Entities.patch b/patches/api/0384-Add-Sneaking-API-for-Entities.patch similarity index 100% rename from patches/api/0383-Add-Sneaking-API-for-Entities.patch rename to patches/api/0384-Add-Sneaking-API-for-Entities.patch diff --git a/patches/api/0384-Improve-PortalEvents.patch b/patches/api/0385-Improve-PortalEvents.patch similarity index 100% rename from patches/api/0384-Improve-PortalEvents.patch rename to patches/api/0385-Improve-PortalEvents.patch diff --git a/patches/api/0385-Flying-Fall-Damage-API.patch b/patches/api/0386-Flying-Fall-Damage-API.patch similarity index 100% rename from patches/api/0385-Flying-Fall-Damage-API.patch rename to patches/api/0386-Flying-Fall-Damage-API.patch diff --git a/patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0387-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch similarity index 100% rename from patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch rename to patches/api/0387-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch diff --git a/patches/api/0387-Win-Screen-API.patch b/patches/api/0388-Win-Screen-API.patch similarity index 100% rename from patches/api/0387-Win-Screen-API.patch rename to patches/api/0388-Win-Screen-API.patch diff --git a/patches/api/0388-Add-Entity-Body-Yaw-API.patch b/patches/api/0389-Add-Entity-Body-Yaw-API.patch similarity index 100% rename from patches/api/0388-Add-Entity-Body-Yaw-API.patch rename to patches/api/0389-Add-Entity-Body-Yaw-API.patch diff --git a/patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0390-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch similarity index 100% rename from patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch rename to patches/api/0390-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch diff --git a/patches/api/0390-Add-EntityFertilizeEggEvent.patch b/patches/api/0391-Add-EntityFertilizeEggEvent.patch similarity index 100% rename from patches/api/0390-Add-EntityFertilizeEggEvent.patch rename to patches/api/0391-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0392-Add-CompostItemEvent-and-EntityCompostItemEvent.patch similarity index 100% rename from patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch rename to patches/api/0392-Add-CompostItemEvent-and-EntityCompostItemEvent.patch diff --git a/patches/api/0392-Add-Shearable-API.patch b/patches/api/0393-Add-Shearable-API.patch similarity index 100% rename from patches/api/0392-Add-Shearable-API.patch rename to patches/api/0393-Add-Shearable-API.patch diff --git a/patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0394-Fix-SpawnEggMeta-get-setSpawnedType.patch similarity index 100% rename from patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch rename to patches/api/0394-Fix-SpawnEggMeta-get-setSpawnedType.patch diff --git a/patches/api/0394-Add-Mob-Experience-reward-API.patch b/patches/api/0395-Add-Mob-Experience-reward-API.patch similarity index 100% rename from patches/api/0394-Add-Mob-Experience-reward-API.patch rename to patches/api/0395-Add-Mob-Experience-reward-API.patch diff --git a/patches/api/0395-Expand-PlayerItemMendEvent.patch b/patches/api/0396-Expand-PlayerItemMendEvent.patch similarity index 100% rename from patches/api/0395-Expand-PlayerItemMendEvent.patch rename to patches/api/0396-Expand-PlayerItemMendEvent.patch diff --git a/patches/api/0396-Add-transient-modifier-API.patch b/patches/api/0397-Add-transient-modifier-API.patch similarity index 100% rename from patches/api/0396-Add-transient-modifier-API.patch rename to patches/api/0397-Add-transient-modifier-API.patch diff --git a/patches/api/0397-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0398-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/api/0397-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0398-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/api/0398-Folia-scheduler-and-owned-region-API.patch b/patches/api/0399-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/api/0398-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0399-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/api/0399-Add-event-for-player-editing-sign.patch b/patches/api/0400-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0399-Add-event-for-player-editing-sign.patch rename to patches/api/0400-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0400-Add-Sign-getInteractableSideFor.patch b/patches/api/0401-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0400-Add-Sign-getInteractableSideFor.patch rename to patches/api/0401-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0401-Fix-BanList-API.patch b/patches/api/0402-Fix-BanList-API.patch similarity index 100% rename from patches/api/0401-Fix-BanList-API.patch rename to patches/api/0402-Fix-BanList-API.patch diff --git a/patches/api/0402-Add-whitelist-events.patch b/patches/api/0403-Add-whitelist-events.patch similarity index 100% rename from patches/api/0402-Add-whitelist-events.patch rename to patches/api/0403-Add-whitelist-events.patch diff --git a/patches/api/0403-API-for-updating-recipes-on-clients.patch b/patches/api/0404-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0403-API-for-updating-recipes-on-clients.patch rename to patches/api/0404-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0404-Add-PlayerFailMoveEvent.patch b/patches/api/0405-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0404-Add-PlayerFailMoveEvent.patch rename to patches/api/0405-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0405-Fix-custom-statistic-criteria-creation.patch b/patches/api/0406-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0405-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0406-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0406-SculkCatalyst-bloom-API.patch b/patches/api/0407-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0406-SculkCatalyst-bloom-API.patch rename to patches/api/0407-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0407-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0408-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0407-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0408-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0409-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0409-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0409-Add-Listing-API-for-Player.patch b/patches/api/0410-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0409-Add-Listing-API-for-Player.patch rename to patches/api/0410-Add-Listing-API-for-Player.patch diff --git a/patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0411-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0411-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0411-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0412-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0411-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0412-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0412-Expand-Pose-API.patch b/patches/api/0413-Expand-Pose-API.patch similarity index 100% rename from patches/api/0412-Expand-Pose-API.patch rename to patches/api/0413-Expand-Pose-API.patch diff --git a/patches/api/0413-MerchantRecipe-add-copy-constructor.patch b/patches/api/0414-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0413-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0414-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0414-More-DragonBattle-API.patch b/patches/api/0415-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0414-More-DragonBattle-API.patch rename to patches/api/0415-More-DragonBattle-API.patch diff --git a/patches/api/0415-Add-PlayerPickItemEvent.patch b/patches/api/0416-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0415-Add-PlayerPickItemEvent.patch rename to patches/api/0416-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0416-Allow-trident-custom-damage.patch b/patches/api/0417-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0416-Allow-trident-custom-damage.patch rename to patches/api/0417-Allow-trident-custom-damage.patch diff --git a/patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0418-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0418-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0419-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0419-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0419-Add-OfflinePlayer-isConnected.patch b/patches/api/0420-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0419-Add-OfflinePlayer-isConnected.patch rename to patches/api/0420-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0421-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0421-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0422-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0422-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0423-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0423-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0423-Add-player-idle-duration-API.patch b/patches/api/0424-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0423-Add-player-idle-duration-API.patch rename to patches/api/0424-Add-player-idle-duration-API.patch diff --git a/patches/api/0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0425-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0425-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0426-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0426-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0426-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0427-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0426-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0427-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0427-Add-UUID-attribute-modifier-API.patch b/patches/api/0428-Add-UUID-attribute-modifier-API.patch similarity index 100% rename from patches/api/0427-Add-UUID-attribute-modifier-API.patch rename to patches/api/0428-Add-UUID-attribute-modifier-API.patch diff --git a/patches/api/0428-Expand-LingeringPotion-API.patch b/patches/api/0429-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0428-Expand-LingeringPotion-API.patch rename to patches/api/0429-Expand-LingeringPotion-API.patch diff --git a/patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0430-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0430-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0430-Add-Structure-check-API.patch b/patches/api/0431-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0430-Add-Structure-check-API.patch rename to patches/api/0431-Add-Structure-check-API.patch diff --git a/patches/api/0431-add-missing-Experimental-annotations.patch b/patches/api/0432-add-missing-Experimental-annotations.patch similarity index 100% rename from patches/api/0431-add-missing-Experimental-annotations.patch rename to patches/api/0432-add-missing-Experimental-annotations.patch diff --git a/patches/api/0432-Add-more-scoreboard-API.patch b/patches/api/0433-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0432-Add-more-scoreboard-API.patch rename to patches/api/0433-Add-more-scoreboard-API.patch diff --git a/patches/api/0433-Improve-Registry.patch b/patches/api/0434-Improve-Registry.patch similarity index 100% rename from patches/api/0433-Improve-Registry.patch rename to patches/api/0434-Improve-Registry.patch diff --git a/patches/api/0434-Add-experience-points-API.patch b/patches/api/0435-Add-experience-points-API.patch similarity index 100% rename from patches/api/0434-Add-experience-points-API.patch rename to patches/api/0435-Add-experience-points-API.patch diff --git a/patches/api/0435-Add-missing-InventoryType.patch b/patches/api/0436-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0435-Add-missing-InventoryType.patch rename to patches/api/0436-Add-missing-InventoryType.patch diff --git a/patches/api/0436-Add-drops-to-shear-events.patch b/patches/api/0437-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0436-Add-drops-to-shear-events.patch rename to patches/api/0437-Add-drops-to-shear-events.patch diff --git a/patches/api/0437-Add-HiddenPotionEffect-API.patch b/patches/api/0438-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/api/0437-Add-HiddenPotionEffect-API.patch rename to patches/api/0438-Add-HiddenPotionEffect-API.patch diff --git a/patches/api/0438-Add-PlayerShieldDisableEvent.patch b/patches/api/0439-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0438-Add-PlayerShieldDisableEvent.patch rename to patches/api/0439-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0440-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0440-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0440-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0441-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0440-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0441-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0441-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0442-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0441-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0442-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0442-Add-ShulkerDuplicateEvent.patch b/patches/api/0443-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0442-Add-ShulkerDuplicateEvent.patch rename to patches/api/0443-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0444-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0444-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0444-Add-Lifecycle-Event-system.patch b/patches/api/0445-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0444-Add-Lifecycle-Event-system.patch rename to patches/api/0445-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0445-ItemStack-Tooltip-API.patch b/patches/api/0446-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0445-ItemStack-Tooltip-API.patch rename to patches/api/0446-ItemStack-Tooltip-API.patch diff --git a/patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0447-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0447-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0447-Add-FluidState-API.patch b/patches/api/0448-Add-FluidState-API.patch similarity index 100% rename from patches/api/0447-Add-FluidState-API.patch rename to patches/api/0448-Add-FluidState-API.patch diff --git a/patches/api/0448-add-number-format-api.patch b/patches/api/0449-add-number-format-api.patch similarity index 100% rename from patches/api/0448-add-number-format-api.patch rename to patches/api/0449-add-number-format-api.patch diff --git a/patches/api/0449-improve-BanList-types.patch b/patches/api/0450-improve-BanList-types.patch similarity index 100% rename from patches/api/0449-improve-BanList-types.patch rename to patches/api/0450-improve-BanList-types.patch diff --git a/patches/api/0450-Suspicious-Effect-Entry-API.patch b/patches/api/0451-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0450-Suspicious-Effect-Entry-API.patch rename to patches/api/0451-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0451-Fix-DamageSource-API.patch b/patches/api/0452-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0451-Fix-DamageSource-API.patch rename to patches/api/0452-Fix-DamageSource-API.patch diff --git a/patches/api/0452-Expanded-Hopper-API.patch b/patches/api/0453-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0452-Expanded-Hopper-API.patch rename to patches/api/0453-Expanded-Hopper-API.patch diff --git a/patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0454-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0454-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0455-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch rename to patches/api/0455-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/api/0455-Deprecate-ItemStack-setType.patch b/patches/api/0456-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/api/0455-Deprecate-ItemStack-setType.patch rename to patches/api/0456-Deprecate-ItemStack-setType.patch diff --git a/patches/api/0456-Item-Mutation-Fixes.patch b/patches/api/0457-Item-Mutation-Fixes.patch similarity index 100% rename from patches/api/0456-Item-Mutation-Fixes.patch rename to patches/api/0457-Item-Mutation-Fixes.patch diff --git a/patches/api/0457-API-for-checking-sent-chunks.patch b/patches/api/0458-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/api/0457-API-for-checking-sent-chunks.patch rename to patches/api/0458-API-for-checking-sent-chunks.patch diff --git a/patches/api/0458-Add-CartographyItemEvent.patch b/patches/api/0459-Add-CartographyItemEvent.patch similarity index 100% rename from patches/api/0458-Add-CartographyItemEvent.patch rename to patches/api/0459-Add-CartographyItemEvent.patch diff --git a/patches/api/0459-More-Raid-API.patch b/patches/api/0460-More-Raid-API.patch similarity index 100% rename from patches/api/0459-More-Raid-API.patch rename to patches/api/0460-More-Raid-API.patch diff --git a/patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0461-Fix-SpawnerEntry-Equipment-API.patch similarity index 100% rename from patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch rename to patches/api/0461-Fix-SpawnerEntry-Equipment-API.patch diff --git a/patches/api/0461-Fix-ItemFlags.patch b/patches/api/0462-Fix-ItemFlags.patch similarity index 100% rename from patches/api/0461-Fix-ItemFlags.patch rename to patches/api/0462-Fix-ItemFlags.patch diff --git a/patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0463-Allow-modifying-library-loader-jars-bytecode.patch similarity index 100% rename from patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch rename to patches/api/0463-Allow-modifying-library-loader-jars-bytecode.patch diff --git a/patches/api/0463-Add-hook-to-remap-library-jars.patch b/patches/api/0464-Add-hook-to-remap-library-jars.patch similarity index 100% rename from patches/api/0463-Add-hook-to-remap-library-jars.patch rename to patches/api/0464-Add-hook-to-remap-library-jars.patch diff --git a/patches/api/0464-Add-GameMode-isInvulnerable.patch b/patches/api/0465-Add-GameMode-isInvulnerable.patch similarity index 100% rename from patches/api/0464-Add-GameMode-isInvulnerable.patch rename to patches/api/0465-Add-GameMode-isInvulnerable.patch diff --git a/patches/api/0465-Expose-hasColor-to-leather-armor.patch b/patches/api/0466-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/api/0465-Expose-hasColor-to-leather-armor.patch rename to patches/api/0466-Expose-hasColor-to-leather-armor.patch diff --git a/patches/api/0466-Add-missing-wind-charge-damage-type.patch b/patches/api/0467-Add-missing-wind-charge-damage-type.patch similarity index 100% rename from patches/api/0466-Add-missing-wind-charge-damage-type.patch rename to patches/api/0467-Add-missing-wind-charge-damage-type.patch diff --git a/patches/api/0467-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0468-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/api/0467-Added-API-to-get-player-ha-proxy-address.patch rename to patches/api/0468-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/api/0468-More-Chest-Block-API.patch b/patches/api/0469-More-Chest-Block-API.patch similarity index 100% rename from patches/api/0468-More-Chest-Block-API.patch rename to patches/api/0469-More-Chest-Block-API.patch diff --git a/patches/api/0469-Brigadier-based-command-API.patch b/patches/api/0470-Brigadier-based-command-API.patch similarity index 100% rename from patches/api/0469-Brigadier-based-command-API.patch rename to patches/api/0470-Brigadier-based-command-API.patch diff --git a/patches/api/0470-Fix-issues-with-recipe-API.patch b/patches/api/0471-Fix-issues-with-recipe-API.patch similarity index 100% rename from patches/api/0470-Fix-issues-with-recipe-API.patch rename to patches/api/0471-Fix-issues-with-recipe-API.patch diff --git a/patches/api/0471-Fix-equipment-slot-and-group-API.patch b/patches/api/0472-Fix-equipment-slot-and-group-API.patch similarity index 100% rename from patches/api/0471-Fix-equipment-slot-and-group-API.patch rename to patches/api/0472-Fix-equipment-slot-and-group-API.patch diff --git a/patches/api/0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0473-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/api/0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/api/0473-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/api/0473-General-ItemMeta-fixes.patch b/patches/api/0474-General-ItemMeta-fixes.patch similarity index 100% rename from patches/api/0473-General-ItemMeta-fixes.patch rename to patches/api/0474-General-ItemMeta-fixes.patch diff --git a/patches/api/0474-Add-missing-fishing-event-state.patch b/patches/api/0475-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/api/0474-Add-missing-fishing-event-state.patch rename to patches/api/0475-Add-missing-fishing-event-state.patch diff --git a/patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0476-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/api/0476-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/api/0476-Registry-Modification-API.patch b/patches/api/0477-Registry-Modification-API.patch similarity index 100% rename from patches/api/0476-Registry-Modification-API.patch rename to patches/api/0477-Registry-Modification-API.patch diff --git a/patches/api/0477-Introduce-registry-entry-and-builders.patch b/patches/api/0478-Introduce-registry-entry-and-builders.patch similarity index 100% rename from patches/api/0477-Introduce-registry-entry-and-builders.patch rename to patches/api/0478-Introduce-registry-entry-and-builders.patch diff --git a/patches/api/0478-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0479-Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/api/0478-Proxy-ItemStack-to-CraftItemStack.patch rename to patches/api/0479-Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/api/0479-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0480-Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/api/0479-Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/api/0480-Make-a-PDC-view-accessible-directly-from-ItemStack.patch diff --git a/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch index e66bfd2b7d777..cea2598d248c6 100644 --- a/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch +++ b/patches/server/0782-Fixes-and-additions-to-the-SpawnReason-API.patch @@ -20,6 +20,19 @@ index 69a661f01e43d17262fd2845dde5528416bbe456..c0062c8f83641ff30e79a309c0bb9930 } @Nullable +diff --git a/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java b/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java +index 146cbec9e64b6c77759aadd0d0c4e989018e9aef..4c4545b3732d4c08afdb7bc1913169a96e82825c 100644 +--- a/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java ++++ b/src/main/java/net/minecraft/world/entity/OminousItemSpawner.java +@@ -89,7 +89,7 @@ public class OminousItemSpawner extends Entity { + entity = new ItemEntity(level, this.getX(), this.getY(), this.getZ(), itemStack); + } + +- level.addFreshEntity(entity); ++ level.addFreshEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.OMINOUS_ITEM_SPAWNER); // Paper - Fixes and additions to the SpawnReason API + level.levelEvent(3021, this.blockPosition(), 1); + level.gameEvent(entity, GameEvent.ENTITY_PLACE, this.position()); + this.setItem(ItemStack.EMPTY); diff --git a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java b/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java index 1dade7a4fbdf190661e4431496349444467509cc..3e869620db35d38db39fbeed715b898ef9d2743c 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/DragonFireball.java