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

Added a check to stop Bard song for Mezz/Stun #1319

Merged
merged 6 commits into from
Apr 3, 2021
Merged

Conversation

RoT-PvP
Copy link
Contributor

@RoT-PvP RoT-PvP commented Apr 1, 2021

No description provided.

Copy link
Contributor

@joligario joligario left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At quick glance I think you have a logic short circuit issue

@RoT-PvP
Copy link
Contributor Author

RoT-PvP commented Apr 1, 2021

At quick glance I think you have a logic short circuit issue

I'm fairly new to coding and PRs specifically. Any tips or could you further explain exactly what you mean? This is works for my server currently.

@mackal
Copy link
Member

mackal commented Apr 1, 2021

if ((IsStunned() && bardsong != 0) || (IsMezzed() && bardsong != 0)) {

is what @joligario was saying it should be, but we can shorten this

if (bardsong != 0 && (IsStunned() || IsMezzed())) {

Copy link
Member

@mackal mackal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, after testing on live, a bard holding a song will not always be interrupted when they are stunned. I think fixing whatever is going wrong with stun at https://github.com/EQEmu/Server/blob/master/zone/spells.cpp#L4923 is a better fix. Probably just need to add some bardsong checks I guess since just the plain InterruptSpell() call isn't cutting it. the Mob::Mesmerize() function probably needs tweaking as well.

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.

3 participants