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

[3.3.5][6.x]Core/Unit: Do not remove auras from Pets and Guardians after evading #16503

Merged
merged 1 commit into from Apr 25, 2016
Merged

Conversation

Rushor
Copy link
Contributor

@Rushor Rushor commented Feb 8, 2016

@Rushor
Copy link
Contributor Author

Rushor commented Feb 8, 2016

this also fixes following bug:

  1. start combat as a rogue with a dk with active ghoul
  2. ghoul starts attacking rogue
  3. rogue casts blind on ghoul
  4. rogue casts vanish on hisself

result: ghoul will evade and blind will be removed. blind should never be removed. this pr fixes that issue

@@ -259,7 +259,7 @@ bool CreatureAI::_EnterEvadeMode(EvadeReason /*why*/)

// don't remove vehicle auras, passengers aren't supposed to drop off the vehicle
// don't remove clone caster on evade (to be verified)
Copy link
Contributor

Choose a reason for hiding this comment

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

Now these comments possible should be moved to Unit.cpp

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@Rushor Rushor self-assigned this Feb 9, 2016
@Rushor Rushor changed the title Core/Unit: Do not remove auras from Pets and Guardians after evading [3.3.5][6.x]Core/Unit: Do not remove auras from Pets and Guardians after evading Feb 9, 2016
* this adds free space for further adjustments
* this fixes #14347
@@ -4113,6 +4113,16 @@ void Unit::RemoveArenaAuras()
}
}

void Unit::RemoveAurasOnEvade()
{
if (IsCharmedOwnedByPlayerOrPlayer()) // if it is a player owned creature it should not remove the aura
Copy link
Contributor Author

Choose a reason for hiding this comment

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

any news on this? would you like to improve sth. here?

Copy link

Choose a reason for hiding this comment

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

Looks good to me™. I am fairly sure @ccrs meant it should look like this.

@jackpoz
Copy link
Member

jackpoz commented Apr 25, 2016

@Rushor is this PR ready to be merged ?

@Rushor
Copy link
Contributor Author

Rushor commented Apr 25, 2016

yep, i tested this since 2 months now - i didn't found any new issues with it

@jackpoz
Copy link
Member

jackpoz commented Apr 25, 2016

merge it then please

@Rushor Rushor merged commit e869ccb into TrinityCore:3.3.5 Apr 25, 2016
DDuarte pushed a commit that referenced this pull request Apr 28, 2016
[3.3.5][6.x]Core/Unit: Do not remove auras from Pets and Guardians after evading
(cherry picked from commit e869ccb)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants