Cleanup some patches (#9093)

PaperMC · Apr 4, 2023 · 641dafd · 641dafd
1 parent 0849144
commit 641dafd
Show file tree

Hide file tree

Showing 203 changed files with 70 additions and 84 deletions.
diff --git a/patches/api/0171-Entity-getEntitySpawnReason.patch b/patches/api/0171-Entity-getEntitySpawnReason.patch
@@ -9,8 +9,10 @@ Pre existing entities will return NATURAL if it was a non
 persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
+Co-authored-by: Aurora <aurora@relanet.eu>
+
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f9b722281 100644
+index cd489dddec0b1ab50947a523c467ce3825961549..b541674b1d7061be9e8e7545a5050c7ee0ca4c66 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -780,5 +780,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -19,7 +21,7 @@ index 6fb14175962ec9730e4b70330481ec21d2c87da5..84e201c1695e9a97354f84156d82c47f
      }
 +
 +    /**
-+     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that spawned this entity.
++     * @return The {@link org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason} that initially spawned this entity. <!-- Paper - added "initially" to clarify that the SpawnReason doesn't change after the Entity was initially spawned" -->
 +     */
 +    @NotNull
 +    org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();

diff --git a/patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/0218-Villager-resetOffers.patch → patches/api/0217-Villager-resetOffers.patch b/patches/api/0218-Villager-resetOffers.patch → patches/api/0217-Villager-resetOffers.patch
diff --git a/...es/api/0219-Player-elytra-boost-API.patch → ...es/api/0218-Player-elytra-boost-API.patch b/...es/api/0219-Player-elytra-boost-API.patch → ...es/api/0218-Player-elytra-boost-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Player elytra boost API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 40191fb054e90724e5f28b4078d41073c7bc5dc5..f6bbd49e655c5f89d77f36ca21952679ab31b6bb 100644
+index edd90e8311c47e9bbd6e962395503c445455bc23..2a3eed2795d26dc104a143ede85428f15a7f839d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2579,6 +2579,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

diff --git a/...Add-getOfflinePlayerIfCached-String.patch → ...Add-getOfflinePlayerIfCached-String.patch b/...Add-getOfflinePlayerIfCached-String.patch → ...Add-getOfflinePlayerIfCached-String.patch
diff --git a/...s/api/0221-Add-ignore-discounts-API.patch → ...s/api/0220-Add-ignore-discounts-API.patch b/...s/api/0221-Add-ignore-discounts-API.patch → ...s/api/0220-Add-ignore-discounts-API.patch
diff --git a/...i/0222-Item-no-age-no-player-pickup.patch → ...i/0221-Item-no-age-no-player-pickup.patch b/...i/0222-Item-no-age-no-player-pickup.patch → ...i/0221-Item-no-age-no-player-pickup.patch
diff --git a/...223-Beacon-API-custom-effect-ranges.patch → ...222-Beacon-API-custom-effect-ranges.patch b/...223-Beacon-API-custom-effect-ranges.patch → ...222-Beacon-API-custom-effect-ranges.patch
diff --git a/...es/api/0224-Add-API-for-quit-reason.patch → ...es/api/0223-Add-API-for-quit-reason.patch b/...es/api/0224-Add-API-for-quit-reason.patch → ...es/api/0223-Add-API-for-quit-reason.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add API for quit reason
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-index 0395ca85a466f6356259078d3bad48b2ce6e57b7..6e9205024ca9d3000a371bd0eb723dcd6c662bce 100644
+index 14b27eaaf744736b3e56bb1383481df98a218c43..84703b5d174625b1a4a995a244e6400d2675fbb5 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
 @@ -11,16 +11,28 @@ import org.jetbrains.annotations.Nullable;

