mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-28 09:17:21 +01:00
reorder patches after merge
This commit is contained in:
Jason Penilla
parent
b26ba5bc8a
commit
f267238e0e
571 changed files with 63 additions and 63 deletions
patches/api
0155-PreSpawnerSpawnEvent.patch0156-Add-Material-Tags.patch0157-Add-LivingEntity-getTargetEntity.patch0158-Add-sun-related-API.patch0159-Here-s-Johnny.patch0160-Turtle-API.patch0161-Add-spectator-target-events.patch0162-Add-more-Witch-API.patch0163-Make-the-default-permission-message-configurable.patch0164-Support-cancellation-supression-of-EntityDismount-Ve.patch0165-Add-more-Zombie-API.patch0166-Change-the-reserved-channel-check-to-be-sensible.patch0167-Add-PlayerConnectionCloseEvent.patch0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch0169-BlockDestroyEvent.patch0170-Add-ItemStack-Recipe-API-helper-methods.patch0171-Add-WhitelistToggleEvent.patch0172-Annotation-Test-changes.patch0173-Entity-getEntitySpawnReason.patch0174-Add-GS4-Query-event.patch0175-Add-PlayerPostRespawnEvent.patch0176-Ignore-package-private-methods-for-nullability-annot.patch0177-Flip-some-Spigot-API-null-annotations.patch0178-Server-Tick-Events.patch0179-PlayerDeathEvent-getItemsToKeep.patch0180-Add-Heightmap-API.patch0181-Mob-Spawner-API-Enhancements.patch0182-Add-BlockSoundGroup-interface.patch0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch0184-Increase-custom-payload-channel-message-size.patch0185-Expose-the-internal-current-tick.patch0186-PlayerDeathEvent-shouldDropExperience.patch0187-Add-effect-to-block-break-naturally.patch0188-World-view-distance-api.patch0189-Add-ThrownEggHatchEvent.patch0190-Entity-Jump-API.patch0191-add-hand-to-BlockMultiPlaceEvent.patch0192-Add-tick-times-API.patch0193-Expose-MinecraftServer-isRunning.patch0194-Add-Raw-Byte-ItemStack-Serialization.patch0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch0196-Make-JavaPluginLoader-thread-safe.patch0197-Add-Player-Client-Options-API.patch0198-Add-PlayerAttackEntityCooldownResetEvent.patch0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch0200-Add-item-slot-convenience-methods.patch0201-Villager-Restocks-API.patch0202-Add-Mob-Goal-API.patch0203-Add-villager-reputation-API.patch0204-Expose-game-version.patch0205-Spawn-Reason-API.patch0206-Potential-bed-API.patch0207-Prioritise-own-classes-where-possible.patch0208-Provide-a-useful-PluginClassLoader-toString.patch0209-Inventory-getHolder-method-without-block-snapshot.patch0210-Expose-Arrow-getItemStack.patch0211-Add-and-implement-PlayerRecipeBookClickEvent.patch0212-Support-components-in-ItemMeta.patch0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch0214-Add-entity-liquid-API.patch0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch0216-Allow-delegation-to-vanilla-chunk-gen.patch0217-Support-hex-colors-in-getLastColors.patch0218-Add-setMaxPlayers-API.patch0219-Add-moon-phase-API.patch0220-Add-playPickupItemAnimation-to-LivingEntity.patch0221-Add-BellRingEvent.patch0222-Brand-support.patch0223-Add-more-Evoker-API.patch0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch0225-Create-HoverEvent-from-ItemStack-Entity.patch0226-Add-additional-open-container-api-to-HumanEntity.patch0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch0228-Entity-isTicking.patch0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch0230-Villager-resetOffers.patch0231-Player-elytra-boost-API.patch0232-Add-getOfflinePlayerIfCached-String.patch0233-Add-ignore-discounts-API.patch0234-Item-no-age-no-player-pickup.patch0235-Beacon-API-custom-effect-ranges.patch0236-Add-API-for-quit-reason.patch0237-Add-Destroy-Speed-API.patch0238-Add-LivingEntity-clearActiveItem.patch0239-Add-PlayerItemCooldownEvent.patch0240-More-lightning-API.patch0241-Add-PlayerShearBlockEvent.patch0242-Enable-multi-release-plugin-jars.patch0243-Player-Chunk-Load-Unload-Events.patch0244-Expose-LivingEntity-hurt-direction.patch0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch0246-Added-PlayerTradeEvent.patch0247-Add-TargetHitEvent-API.patch0248-Additional-Block-Material-API-s.patch0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch0250-Add-PlayerFlowerPotManipulateEvent.patch0251-Zombie-API-breaking-doors.patch0252-Add-EntityLoadCrossbowEvent.patch0253-Added-WorldGameRuleChangeEvent.patch0254-Added-ServerResourcesReloadedEvent.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
|
||||
|
|
@ -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 {
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue