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

Fix some explosion damage not scaling with difficulty #8767

Merged
merged 1 commit into from
Jan 12, 2023

Conversation

Machine-Maker
Copy link
Member

Fixes MC-258535
Fixes #8735


If we wanted to restrict the fix to those specific cases, I could add the override to IndirectEntityDamageSource which is the only EntityDamageSource type which has the setScalesWithDifficulty() method called.

@Machine-Maker Machine-Maker requested a review from a team as a code owner January 7, 2023 02:55
@Chris6ix
Copy link
Contributor

Chris6ix commented Jan 7, 2023

Misspelled your name ;)

@Lulu13022002
Copy link
Contributor

We should fix this in a general case to avoid issue with the new DamageOrigin API for custom origin

@Machine-Maker
Copy link
Member Author

We should fix this in a general case to avoid issue with the new DamageOrigin API for custom origin

Ok, that's what this PR does then. It checks if the field scalesWithDifficulty has been set, and if it has, overrides the check in EntityDamageSource.

@Pantera07
Copy link
Contributor

@Machine-Maker Machine-Maker merged commit 1719345 into PaperMC:master Jan 12, 2023
@Machine-Maker Machine-Maker deleted the fix/MC-258535 branch January 12, 2023 01:10
maestro-denery pushed a commit to maestro-denery/Paper that referenced this pull request Feb 19, 2023
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.

End crystal and TNT explosions do same damage regardless of difficulty
5 participants