diff --git a/patches/api/0225-Add-Destroy-Speed-API.patch → patches/api/0224-Add-Destroy-Speed-API.patch b/patches/api/0225-Add-Destroy-Speed-API.patch → patches/api/0224-Add-Destroy-Speed-API.patch
diff --git a/...26-Add-LivingEntity-clearActiveItem.patch → ...25-Add-LivingEntity-clearActiveItem.patch b/...26-Add-LivingEntity-clearActiveItem.patch → ...25-Add-LivingEntity-clearActiveItem.patch
diff --git a/...pi/0227-Add-PlayerItemCooldownEvent.patch → ...pi/0226-Add-PlayerItemCooldownEvent.patch b/...pi/0227-Add-PlayerItemCooldownEvent.patch → ...pi/0226-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0228-More-lightning-API.patch → patches/api/0227-More-lightning-API.patch b/patches/api/0228-More-lightning-API.patch → patches/api/0227-More-lightning-API.patch
diff --git a/.../api/0229-Add-PlayerShearBlockEvent.patch → .../api/0228-Add-PlayerShearBlockEvent.patch b/.../api/0229-Add-PlayerShearBlockEvent.patch → .../api/0228-Add-PlayerShearBlockEvent.patch
diff --git a/...230-Player-Chunk-Load-Unload-Events.patch → ...229-Player-Chunk-Load-Unload-Events.patch b/...230-Player-Chunk-Load-Unload-Events.patch → ...229-Player-Chunk-Load-Unload-Events.patch
diff --git a/...-Expose-LivingEntity-hurt-direction.patch → ...-Expose-LivingEntity-hurt-direction.patch b/...-Expose-LivingEntity-hurt-direction.patch → ...-Expose-LivingEntity-hurt-direction.patch
diff --git a/...OBSTRUCTED-reason-to-BedEnterResult.patch → ...OBSTRUCTED-reason-to-BedEnterResult.patch b/...OBSTRUCTED-reason-to-BedEnterResult.patch → ...OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/...hes/api/0233-Added-PlayerTradeEvent.patch → ...hes/api/0232-Added-PlayerTradeEvent.patch b/...hes/api/0233-Added-PlayerTradeEvent.patch → ...hes/api/0232-Added-PlayerTradeEvent.patch
diff --git a/...hes/api/0234-Add-TargetHitEvent-API.patch → ...hes/api/0233-Add-TargetHitEvent-API.patch b/...hes/api/0234-Add-TargetHitEvent-API.patch → ...hes/api/0233-Add-TargetHitEvent-API.patch
diff --git a/...235-Additional-Block-Material-API-s.patch → ...234-Additional-Block-Material-API-s.patch b/...235-Additional-Block-Material-API-s.patch → ...234-Additional-Block-Material-API-s.patch
diff --git a/...t-Material-from-Boats-and-Minecarts.patch → ...t-Material-from-Boats-and-Minecarts.patch b/...t-Material-from-Boats-and-Minecarts.patch → ...t-Material-from-Boats-and-Minecarts.patch
diff --git a/...-Add-PlayerFlowerPotManipulateEvent.patch → ...-Add-PlayerFlowerPotManipulateEvent.patch b/...-Add-PlayerFlowerPotManipulateEvent.patch → ...-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/.../api/0238-Zombie-API-breaking-doors.patch → .../api/0237-Zombie-API-breaking-doors.patch b/.../api/0238-Zombie-API-breaking-doors.patch → .../api/0237-Zombie-API-breaking-doors.patch
diff --git a/...pi/0239-Add-EntityLoadCrossbowEvent.patch → ...pi/0238-Add-EntityLoadCrossbowEvent.patch b/...pi/0239-Add-EntityLoadCrossbowEvent.patch → ...pi/0238-Add-EntityLoadCrossbowEvent.patch
diff --git a/...0240-Added-WorldGameRuleChangeEvent.patch → ...0239-Added-WorldGameRuleChangeEvent.patch b/...0240-Added-WorldGameRuleChangeEvent.patch → ...0239-Added-WorldGameRuleChangeEvent.patch
diff --git a/...-Added-ServerResourcesReloadedEvent.patch → ...-Added-ServerResourcesReloadedEvent.patch b/...-Added-ServerResourcesReloadedEvent.patch → ...-Added-ServerResourcesReloadedEvent.patch
diff --git a/...i/0242-Add-BlockFailedDispenseEvent.patch → ...i/0241-Add-BlockFailedDispenseEvent.patch b/...i/0242-Add-BlockFailedDispenseEvent.patch → ...i/0241-Add-BlockFailedDispenseEvent.patch
diff --git a/...-Added-PlayerLecternPageChangeEvent.patch → ...-Added-PlayerLecternPageChangeEvent.patch b/...-Added-PlayerLecternPageChangeEvent.patch → ...-Added-PlayerLecternPageChangeEvent.patch
diff --git a/...-Added-PlayerLoomPatternSelectEvent.patch → ...-Added-PlayerLoomPatternSelectEvent.patch b/...-Added-PlayerLoomPatternSelectEvent.patch → ...-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/...act-interaction-point-in-PlayerInte.patch → ...act-interaction-point-in-PlayerInte.patch b/...act-interaction-point-in-PlayerInte.patch → ...act-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0246-Add-sendOpLevel-API.patch → patches/api/0245-Add-sendOpLevel-API.patch b/patches/api/0246-Add-sendOpLevel-API.patch → patches/api/0245-Add-sendOpLevel-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add sendOpLevel API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f6bbd49e655c5f89d77f36ca21952679ab31b6bb..6c4d148202c3378e361fd8068c00cc0b67d6dc1e 100644
+index 2a3eed2795d26dc104a143ede85428f15a7f839d..77fb32968d9d32096d93a760a8b08ded310d31b5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -2592,6 +2592,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

diff --git a/patches/api/0247-Add-PaperRegistry.patch → patches/api/0246-Add-PaperRegistry.patch b/patches/api/0247-Add-PaperRegistry.patch → patches/api/0246-Add-PaperRegistry.patch
diff --git a/.../api/0248-Add-StructuresLocateEvent.patch → .../api/0247-Add-StructuresLocateEvent.patch b/.../api/0248-Add-StructuresLocateEvent.patch → .../api/0247-Add-StructuresLocateEvent.patch
diff --git a/...nent-with-empty-text-instead-of-thr.patch → ...nent-with-empty-text-instead-of-thr.patch b/...nent-with-empty-text-instead-of-thr.patch → ...nent-with-empty-text-instead-of-thr.patch
diff --git a/.../api/0250-Add-BlockPreDispenseEvent.patch → .../api/0249-Add-BlockPreDispenseEvent.patch b/.../api/0250-Add-BlockPreDispenseEvent.patch → .../api/0249-Add-BlockPreDispenseEvent.patch
diff --git a/...api/0251-Added-missing-vanilla-tags.patch → ...api/0250-Added-missing-vanilla-tags.patch b/...api/0251-Added-missing-vanilla-tags.patch → ...api/0250-Added-missing-vanilla-tags.patch
diff --git a/...Added-PlayerChangeBeaconEffectEvent.patch → ...Added-PlayerChangeBeaconEffectEvent.patch b/...Added-PlayerChangeBeaconEffectEvent.patch → ...Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/...-PlayerStonecutterRecipeSelectEvent.patch → ...-PlayerStonecutterRecipeSelectEvent.patch b/...-PlayerStonecutterRecipeSelectEvent.patch → ...-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/...eash-variable-to-EntityUnleashEvent.patch → ...eash-variable-to-EntityUnleashEvent.patch b/...eash-variable-to-EntityUnleashEvent.patch → ...eash-variable-to-EntityUnleashEvent.patch
diff --git a/...hes/api/0255-add-DragonEggFormEvent.patch → ...hes/api/0254-add-DragonEggFormEvent.patch b/...hes/api/0255-add-DragonEggFormEvent.patch → ...hes/api/0254-add-DragonEggFormEvent.patch
diff --git a/patches/api/0256-EntityMoveEvent.patch → patches/api/0255-EntityMoveEvent.patch b/patches/api/0256-EntityMoveEvent.patch → patches/api/0255-EntityMoveEvent.patch
diff --git a/...-adding-items-to-BlockDropItemEvent.patch → ...-adding-items-to-BlockDropItemEvent.patch b/...-adding-items-to-BlockDropItemEvent.patch → ...-adding-items-to-BlockDropItemEvent.patch
diff --git a/...inThreadExecutor-to-BukkitScheduler.patch → ...inThreadExecutor-to-BukkitScheduler.patch b/...inThreadExecutor-to-BukkitScheduler.patch → ...inThreadExecutor-to-BukkitScheduler.patch
diff --git a/...entity-allow-attribute-registration.patch → ...entity-allow-attribute-registration.patch b/...entity-allow-attribute-registration.patch → ...entity-allow-attribute-registration.patch
diff --git a/patches/api/0260-Add-missing-effects.patch → patches/api/0259-Add-missing-effects.patch b/patches/api/0260-Add-missing-effects.patch → patches/api/0259-Add-missing-effects.patch
diff --git a/...hes/api/0261-Expose-Tracked-Players.patch → ...hes/api/0260-Expose-Tracked-Players.patch b/...hes/api/0261-Expose-Tracked-Players.patch → ...hes/api/0260-Expose-Tracked-Players.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Expose Tracked Players
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 81d9f085905283e54c3bd597e15ac1bf693f541f..e0265937a5daf968a9a3f453f4aabf37f76d2c1c 100644
+index e212fcb53c9d2f8aad3e1582b64de1743f2efbfc..368a308e5420f9a9ed403358e7224d2df67a89bb 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -826,5 +826,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

