reorder patches after merge

2024-12-22 08:57:35 +01:00 · 2021-06-14 22:49:09 -07:00 · 2021-06-14 22:49:09 -07:00 · f267238e0e
commit f267238e0e
parent b26ba5bc8a
571 changed files with 63 additions and 63 deletions
--- a/patches/api/0155-PreSpawnerSpawnEvent.patch
+++ b/patches/api/0155-PreSpawnerSpawnEvent.patch
--- a/patches/api/0156-Add-Material-Tags.patch
+++ b/patches/api/0156-Add-Material-Tags.patch
--- a/patches/api/0157-Add-LivingEntity-getTargetEntity.patch
+++ b/patches/api/0157-Add-LivingEntity-getTargetEntity.patch
@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..f52644fab1522bdf83ff4f489e9805b2
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 05992ade1bca42a6233373b44513b89986d89c5a..ac6921093457cee6d01fd27690c8bb6034b4af53 100644
+index ad885a0775b387e3e8ca6bfae80c18465038056c..93d20f67bf856d80226470ae2442d199d3e2f45b 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -151,6 +151,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
--- a/patches/api/0158-Add-sun-related-API.patch
+++ b/patches/api/0158-Add-sun-related-API.patch
--- a/patches/api/0159-Here-s-Johnny.patch
+++ b/patches/api/0159-Here-s-Johnny.patch
--- a/patches/api/0160-Turtle-API.patch
+++ b/patches/api/0160-Turtle-API.patch
--- a/patches/api/0161-Add-spectator-target-events.patch
+++ b/patches/api/0161-Add-spectator-target-events.patch
--- a/patches/api/0162-Add-more-Witch-API.patch
+++ b/patches/api/0162-Add-more-Witch-API.patch
--- a/patches/api/0163-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0163-Make-the-default-permission-message-configurable.patch
--- a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
+++ b/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
--- a/patches/api/0165-Add-more-Zombie-API.patch
+++ b/patches/api/0165-Add-more-Zombie-API.patch
--- a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
+++ b/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
--- a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch
+++ b/patches/api/0167-Add-PlayerConnectionCloseEvent.patch
--- a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
--- a/patches/api/0169-BlockDestroyEvent.patch
+++ b/patches/api/0169-BlockDestroyEvent.patch
--- a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch
+++ b/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch
--- a/patches/api/0171-Add-WhitelistToggleEvent.patch
+++ b/patches/api/0171-Add-WhitelistToggleEvent.patch
--- a/patches/api/0172-Annotation-Test-changes.patch
+++ b/patches/api/0172-Annotation-Test-changes.patch
--- a/patches/api/0173-Entity-getEntitySpawnReason.patch
+++ b/patches/api/0173-Entity-getEntitySpawnReason.patch
--- a/patches/api/0174-Add-GS4-Query-event.patch
+++ b/patches/api/0174-Add-GS4-Query-event.patch
--- a/patches/api/0175-Add-PlayerPostRespawnEvent.patch
+++ b/patches/api/0175-Add-PlayerPostRespawnEvent.patch
--- a/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch
+++ b/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch
--- a/patches/api/0177-Flip-some-Spigot-API-null-annotations.patch
+++ b/patches/api/0177-Flip-some-Spigot-API-null-annotations.patch
--- a/patches/api/0178-Server-Tick-Events.patch
+++ b/patches/api/0178-Server-Tick-Events.patch
--- a/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch
+++ b/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch
--- a/patches/api/0180-Add-Heightmap-API.patch
+++ b/patches/api/0180-Add-Heightmap-API.patch
--- a/patches/api/0181-Mob-Spawner-API-Enhancements.patch
+++ b/patches/api/0181-Mob-Spawner-API-Enhancements.patch
--- a/patches/api/0182-Add-BlockSoundGroup-interface.patch
+++ b/patches/api/0182-Add-BlockSoundGroup-interface.patch
--- a/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
+++ b/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
--- a/patches/api/0184-Increase-custom-payload-channel-message-size.patch
+++ b/patches/api/0184-Increase-custom-payload-channel-message-size.patch
--- a/patches/api/0185-Expose-the-internal-current-tick.patch
+++ b/patches/api/0185-Expose-the-internal-current-tick.patch
--- a/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
+++ b/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch
--- a/patches/api/0187-Add-effect-to-block-break-naturally.patch
+++ b/patches/api/0187-Add-effect-to-block-break-naturally.patch
--- a/patches/api/0188-World-view-distance-api.patch
+++ b/patches/api/0188-World-view-distance-api.patch
--- a/patches/api/0189-Add-ThrownEggHatchEvent.patch
+++ b/patches/api/0189-Add-ThrownEggHatchEvent.patch
--- a/patches/api/0190-Entity-Jump-API.patch
+++ b/patches/api/0190-Entity-Jump-API.patch
--- a/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch
+++ b/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch
--- a/patches/api/0192-Add-tick-times-API.patch
+++ b/patches/api/0192-Add-tick-times-API.patch
--- a/patches/api/0193-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0193-Expose-MinecraftServer-isRunning.patch
--- a/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch
--- a/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
+++ b/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
--- a/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch
+++ b/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch
--- a/patches/api/0197-Add-Player-Client-Options-API.patch
+++ b/patches/api/0197-Add-Player-Client-Options-API.patch
--- a/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
+++ b/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch
--- a/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
+++ b/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
--- a/patches/api/0200-Add-item-slot-convenience-methods.patch
+++ b/patches/api/0200-Add-item-slot-convenience-methods.patch
--- a/patches/api/0201-Villager-Restocks-API.patch
+++ b/patches/api/0201-Villager-Restocks-API.patch
@ -5,7 +5,7 @@ Subject: [PATCH] Villager Restocks API


 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index ef48ad9b28750ab7b33071f6b8e354e922731909..d1579153092c1b80350155110f1b9926b1a1ef57 100644
+index 6545e568b74bd096e184b85e8da6f0d40acd3b36..ef8a81c4857bd06be19264580bf3a7e087118f5c 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -77,6 +77,20 @@ public interface Villager extends AbstractVillager {
--- a/patches/api/0202-Add-Mob-Goal-API.patch
+++ b/patches/api/0202-Add-Mob-Goal-API.patch
--- a/patches/api/0203-Add-villager-reputation-API.patch
+++ b/patches/api/0203-Add-villager-reputation-API.patch
--- a/patches/api/0204-Expose-game-version.patch
+++ b/patches/api/0204-Expose-game-version.patch
--- a/patches/api/0205-Spawn-Reason-API.patch
+++ b/patches/api/0205-Spawn-Reason-API.patch
--- a/patches/api/0206-Potential-bed-API.patch
+++ b/patches/api/0206-Potential-bed-API.patch
--- a/patches/api/0207-Prioritise-own-classes-where-possible.patch
+++ b/patches/api/0207-Prioritise-own-classes-where-possible.patch
--- a/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch
+++ b/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch
--- a/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch
+++ b/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch
--- a/patches/api/0210-Expose-Arrow-getItemStack.patch
+++ b/patches/api/0210-Expose-Arrow-getItemStack.patch
--- a/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
+++ b/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch
--- a/patches/api/0212-Support-components-in-ItemMeta.patch
+++ b/patches/api/0212-Support-components-in-ItemMeta.patch
--- a/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
+++ b/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
--- a/patches/api/0214-Add-entity-liquid-API.patch
+++ b/patches/api/0214-Add-entity-liquid-API.patch
--- a/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
+++ b/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
--- a/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
+++ b/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch
--- a/patches/api/0217-Support-hex-colors-in-getLastColors.patch
+++ b/patches/api/0217-Support-hex-colors-in-getLastColors.patch
--- a/patches/api/0218-Add-setMaxPlayers-API.patch
+++ b/patches/api/0218-Add-setMaxPlayers-API.patch
--- a/patches/api/0219-Add-moon-phase-API.patch
+++ b/patches/api/0219-Add-moon-phase-API.patch
--- a/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
+++ b/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch
--- a/patches/api/0221-Add-BellRingEvent.patch
+++ b/patches/api/0221-Add-BellRingEvent.patch
--- a/patches/api/0222-Brand-support.patch
+++ b/patches/api/0222-Brand-support.patch
--- a/patches/api/0223-Add-more-Evoker-API.patch
+++ b/patches/api/0223-Add-more-Evoker-API.patch
--- a/patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
+++ b/patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch
--- a/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch
+++ b/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch
--- a/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch
+++ b/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch
--- a/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
+++ b/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
--- a/patches/api/0228-Entity-isTicking.patch
+++ b/patches/api/0228-Entity-isTicking.patch
--- a/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
+++ b/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
--- a/patches/api/0230-Villager-resetOffers.patch
+++ b/patches/api/0230-Villager-resetOffers.patch
--- a/patches/api/0231-Player-elytra-boost-API.patch
+++ b/patches/api/0231-Player-elytra-boost-API.patch
--- a/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch
--- a/patches/api/0233-Add-ignore-discounts-API.patch
+++ b/patches/api/0233-Add-ignore-discounts-API.patch
--- a/patches/api/0234-Item-no-age-no-player-pickup.patch
+++ b/patches/api/0234-Item-no-age-no-player-pickup.patch
--- a/patches/api/0235-Beacon-API-custom-effect-ranges.patch
+++ b/patches/api/0235-Beacon-API-custom-effect-ranges.patch
--- a/patches/api/0236-Add-API-for-quit-reason.patch
+++ b/patches/api/0236-Add-API-for-quit-reason.patch
--- a/patches/api/0237-Add-Destroy-Speed-API.patch
+++ b/patches/api/0237-Add-Destroy-Speed-API.patch
--- a/patches/api/0238-Add-LivingEntity-clearActiveItem.patch
+++ b/patches/api/0238-Add-LivingEntity-clearActiveItem.patch
--- a/patches/api/0239-Add-PlayerItemCooldownEvent.patch
+++ b/patches/api/0239-Add-PlayerItemCooldownEvent.patch
--- a/patches/api/0240-More-lightning-API.patch
+++ b/patches/api/0240-More-lightning-API.patch
--- a/patches/api/0241-Add-PlayerShearBlockEvent.patch
+++ b/patches/api/0241-Add-PlayerShearBlockEvent.patch
--- a/patches/api/0242-Enable-multi-release-plugin-jars.patch
+++ b/patches/api/0242-Enable-multi-release-plugin-jars.patch
--- a/patches/api/0243-Player-Chunk-Load-Unload-Events.patch
+++ b/patches/api/0243-Player-Chunk-Load-Unload-Events.patch
--- a/patches/api/0244-Expose-LivingEntity-hurt-direction.patch
+++ b/patches/api/0244-Expose-LivingEntity-hurt-direction.patch
--- a/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
--- a/patches/api/0246-Added-PlayerTradeEvent.patch
+++ b/patches/api/0246-Added-PlayerTradeEvent.patch
--- a/patches/api/0247-Add-TargetHitEvent-API.patch
+++ b/patches/api/0247-Add-TargetHitEvent-API.patch
--- a/patches/api/0248-Additional-Block-Material-API-s.patch
+++ b/patches/api/0248-Additional-Block-Material-API-s.patch
--- a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
+++ b/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
--- a/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch
+++ b/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch
--- a/patches/api/0251-Zombie-API-breaking-doors.patch
+++ b/patches/api/0251-Zombie-API-breaking-doors.patch
--- a/patches/api/0252-Add-EntityLoadCrossbowEvent.patch
+++ b/patches/api/0252-Add-EntityLoadCrossbowEvent.patch
--- a/patches/api/0253-Added-WorldGameRuleChangeEvent.patch
+++ b/patches/api/0253-Added-WorldGameRuleChangeEvent.patch
--- a/patches/api/0254-Added-ServerResourcesReloadedEvent.patch
+++ b/patches/api/0254-Added-ServerResourcesReloadedEvent.patch
--- a/Show More
+++ b/Show More