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/0378-fix-Instruments.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/0378-fix-Instruments.patch')
| -rw-r--r-- | patches/api/0378-fix-Instruments.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/api/0378-fix-Instruments.patch b/patches/api/0378-fix-Instruments.patch index 0bffaca02f..3ce4ac68fa 100644 --- a/patches/api/0378-fix-Instruments.patch +++ b/patches/api/0378-fix-Instruments.patch @@ -7,7 +7,7 @@ Add missing instrument enums fix some wrong javadocs diff --git a/src/main/java/org/bukkit/Instrument.java b/src/main/java/org/bukkit/Instrument.java -index 032d7b812ddc0a85e316882c8f7de0c5a0a4fd30..8df26e0d7bea77bb257cddbc2ab9e969fa160681 100644 +index 90bf1521e5b8b6c6d47489145e116f2a43fd3250..8df26e0d7bea77bb257cddbc2ab9e969fa160681 100644 --- a/src/main/java/org/bukkit/Instrument.java +++ b/src/main/java/org/bukkit/Instrument.java @@ -7,7 +7,7 @@ import org.jetbrains.annotations.Nullable; @@ -82,7 +82,7 @@ index 032d7b812ddc0a85e316882c8f7de0c5a0a4fd30..8df26e0d7bea77bb257cddbc2ab9e969 * @return The type ID of this instrument. - * @deprecated Magic value */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper public byte getType() { return this.type; @@ -93,7 +93,7 @@ index 032d7b812ddc0a85e316882c8f7de0c5a0a4fd30..8df26e0d7bea77bb257cddbc2ab9e969 * @return The instrument - * @deprecated Magic value */ -- @Deprecated +- @Deprecated(since = "1.6.2") + @org.jetbrains.annotations.ApiStatus.Internal // Paper @Nullable public static Instrument getByType(final byte type) { |