diff --git a/...ache-the-result-of-Material-isBlock.patch → ...ache-the-result-of-Material-isBlock.patch b/...ache-the-result-of-Material-isBlock.patch → ...ache-the-result-of-Material-isBlock.patch
diff --git a/...hes/api/0263-Add-worldborder-events.patch → ...hes/api/0262-Add-worldborder-events.patch b/...hes/api/0263-Add-worldborder-events.patch → ...hes/api/0262-Add-worldborder-events.patch
diff --git a/...pi/0264-added-PlayerNameEntityEvent.patch → ...pi/0263-added-PlayerNameEntityEvent.patch b/...pi/0264-added-PlayerNameEntityEvent.patch → ...pi/0263-added-PlayerNameEntityEvent.patch
diff --git a/.../api/0265-Add-recipe-to-cook-events.patch → .../api/0264-Add-recipe-to-cook-events.patch b/.../api/0265-Add-recipe-to-cook-events.patch → .../api/0264-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0266-Add-Block-isValidTool.patch → patches/api/0265-Add-Block-isValidTool.patch b/patches/api/0266-Add-Block-isValidTool.patch → patches/api/0265-Add-Block-isValidTool.patch
diff --git a/patches/api/0267-Expand-world-key-API.patch → patches/api/0266-Expand-world-key-API.patch b/patches/api/0267-Expand-world-key-API.patch → patches/api/0266-Expand-world-key-API.patch
diff --git a/patches/api/0268-Item-Rarity-API.patch → patches/api/0267-Item-Rarity-API.patch b/patches/api/0268-Item-Rarity-API.patch → patches/api/0267-Item-Rarity-API.patch
@@ -88,7 +88,7 @@ index 6c45841538f2f073691331f975741a62b03a6637..e87cbaf9c1ea1330ab1597f98c8864d0
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 03a15727c85a08c0c79965be249373a11f31ce6e..c6378a880eac9f444c66f640260e8d410efd015b 100644
+index e4ad3a550050c4bf9cc7a2a1082bfdf668050efe..4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -877,5 +877,15 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

diff --git a/...es/api/0269-Expose-protocol-version.patch → ...es/api/0268-Expose-protocol-version.patch b/...es/api/0269-Expose-protocol-version.patch → ...es/api/0268-Expose-protocol-version.patch
diff --git a/...add-isDeeplySleeping-to-HumanEntity.patch → ...add-isDeeplySleeping-to-HumanEntity.patch b/...add-isDeeplySleeping-to-HumanEntity.patch → ...add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/...add-consumeFuel-to-FurnaceBurnEvent.patch → ...add-consumeFuel-to-FurnaceBurnEvent.patch b/...add-consumeFuel-to-FurnaceBurnEvent.patch → ...add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/...-set-drop-chance-to-EntityEquipment.patch → ...-set-drop-chance-to-EntityEquipment.patch b/...-set-drop-chance-to-EntityEquipment.patch → ...-set-drop-chance-to-EntityEquipment.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment
 
 
 diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java
