[core] Interrupt petskills with sleep/stun/etc during completion - #10915
Merged
Xaver-DaRed merged 1 commit intoJul 27, 2026
Merged
Conversation
Xaver-DaRed
approved these changes
Jul 26, 2026
Xaver-DaRed
enabled auto-merge
July 26, 2026 23:10
sruon
approved these changes
Jul 26, 2026
| if (m_PEntity && m_PEntity->isAlive() && (tick > GetEntryTime() + m_castTime && !IsCompleted())) | ||
| { | ||
| // Check for stun/sleep/hysteria/etc at the moment of skill completion - Cleanup handles the interrupt | ||
| if (m_PEntity->StatusEffectContainer->HasPreventActionEffect() || m_PEntity->StatusEffectContainer->HasStatusEffect(xi::StatusEffect::Hysteria)) |
Contributor
There was a problem hiding this comment.
Dont want to open a can of worms but shouldn't Amnesia be there too?
Contributor
Author
There was a problem hiding this comment.
Good question. I don't actually know other than for player wyverns
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I affirm:
What does this pull request do?
Apparently we forgot to add the sleep/stun etc check for petskills
Steps to test these changes