Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Upstream (Bukkit/CraftBukkit) #10379

Merged
merged 5 commits into from
Apr 6, 2024

Conversation

Machine-Maker
Copy link
Member

@Machine-Maker Machine-Maker commented Apr 1, 2024

TODO


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:
f02baa3 PR-988: Add World#getIntersectingChunks(BoundingBox)
9321d66 Move getItemInUse up to LivingEntity
819eef7 PR-959: Add access to current item's remaining ticks
c4fdadb SPIGOT-7601: Add AbstractArrow#getItem
be8261c Add support for Java 22
2611967 PR-979: Add more translation keys
6675336 PR-985: Correct book maximum pages and characters per page documentation
c8be92f PR-980: Improve getArmorContents() documentation
f1120ee PR-983: Expose riptide velocity to PlayerRiptideEvent

CraftBukkit Changes:
dfaa89b PR-1369: Add World#getIntersectingChunks(BoundingBox)
51bbab2 Move getItemInUse up to LivingEntity
668e096 PR-1331: Add access to current item's remaining ticks
a639406 SPIGOT-7601: Add AbstractArrow#getItem
0398930 SPIGOT-7602: Allow opening in-world horse and related inventories
ffd1561 SPIGOT-7608: Allow empty lists to morph to any PDT list
2188dcf Add support for Java 22
45d6a60 SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime"
06d9159 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
ca3bc37 PR-1361: Add more translation keys
366c3ca SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs
06d0f9b SPIGOT-7593: Fix sapling growth physics / client-side updates
45c2608 PR-1366: Expose riptide velocity to PlayerRiptideEvent
29b6bb7 SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346

@kennytv
Copy link
Member

kennytv commented Apr 1, 2024

(for the current changes, expecting the todos to be fine as well. no amending for the todos so it's easier to review plz)

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:
f02baa3 PR-988: Add World#getIntersectingChunks(BoundingBox)
9321d66 Move getItemInUse up to LivingEntity
819eef7 PR-959: Add access to current item's remaining ticks
c4fdadb SPIGOT-7601: Add AbstractArrow#getItem
be8261c Add support for Java 22
2611967 PR-979: Add more translation keys
6675336 PR-985: Correct book maximum pages and characters per page documentation
c8be92f PR-980: Improve getArmorContents() documentation
f1120ee PR-983: Expose riptide velocity to PlayerRiptideEvent

CraftBukkit Changes:
dfaa89b PR-1369: Add World#getIntersectingChunks(BoundingBox)
51bbab2 Move getItemInUse up to LivingEntity
668e096 PR-1331: Add access to current item's remaining ticks
a639406 SPIGOT-7601: Add AbstractArrow#getItem
0398930 SPIGOT-7602: Allow opening in-world horse and related inventories
ffd1561 SPIGOT-7608: Allow empty lists to morph to any PDT list
2188dcf Add support for Java 22
45d6a60 SPIGOT-7604: Revert "SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime"
06d9159 SPIGOT-7365: DamageCause blocked by shield should trigger invulnerableTime
ca3bc37 PR-1361: Add more translation keys
366c3ca SPIGOT-7600: EntityChangeBlockEvent is not fired for frog eggs
06d0f9b SPIGOT-7593: Fix sapling growth physics / client-side updates
45c2608 PR-1366: Expose riptide velocity to PlayerRiptideEvent
29b6bb7 SPIGOT-7587: Remove fixes for now-resolved MC-142590 and MC-109346
- LivingEntity active items
- TrimPattern/TrimMaterial components
@Machine-Maker Machine-Maker marked this pull request as ready for review April 6, 2024 19:43
@Machine-Maker Machine-Maker requested a review from a team as a code owner April 6, 2024 19:43
@Machine-Maker Machine-Maker merged commit bd38e03 into PaperMC:master Apr 6, 2024
3 checks passed
@Machine-Maker Machine-Maker deleted the upstream-update branch April 6, 2024 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants