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.

Sign up for GitHub

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

Jump to bottom

Prevent combat drop when creature charms expire while the creature is in combat #83

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open

Prevent combat drop when creature charms expire while the creature is in combat #83

wants to merge 3 commits into from

Conversation

bladezLH
Copy link
Contributor

  • The combat end timer will begin to tick once a unit's hated list is empty. Therefore, we should ensure that the caster is still on the threat list after a successful charm
  • We should potentially restore a unit's threat list from before the charm rather than wiping it and only adding the caster
  • Removed Kel'Thuzad specific MC handling
  • Ensure Kel'Thuzad properly enters combat with the instance

ratkosrb
ratkosrb reviewed May 14, 2018
View reviewed changes
src/game/Spells/SpellAuras.cpp
target->UpdateControl();
if (caster->GetTypeId() == TYPEID_PLAYER)
((Player*)caster)->CharmSpellInitialize();
}
else
{
Creature *pCasterCreature = caster ? caster->ToCreature() : nullptr;
Copy link
Contributor

Choose a reason for hiding this comment

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

You can use ToCreature(caster) here instead.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ratkosrb ratkosrb ratkosrb left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bladezLH @ratkosrb