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/server/0580-Add-more-advancement-API.patch | |
| parent | c2294d7067959d264eb8ad275557f194a3e2656f (diff) | |
| download | Paper-upstream-update.tar.gz Paper-upstream-update.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/server/0580-Add-more-advancement-API.patch')
| -rw-r--r-- | patches/server/0580-Add-more-advancement-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0580-Add-more-advancement-API.patch b/patches/server/0580-Add-more-advancement-API.patch index 1875c743c1..70ac177106 100644 --- a/patches/server/0580-Add-more-advancement-API.patch +++ b/patches/server/0580-Add-more-advancement-API.patch @@ -96,11 +96,11 @@ index 05de12414a3ad1c8f0f02f7973898dda84b89b82..6581cdbec730d5d184566e7b611369b3 public DisplayInfo( ItemStack icon, diff --git a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java -index 52baf818579a6841b77ff80e42f4f1b9f635ea08..8dfaca2efa0b0bdc97b75aaa83158a2e46361e4e 100644 +index d119093d3a68c5a378fcd20860e36dbd2ba5024f..d12d9913f15c274df9c23f68e4e0304d41fccbdb 100644 --- a/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java +++ b/src/main/java/org/bukkit/craftbukkit/advancement/CraftAdvancement.java -@@ -29,12 +29,47 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement { - return Collections.unmodifiableCollection(this.handle.value().criteria().keySet()); +@@ -35,12 +35,47 @@ public class CraftAdvancement implements org.bukkit.advancement.Advancement { + return new CraftAdvancementRequirements(this.handle.value().requirements()); } + // Paper start - Add more advancement API |