diff options
| author | Bjarne Koll <[email protected]> | 2024-12-02 18:36:54 +0100 |
|---|---|---|
| committer | Bjarne Koll <[email protected]> | 2024-12-02 18:36:54 +0100 |
| commit | b46007fbfa32c08c9228a604b7a66a5897114a81 (patch) | |
| tree | 94535ef3645529d0471c1ea6b8b9cf1ba31bc0ef /patches/api/0126-Expand-ArmorStand-API.patch | |
| parent | c2294d7067959d264eb8ad275557f194a3e2656f (diff) | |
| download | Paper-b46007fbfa32c08c9228a604b7a66a5897114a81.tar.gz Paper-b46007fbfa32c08c9228a604b7a66a5897114a81.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)upstream-update
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
ed0ec489 SPIGOT-7965: Unknown TransformReason for Hoglins
9db03457 SPIGOT-7964: Fix typo in Deprecation annotation
d14119af PR-1082: Add "since" to Deprecation annotations
e8a318d4 PR-1067: Add method to get Advancement requirements
CraftBukkit Changes:
40dd796db SPIGOT-7971: NotSerializableException on serialize CraftUseCooldownComponent
fa85c5e0a SPIGOT-7968: ProjectileHitEvent not trigerred when arrow hits entity
b75b792ec SPIGOT-7970: World#getMaxHeight() returning incorrect value
2b9a094bb SPIGOT-7965: Unknown TransformReason for Hoglins
fd3f5a380 SPIGOT-7966: Some trees do not generate with #generateTree
f2822317c PR-1515: Add a Class reader and Class node argument provider
07abf6852 PR-1514: Add a test case for ClassTraverser
a7577cb24 Fix Inventory#addItem not respecting max stack size
066a74e74 PR-1490: Add method to get Advancement requirements
4a1df30e4 PR-1512: Test Art class based on specific values instead of the implementation, to better catch implementation changes
53254c56f PR-1503: Simplify CAS loop to getAndSet
e9447dc5e Make BlockDataMeta#setBlockData hide unspecified states
dd08a7120 SPIGOT-7960: Fix inconsistency between natural item drop coordinates
e9e8ed753 SPIGOT-7960: Improve natural item drop methods
Spigot Changes:
60c9969b Rebuild patches
Diffstat (limited to 'patches/api/0126-Expand-ArmorStand-API.patch')
| -rw-r--r-- | patches/api/0126-Expand-ArmorStand-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/api/0126-Expand-ArmorStand-API.patch b/patches/api/0126-Expand-ArmorStand-API.patch index 1fd6df1628..f6088304aa 100644 --- a/patches/api/0126-Expand-ArmorStand-API.patch +++ b/patches/api/0126-Expand-ArmorStand-API.patch @@ -152,7 +152,7 @@ index 0000000000000000000000000000000000000000..35b493b870240f2cb142ea0c3bc2a5b2 + +} diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 2ee3814a52945f541e049b621b9552f8ae9e261d..575d58d96445e9ef3711cd6613471d5fe17bbb10 100644 +index 38538ad590f33c67cf63ed3bfb177e172f4dc43c..6303eb0836f55dd2e80f84a91568699f2f6f3b6c 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -14,7 +14,7 @@ public interface ArmorStand extends LivingEntity { @@ -163,7 +163,7 @@ index 2ee3814a52945f541e049b621b9552f8ae9e261d..575d58d96445e9ef3711cd6613471d5f + * @deprecated prefer {@link ArmorStand#getItem(EquipmentSlot)} // Paper */ @NotNull - @Deprecated + @Deprecated(since = "1.15.2") @@ -26,7 +26,7 @@ public interface ArmorStand extends LivingEntity { * @param item the item to hold * @see #getEquipment() @@ -171,7 +171,7 @@ index 2ee3814a52945f541e049b621b9552f8ae9e261d..575d58d96445e9ef3711cd6613471d5f - * {@link EntityEquipment#setItemInHand(org.bukkit.inventory.ItemStack)} + * {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} // Paper */ - @Deprecated + @Deprecated(since = "1.15.2") void setItemInHand(@Nullable ItemStack item); @@ -379,5 +379,169 @@ public interface ArmorStand extends LivingEntity { * @param tick {@code true} if this armour stand can tick, {@code false} otherwise |