-index 42f76751ec414648ee719c341d471d947bf85be6..58d52f6e1660ebdb098566a2ae6b50c8b44dc0d9 100644
+index 62c1c3f01fd58db39f635eee415fcbc19fb36ec9..fddffa6f415048c4a1eda049178c6d34d8519337 100644
 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java
 +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java
 @@ -513,4 +513,32 @@ public interface EntityEquipment {

diff --git a/...api/0273-Added-PlayerDeepSleepEvent.patch → ...api/0272-Added-PlayerDeepSleepEvent.patch b/...api/0273-Added-PlayerDeepSleepEvent.patch → ...api/0272-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0274-More-World-API.patch → patches/api/0273-More-World-API.patch b/patches/api/0274-More-World-API.patch → patches/api/0273-More-World-API.patch
diff --git a/.../0275-Added-PlayerBedFailEnterEvent.patch → .../0274-Added-PlayerBedFailEnterEvent.patch b/.../0275-Added-PlayerBedFailEnterEvent.patch → .../0274-Added-PlayerBedFailEnterEvent.patch
diff --git a/...acon-activation-deactivation-events.patch → ...acon-activation-deactivation-events.patch b/...acon-activation-deactivation-events.patch → ...acon-activation-deactivation-events.patch
diff --git a/...i/0277-PlayerMoveEvent-Improvements.patch → ...i/0276-PlayerMoveEvent-Improvements.patch b/...i/0277-PlayerMoveEvent-Improvements.patch → ...i/0276-PlayerMoveEvent-Improvements.patch
diff --git a/...-RespawnFlags-to-PlayerRespawnEvent.patch → ...-RespawnFlags-to-PlayerRespawnEvent.patch b/...-RespawnFlags-to-PlayerRespawnEvent.patch → ...-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/...i/0279-Add-more-WanderingTrader-API.patch → ...i/0278-Add-more-WanderingTrader-API.patch b/...i/0279-Add-more-WanderingTrader-API.patch → ...i/0278-Add-more-WanderingTrader-API.patch
diff --git a/...dd-EntityBlockStorage-clearEntities.patch → ...dd-EntityBlockStorage-clearEntities.patch b/...dd-EntityBlockStorage-clearEntities.patch → ...dd-EntityBlockStorage-clearEntities.patch
diff --git a/...ssage-to-PlayerAdvancementDoneEvent.patch → ...ssage-to-PlayerAdvancementDoneEvent.patch b/...ssage-to-PlayerAdvancementDoneEvent.patch → ...ssage-to-PlayerAdvancementDoneEvent.patch
diff --git a/...address-to-AsyncPlayerPreLoginEvent.patch → ...address-to-AsyncPlayerPreLoginEvent.patch b/...address-to-AsyncPlayerPreLoginEvent.patch → ...address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0283-Inventory-close.patch → patches/api/0282-Inventory-close.patch b/patches/api/0283-Inventory-close.patch → patches/api/0282-Inventory-close.patch
diff --git a/...-in-sunlight-API-for-Phantoms-and-S.patch → ...-in-sunlight-API-for-Phantoms-and-S.patch b/...-in-sunlight-API-for-Phantoms-and-S.patch → ...-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/...hes/api/0285-Add-basic-Datapack-API.patch → ...hes/api/0284-Add-basic-Datapack-API.patch b/...hes/api/0285-Add-basic-Datapack-API.patch → ...hes/api/0284-Add-basic-Datapack-API.patch
diff --git a/...itions-to-PlayerGameModeChangeEvent.patch → ...itions-to-PlayerGameModeChangeEvent.patch b/...itions-to-PlayerGameModeChangeEvent.patch → ...itions-to-PlayerGameModeChangeEvent.patch
diff --git a/...api/0287-ItemStack-repair-check-API.patch → ...api/0286-ItemStack-repair-check-API.patch b/...api/0287-ItemStack-repair-check-API.patch → ...api/0286-ItemStack-repair-check-API.patch
@@ -26,7 +26,7 @@ index 906f313d8c91e65ce934143208ed281ce02f5354..29a91ec8e97ce66383a1dd1fc3dcbcdc
       * Returns the server's protocol version.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index c6378a880eac9f444c66f640260e8d410efd015b..b731ac4f6cd82d8476e4040a2204f58b0f63a0d3 100644
+index 4f867ba2bc9b1a7c277e4a5f0ea8b452315f3272..2d945516ec65ffe103479aea218b3002cc572dc1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -887,5 +887,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

diff --git a/patches/api/0288-More-Enchantment-API.patch → patches/api/0287-More-Enchantment-API.patch b/patches/api/0288-More-Enchantment-API.patch → patches/api/0287-More-Enchantment-API.patch
diff --git a/patches/api/0289-Add-Mob-lookAt-API.patch → patches/api/0288-Add-Mob-lookAt-API.patch b/patches/api/0289-Add-Mob-lookAt-API.patch → patches/api/0288-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0290-ItemStack-editMeta.patch → patches/api/0289-ItemStack-editMeta.patch b/patches/api/0290-ItemStack-editMeta.patch → patches/api/0289-ItemStack-editMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack#editMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ffde4d11d4d5e783afb77bc2e96cf71113b2eb25..c5579710f73e9b8d407d5b8d698d2543a25a752d 100644
+index 2d945516ec65ffe103479aea218b3002cc572dc1..f9faef1b73b5027a3d22e76a0b33b7c952f3ae08 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -547,6 +547,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

diff --git a/...api/0291-Add-EntityInsideBlockEvent.patch → ...api/0290-Add-EntityInsideBlockEvent.patch b/...api/0291-Add-EntityInsideBlockEvent.patch → ...api/0290-Add-EntityInsideBlockEvent.patch
diff --git a/...92-Attributes-API-for-item-defaults.patch → ...91-Attributes-API-for-item-defaults.patch b/...92-Attributes-API-for-item-defaults.patch → ...91-Attributes-API-for-item-defaults.patch
diff --git a/...ause-to-Weather-ThunderChangeEvents.patch → ...ause-to-Weather-ThunderChangeEvents.patch b/...ause-to-Weather-ThunderChangeEvents.patch → ...ause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0294-More-Lidded-Block-API.patch → patches/api/0293-More-Lidded-Block-API.patch b/patches/api/0294-More-Lidded-Block-API.patch → patches/api/0293-More-Lidded-Block-API.patch
diff --git a/...api/0295-Add-PlayerKickEvent-causes.patch → ...api/0294-Add-PlayerKickEvent-causes.patch b/...api/0295-Add-PlayerKickEvent-causes.patch → ...api/0294-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 b49620af0edcf10e7f74d616dcb4fb775308308f..bf5eeaffb7983c6a849ee80df0b78230d3cce42b 100644
+index 77fb32968d9d32096d93a760a8b08ded310d31b5..11c5cfa3e35395c2967dc1e0864e0b953fda30c6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -249,6 +249,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

diff --git a/...0296-Add-PufferFishStateChangeEvent.patch → ...0295-Add-PufferFishStateChangeEvent.patch b/...0296-Add-PufferFishStateChangeEvent.patch → ...0295-Add-PufferFishStateChangeEvent.patch
diff --git a/.../api/0297-Add-BellRevealRaiderEvent.patch → .../api/0296-Add-BellRevealRaiderEvent.patch b/.../api/0297-Add-BellRevealRaiderEvent.patch → .../api/0296-Add-BellRevealRaiderEvent.patch
diff --git a/...98-Add-ElderGuardianAppearanceEvent.patch → ...97-Add-ElderGuardianAppearanceEvent.patch b/...98-Add-ElderGuardianAppearanceEvent.patch → ...97-Add-ElderGuardianAppearanceEvent.patch
diff --git a/...0299-Add-more-line-of-sight-methods.patch → ...0298-Add-more-line-of-sight-methods.patch b/...0299-Add-more-line-of-sight-methods.patch → ...0298-Add-more-line-of-sight-methods.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add more line of sight methods
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdfadaf40f6 100644
+index f30fff08bf04c4d274b2ce242a135a14924f1cb0..3c38abfbe0391bf748702b1599d359a1180838af 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -392,5 +392,13 @@ public interface RegionAccessor extends Keyed { // Paper
@@ -23,7 +23,7 @@ index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdf
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 16536dae04b020de43f9e13ff32c659b9e6cab0c..72f7bf02ec1ace2c835e4ad58e3e59b3d7357972 100644
+index 6a4c54ea92478be6e53b62ebe4e73068b9ed4a29..626eb1796d5a19d110855e2fb95cb4c761ecc544 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -546,6 +546,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

diff --git a/...api/0300-Add-WaterBottleSplashEvent.patch → ...api/0299-Add-WaterBottleSplashEvent.patch b/...api/0300-Add-WaterBottleSplashEvent.patch → ...api/0299-Add-WaterBottleSplashEvent.patch
diff --git a/...api/0301-Add-more-LimitedRegion-API.patch → ...api/0300-Add-more-LimitedRegion-API.patch b/...api/0301-Add-more-LimitedRegion-API.patch → ...api/0300-Add-more-LimitedRegion-API.patch
diff --git a/...pi/0302-Missing-Entity-Behavior-API.patch → ...pi/0301-Missing-Entity-Behavior-API.patch b/...pi/0302-Missing-Entity-Behavior-API.patch → ...pi/0301-Missing-Entity-Behavior-API.patch
diff --git a/...s/api/0303-Adds-PlayerArmSwingEvent.patch → ...s/api/0302-Adds-PlayerArmSwingEvent.patch b/...s/api/0303-Adds-PlayerArmSwingEvent.patch → ...s/api/0302-Adds-PlayerArmSwingEvent.patch
diff --git a/...dd-PlayerSignCommandPreprocessEvent.patch → ...dd-PlayerSignCommandPreprocessEvent.patch b/...dd-PlayerSignCommandPreprocessEvent.patch → ...dd-PlayerSignCommandPreprocessEvent.patch
diff --git a/...array-elements-in-command-arguments.patch → ...array-elements-in-command-arguments.patch b/...array-elements-in-command-arguments.patch → ...array-elements-in-command-arguments.patch
diff --git a/patches/api/0306-Stinger-API.patch → patches/api/0305-Stinger-API.patch b/patches/api/0306-Stinger-API.patch → patches/api/0305-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 72f7bf02ec1ace2c835e4ad58e3e59b3d7357972..4febec3623b936cf40daba6196392ebce4b8d5a8 100644
+index 626eb1796d5a19d110855e2fb95cb4c761ecc544..08167783b6e4e7d393779c92500793518ee346a6 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -399,6 +399,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource

diff --git a/...-to-contain-the-source-jars-in-stac.patch → ...-to-contain-the-source-jars-in-stac.patch b/...-to-contain-the-source-jars-in-stac.patch → ...-to-contain-the-source-jars-in-stac.patch
diff --git a/...es/api/0308-Add-PlayerSetSpawnEvent.patch → ...es/api/0307-Add-PlayerSetSpawnEvent.patch b/...es/api/0308-Add-PlayerSetSpawnEvent.patch → ...es/api/0307-Add-PlayerSetSpawnEvent.patch
diff --git a/...pi/0309-Added-EntityDamageItemEvent.patch → ...pi/0308-Added-EntityDamageItemEvent.patch b/...pi/0309-Added-EntityDamageItemEvent.patch → ...pi/0308-Added-EntityDamageItemEvent.patch
diff --git a/...Make-EntityUnleashEvent-cancellable.patch → ...Make-EntityUnleashEvent-cancellable.patch b/...Make-EntityUnleashEvent-cancellable.patch → ...Make-EntityUnleashEvent-cancellable.patch
diff --git a/...arget-without-changing-other-things.patch → ...arget-without-changing-other-things.patch b/...arget-without-changing-other-things.patch → ...arget-without-changing-other-things.patch
diff --git a/...s/api/0312-Add-BlockBreakBlockEvent.patch → ...s/api/0311-Add-BlockBreakBlockEvent.patch b/...s/api/0312-Add-BlockBreakBlockEvent.patch → ...s/api/0311-Add-BlockBreakBlockEvent.patch
diff --git a/...pers-for-left-right-click-to-Action.patch → ...pers-for-left-right-click-to-Action.patch b/...pers-for-left-right-click-to-Action.patch → ...pers-for-left-right-click-to-Action.patch
diff --git a/...revent-NBT-copy-in-smithing-recipes.patch → ...revent-NBT-copy-in-smithing-recipes.patch b/...revent-NBT-copy-in-smithing-recipes.patch → ...revent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0315-More-CommandBlock-API.patch → patches/api/0314-More-CommandBlock-API.patch b/patches/api/0315-More-CommandBlock-API.patch → patches/api/0314-More-CommandBlock-API.patch
@@ -69,7 +69,7 @@ index 0000000000000000000000000000000000000000..09e57f495e3cbf3c6f434d12ab348308
 +    void setSuccessCount(int successCount);
 +}
 diff --git a/src/main/java/org/bukkit/block/CommandBlock.java b/src/main/java/org/bukkit/block/CommandBlock.java
-index 73dce588d1f7a5048300073bf8c2b14d6da1e857..d63da691fb8cfa04bb699adb2eb55278e8b76200 100644
+index 9c88be68b4f403d0500cb607394b3a1646675ef7..02bf0f8c12052dd5c17422153228083f56bea75b 100644
 --- a/src/main/java/org/bukkit/block/CommandBlock.java
 +++ b/src/main/java/org/bukkit/block/CommandBlock.java
 @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable;

diff --git a/...-missing-team-sidebar-display-slots.patch → ...-missing-team-sidebar-display-slots.patch b/...-missing-team-sidebar-display-slots.patch → ...-missing-team-sidebar-display-slots.patch
diff --git a/...0317-add-back-EntityPortalExitEvent.patch → ...0316-add-back-EntityPortalExitEvent.patch b/...0317-add-back-EntityPortalExitEvent.patch → ...0316-add-back-EntityPortalExitEvent.patch
diff --git a/...-find-targets-for-lightning-strikes.patch → ...-find-targets-for-lightning-strikes.patch b/...-find-targets-for-lightning-strikes.patch → ...-find-targets-for-lightning-strikes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add methods to find targets for lightning strikes
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 6da379edbf35321f7265606228695f40a9ea6977..2955302b08b30570e4a561e3b076d10d80f2f2b3 100644
+index 04c9329bb0309a1d3b0a1bbc755af7190a6ad0d4..792817079f03d082141660ab2a51c9bf56144f60 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -749,6 +749,37 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

diff --git a/.../0319-Get-entity-default-attributes.patch → .../0318-Get-entity-default-attributes.patch b/.../0319-Get-entity-default-attributes.patch → .../0318-Get-entity-default-attributes.patch
diff --git a/patches/api/0320-Left-handed-API.patch → patches/api/0319-Left-handed-API.patch b/patches/api/0320-Left-handed-API.patch → patches/api/0319-Left-handed-API.patch
diff --git a/...s/api/0321-Add-more-advancement-API.patch → ...s/api/0320-Add-more-advancement-API.patch b/...s/api/0321-Add-more-advancement-API.patch → ...s/api/0320-Add-more-advancement-API.patch
diff --git a/...322-Add-ItemFactory-getSpawnEgg-API.patch → ...321-Add-ItemFactory-getSpawnEgg-API.patch b/...322-Add-ItemFactory-getSpawnEgg-API.patch → ...321-Add-ItemFactory-getSpawnEgg-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ItemFactory#getSpawnEgg API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 34c13845f4916fb167fc9d83fe792975e5c52bdc..2acafae468fcbb7213d6b6c30803a3924a3bbc30 100644
+index fea728e9c4aaab792e6a6b4a71c1e9c34096d305..bed2278dbd35be9bdc82e7fcfaf077fdf040edd0 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -261,5 +261,14 @@ public interface ItemFactory {

diff --git a/...es/api/0323-Add-critical-damage-API.patch → ...es/api/0322-Add-critical-damage-API.patch b/...es/api/0323-Add-critical-damage-API.patch → ...es/api/0322-Add-critical-damage-API.patch
diff --git a/...0324-Fix-issues-with-mob-conversion.patch → ...0323-Fix-issues-with-mob-conversion.patch b/...0324-Fix-issues-with-mob-conversion.patch → ...0323-Fix-issues-with-mob-conversion.patch
diff --git a/...ollidable-methods-to-various-places.patch → ...ollidable-methods-to-various-places.patch b/...ollidable-methods-to-various-places.patch → ...ollidable-methods-to-various-places.patch
diff --git a/patches/api/0326-Goat-ram-API.patch → patches/api/0325-Goat-ram-API.patch b/patches/api/0326-Goat-ram-API.patch → patches/api/0325-Goat-ram-API.patch
diff --git a/...dd-API-for-resetting-a-single-score.patch → ...dd-API-for-resetting-a-single-score.patch b/...dd-API-for-resetting-a-single-score.patch → ...dd-API-for-resetting-a-single-score.patch
diff --git a/...8-Add-Raw-Byte-Entity-Serialization.patch → ...7-Add-Raw-Byte-Entity-Serialization.patch b/...8-Add-Raw-Byte-Entity-Serialization.patch → ...7-Add-Raw-Byte-Entity-Serialization.patch
@@ -24,7 +24,7 @@ index 2a23e93d9e308c5eba0a2b658f11f571a0c01e26..b8ca571f8e88e7b676c5d1e1d90f6e5c
       * 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 e0265937a5daf968a9a3f453f4aabf37f76d2c1c..24a409ff2bc554edde610a223f20bbfc09ef5152 100644
+index 368a308e5420f9a9ed403358e7224d2df67a89bb..822d39dde955f981323e6e6ac31d8da6b2289942 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -833,5 +833,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

diff --git a/...0329-Add-PlayerItemFrameChangeEvent.patch → ...0328-Add-PlayerItemFrameChangeEvent.patch b/...0329-Add-PlayerItemFrameChangeEvent.patch → ...0328-Add-PlayerItemFrameChangeEvent.patch
diff --git a/...i/0330-Add-player-health-update-API.patch → ...i/0329-Add-player-health-update-API.patch b/...i/0330-Add-player-health-update-API.patch → ...i/0329-Add-player-health-update-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player health update API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index b834537b1fa7ee349d10fe1ac5aa7e7dca4e35f7..eca9b83ef932979517f9232def0a8c3eaf087d96 100644
+index 11c5cfa3e35395c2967dc1e0864e0b953fda30c6..1be287747e9aad2abf3ec5cf8e9655c252bb681d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1980,6 +1980,31 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

diff --git a/...low-delegation-to-vanilla-chunk-gen.patch → ...low-delegation-to-vanilla-chunk-gen.patch b/...low-delegation-to-vanilla-chunk-gen.patch → ...low-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0332-Add-more-Campfire-API.patch → patches/api/0331-Add-more-Campfire-API.patch b/patches/api/0332-Add-more-Campfire-API.patch → patches/api/0331-Add-more-Campfire-API.patch
diff --git a/...ehicleCollisionEvent-HandlerList-up.patch → ...ehicleCollisionEvent-HandlerList-up.patch b/...ehicleCollisionEvent-HandlerList-up.patch → ...ehicleCollisionEvent-HandlerList-up.patch
diff --git a/...api/0334-Improve-scoreboard-entries.patch → ...api/0333-Improve-scoreboard-entries.patch b/...api/0334-Improve-scoreboard-entries.patch → ...api/0333-Improve-scoreboard-entries.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Improve scoreboard entries
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index de8789b79c8c36ba909c9532642acf22136a0faa..79bfae9626f0ed6c279eda21ddd1e25b09ed0be9 100644
+index 571b43c2809d2b248feebc7decba6017a67c8aee..4830db50f408bd9b7e79c30a6d90af567a45af0c 100644
 --- a/src/main/java/org/bukkit/scoreboard/Objective.java
 +++ b/src/main/java/org/bukkit/scoreboard/Objective.java
 @@ -151,9 +151,8 @@ public interface Objective {
@@ -37,7 +37,7 @@ index de8789b79c8c36ba909c9532642acf22136a0faa..79bfae9626f0ed6c279eda21ddd1e25b
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-index ef3e729caf430b08cdf2d680d5a137a1ba56c1c5..ec264ecfe6835d00afa3622024d2cbb200bd3d63 100644
+index ebb72912c1f8431606162b0643f6289203331253..5547f82d3d739035da3acc4bdbda72930c863138 100644
 --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java
 +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
 @@ -265,9 +265,8 @@ public interface Scoreboard {
@@ -110,7 +110,7 @@ index ef3e729caf430b08cdf2d680d5a137a1ba56c1c5..ec264ecfe6835d00afa3622024d2cbb2
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index eaf5d2cf07b97a6bc23e52b40b63b9eba82bced3..2014bca326ec67f178129d8b044fa0b0654e1ffd 100644
+index 937a28638c251509ebeb254178a4583fe03c52d0..b7f0686d22cef8d9bd23105ab60051ccb10fa1e6 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -308,9 +308,8 @@ public interface Team {

diff --git a/...s/api/0335-Entity-powdered-snow-API.patch → ...s/api/0334-Entity-powdered-snow-API.patch b/...s/api/0335-Entity-powdered-snow-API.patch → ...s/api/0334-Entity-powdered-snow-API.patch
@@ -5,7 +5,7 @@ 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 24a409ff2bc554edde610a223f20bbfc09ef5152..970a07fdc68fc988adbd8cdceccb97960709dff3 100644
+index 822d39dde955f981323e6e6ac31d8da6b2289942..56d6d9fae622f7cc4a397b1cc55aa9458ee925dc 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -860,5 +860,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

diff --git a/...0336-Add-API-for-item-entity-health.patch → ...0335-Add-API-for-item-entity-health.patch b/...0336-Add-API-for-item-entity-health.patch → ...0335-Add-API-for-item-entity-health.patch
diff --git a/...-canSmelt-methods-to-FurnaceInvento.patch → ...-canSmelt-methods-to-FurnaceInvento.patch b/...-canSmelt-methods-to-FurnaceInvento.patch → ...-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0338-Bucketable-API.patch → patches/api/0337-Bucketable-API.patch b/patches/api/0338-Bucketable-API.patch → patches/api/0337-Bucketable-API.patch
diff --git a/...-for-default-config-comment-parsing.patch → ...-for-default-config-comment-parsing.patch b/...-for-default-config-comment-parsing.patch → ...-for-default-config-comment-parsing.patch
diff --git a/...anilla-BiomeProvider-from-WorldInfo.patch → ...anilla-BiomeProvider-from-WorldInfo.patch b/...anilla-BiomeProvider-from-WorldInfo.patch → ...anilla-BiomeProvider-from-WorldInfo.patch
diff --git a/...load-to-PersistentDataContainer-has.patch → ...load-to-PersistentDataContainer-has.patch b/...load-to-PersistentDataContainer-has.patch → ...load-to-PersistentDataContainer-has.patch
diff --git a/...2-Multiple-Entries-with-Scoreboards.patch → ...1-Multiple-Entries-with-Scoreboards.patch b/...2-Multiple-Entries-with-Scoreboards.patch → ...1-Multiple-Entries-with-Scoreboards.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Multiple Entries with Scoreboards
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 2014bca326ec67f178129d8b044fa0b0654e1ffd..376a873ce809fa6ce4dce49d9e00ddbdabb1315e 100644
+index b7f0686d22cef8d9bd23105ab60051ccb10fa1e6..0f1c08092577a7d66fdc1ea8b645ea67e0d9c6cf 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
 @@ -323,6 +323,60 @@ public interface Team {

diff --git a/...ostname-to-AsyncPlayerPreLoginEvent.patch → ...ostname-to-AsyncPlayerPreLoginEvent.patch b/...ostname-to-AsyncPlayerPreLoginEvent.patch → ...ostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/...n-strange-EventHandler-return-types.patch → ...n-strange-EventHandler-return-types.patch b/...n-strange-EventHandler-return-types.patch → ...n-strange-EventHandler-return-types.patch
diff --git a/...hes/api/0345-Multi-Block-Change-API.patch → ...hes/api/0344-Multi-Block-Change-API.patch b/...hes/api/0345-Multi-Block-Change-API.patch → ...hes/api/0344-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 eca9b83ef932979517f9232def0a8c3eaf087d96..f3fe0266778d9d513f6a561b8829644d1f66e617 100644
+index 1be287747e9aad2abf3ec5cf8e9655c252bb681d..4532e4955d5c42fe27dc9a3702d83f825c6074cc 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -646,6 +646,27 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

diff --git a/patches/api/0346-Fix-NotePlayEvent.patch → patches/api/0345-Fix-NotePlayEvent.patch b/patches/api/0346-Fix-NotePlayEvent.patch → patches/api/0345-Fix-NotePlayEvent.patch
diff --git a/patches/api/0347-Freeze-Tick-Lock-API.patch → patches/api/0346-Freeze-Tick-Lock-API.patch b/patches/api/0347-Freeze-Tick-Lock-API.patch → patches/api/0346-Freeze-Tick-Lock-API.patch
@@ -5,7 +5,7 @@ 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 970a07fdc68fc988adbd8cdceccb97960709dff3..b92096ec80198aa007ed1aeff057db463ec11c0b 100644
+index 56d6d9fae622f7cc4a397b1cc55aa9458ee925dc..0feb4912e5fd230b0b566f2303f0e3f4098f43ae 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -279,6 +279,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent

diff --git a/patches/api/0348-Dolphin-API.patch → patches/api/0347-Dolphin-API.patch b/patches/api/0348-Dolphin-API.patch → patches/api/0347-Dolphin-API.patch
diff --git a/.../api/0349-More-PotionEffectType-API.patch → .../api/0348-More-PotionEffectType-API.patch b/.../api/0349-More-PotionEffectType-API.patch → .../api/0348-More-PotionEffectType-API.patch
diff --git a/...command-sender-which-forwards-feedb.patch → ...command-sender-which-forwards-feedb.patch b/...command-sender-which-forwards-feedb.patch → ...command-sender-which-forwards-feedb.patch
diff --git a/.../api/0351-Implement-regenerateChunk.patch → .../api/0350-Implement-regenerateChunk.patch b/.../api/0351-Implement-regenerateChunk.patch → .../api/0350-Implement-regenerateChunk.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Implement regenerateChunk
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 2955302b08b30570e4a561e3b076d10d80f2f2b3..aa04d7df70d99402c91e920fd693d7d4fb655786 100644
+index 792817079f03d082141660ab2a51c9bf56144f60..6716a1185e733f3ddf56b295f3153938f57d4229 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -498,8 +498,8 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient

diff --git a/patches/api/0352-Add-GameEvent-tags.patch → patches/api/0351-Add-GameEvent-tags.patch b/patches/api/0352-Add-GameEvent-tags.patch → patches/api/0351-Add-GameEvent-tags.patch
diff --git a/...es/api/0353-Furnace-RecipesUsed-API.patch → ...es/api/0352-Furnace-RecipesUsed-API.patch b/...es/api/0353-Furnace-RecipesUsed-API.patch → ...es/api/0352-Furnace-RecipesUsed-API.patch
diff --git a/...gurable-sculk-sensor-listener-range.patch → ...gurable-sculk-sensor-listener-range.patch b/...gurable-sculk-sensor-listener-range.patch → ...gurable-sculk-sensor-listener-range.patch
diff --git a/...d-missing-block-data-mins-and-maxes.patch → ...d-missing-block-data-mins-and-maxes.patch b/...d-missing-block-data-mins-and-maxes.patch → ...d-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0356-Custom-Potion-Mixes.patch → patches/api/0355-Custom-Potion-Mixes.patch b/patches/api/0356-Custom-Potion-Mixes.patch → patches/api/0355-Custom-Potion-Mixes.patch
diff --git a/...Expose-furnace-minecart-push-values.patch → ...Expose-furnace-minecart-push-values.patch b/...Expose-furnace-minecart-push-values.patch → ...Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0358-More-Projectile-API.patch → patches/api/0357-More-Projectile-API.patch b/patches/api/0358-More-Projectile-API.patch → patches/api/0357-More-Projectile-API.patch
diff --git a/...s/api/0359-Add-getComputedBiome-API.patch → ...s/api/0358-Add-getComputedBiome-API.patch b/...s/api/0359-Add-getComputedBiome-API.patch → ...s/api/0358-Add-getComputedBiome-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add getComputedBiome API
 
 
 diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 43b53c21af01e0f496c8aaacff82dfdfadaf40f6..3f7e860de4e28745fcdf8d2f41f4a8c210f48909 100644
+index 3c38abfbe0391bf748702b1599d359a1180838af..96291baf8bd06ff5f7fb2fccdbb2a172f01ba8db 100644
 --- a/src/main/java/org/bukkit/RegionAccessor.java
 +++ b/src/main/java/org/bukkit/RegionAccessor.java
 @@ -26,6 +26,7 @@ public interface RegionAccessor extends Keyed { // Paper

diff --git a/.../api/0360-Add-enchantWithLevels-API.patch → .../api/0359-Add-enchantWithLevels-API.patch b/.../api/0360-Add-enchantWithLevels-API.patch → .../api/0359-Add-enchantWithLevels-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add enchantWithLevels API
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
-index 2acafae468fcbb7213d6b6c30803a3924a3bbc30..40edff7c93b6bf75de81102326667135b9344666 100644
+index bed2278dbd35be9bdc82e7fcfaf077fdf040edd0..c066d877b5eec3578439c2de1ab9568381ccf7c5 100644
 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
 +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
 @@ -161,6 +161,22 @@ public interface ItemFactory {
@@ -32,7 +32,7 @@ index 2acafae468fcbb7213d6b6c30803a3924a3bbc30..40edff7c93b6bf75de81102326667135
       * Creates a hover event for the given item.
       *
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 84ea952cdee1eaec5572641e09fdd85930ddeb47..6f33145f1ccc7645616f310a68676207318c2a58 100644
+index f9faef1b73b5027a3d22e76a0b33b7c952f3ae08..eac7adf622b91489711a2f8bcff77fb31292dd67 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -656,6 +656,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat

diff --git a/.../0361-Add-TameableDeathMessageEvent.patch → .../0360-Add-TameableDeathMessageEvent.patch b/.../0361-Add-TameableDeathMessageEvent.patch → .../0360-Add-TameableDeathMessageEvent.patch
diff --git a/...hange-the-podium-of-the-EnderDragon.patch → ...hange-the-podium-of-the-EnderDragon.patch b/...hange-the-podium-of-the-EnderDragon.patch → ...hange-the-podium-of-the-EnderDragon.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Allow to change the podium of the EnderDragon
 
 
 diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java
-index 0449664d7cd0c52ac34d2101110f1ab42070257c..bcf3b6f2d88c3e6170f637943432cc84f69c5065 100644
+index 57f8e7bf4c7b4c4a4e793cfd5d7db74384d8b1b5..64805bef298f869035614da010ace941b2a4d70b 100644
 --- a/src/main/java/org/bukkit/entity/EnderDragon.java
 +++ b/src/main/java/org/bukkit/entity/EnderDragon.java
 @@ -104,4 +104,22 @@ public interface EnderDragon extends ComplexLivingEntity, Boss, Mob, Enemy {

diff --git a/...ing-amount-to-PlayerItemDamageEvent.patch → ...ing-amount-to-PlayerItemDamageEvent.patch b/...ing-amount-to-PlayerItemDamageEvent.patch → ...ing-amount-to-PlayerItemDamageEvent.patch
diff --git a/...i/0364-WorldCreator-keepSpawnLoaded.patch → ...i/0363-WorldCreator-keepSpawnLoaded.patch b/...i/0364-WorldCreator-keepSpawnLoaded.patch → ...i/0363-WorldCreator-keepSpawnLoaded.patch
diff --git a/...Event-and-CollarColorable-interface.patch → ...Event-and-CollarColorable-interface.patch b/...Event-and-CollarColorable-interface.patch → ...Event-and-CollarColorable-interface.patch
diff --git a/...i/0366-Add-PlayerStopUsingItemEvent.patch → ...i/0365-Add-PlayerStopUsingItemEvent.patch b/...i/0366-Add-PlayerStopUsingItemEvent.patch → ...i/0365-Add-PlayerStopUsingItemEvent.patch
diff --git a/...67-FallingBlock-auto-expire-setting.patch → ...66-FallingBlock-auto-expire-setting.patch b/...67-FallingBlock-auto-expire-setting.patch → ...66-FallingBlock-auto-expire-setting.patch
diff --git a/patches/api/0368-Keyed-Cat-Type.patch → patches/api/0367-Keyed-Cat-Type.patch b/patches/api/0368-Keyed-Cat-Type.patch → patches/api/0367-Keyed-Cat-Type.patch
diff --git a/...dd-method-isTickingWorlds-to-Bukkit.patch → ...dd-method-isTickingWorlds-to-Bukkit.patch b/...dd-method-isTickingWorlds-to-Bukkit.patch → ...dd-method-isTickingWorlds-to-Bukkit.patch
diff --git a/...api/0370-Add-WardenAngerChangeEvent.patch → ...api/0369-Add-WardenAngerChangeEvent.patch b/...api/0370-Add-WardenAngerChangeEvent.patch → ...api/0369-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0371-Nameable-Banner-API.patch → patches/api/0370-Nameable-Banner-API.patch b/patches/api/0371-Nameable-Banner-API.patch → patches/api/0370-Nameable-Banner-API.patch
diff --git a/...hes/api/0372-Add-Player-getFishHook.patch → ...hes/api/0371-Add-Player-getFishHook.patch b/...hes/api/0372-Add-Player-getFishHook.patch → ...hes/api/0371-Add-Player-getFishHook.patch