Skip to content
/ Paper Public
forked from PaperMC/Paper
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

[pull] master from PaperMC:master #891

Merged
merged 7 commits into from
Nov 23, 2024
Merged

[pull] master from PaperMC:master #891

merged 7 commits into from
Nov 23, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Nov 23, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Machine-Maker and others added 7 commits November 23, 2024 10:52
* Configurable Entity Despawn Time

Co-authored-by: Kevin Raneri <[email protected]>

* Rebase

* Rebase

* rebase

* throw exceptions for this map

---------

Co-authored-by: Kevin Raneri <[email protected]>
Spigot incorrectly returns false in Wolf#actuallyHurt if the armor
absorbed the damage causing the entity to not get damage invuln ticks.
Resolve this by correctly reverting to the "always true" return value as
the event is not cancelled.
@pull pull bot added the ⤵️ pull label Nov 23, 2024
@pull pull bot merged commit edabff8 into ign-gg:master Nov 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

4 participants