mirror of
https://github.com/mangosfour/server.git
synced 2025-12-19 04:37:06 +00:00
[8352] More correct dazed spells selection for remove at shapeshift.
This commit is contained in:
parent
45a588f76f
commit
b4fc5a1789
2 changed files with 6 additions and 4 deletions
|
|
@ -2709,10 +2709,12 @@ void Aura::HandleAuraModShapeshift(bool apply, bool Real)
|
||||||
{
|
{
|
||||||
SpellEntry const* aurSpellInfo = (*iter)->GetSpellProto();
|
SpellEntry const* aurSpellInfo = (*iter)->GetSpellProto();
|
||||||
|
|
||||||
|
uint32 aurMechMask = GetAllSpellMechanicMask(aurSpellInfo);
|
||||||
|
|
||||||
// If spell that caused this aura has Croud Control or Daze effect
|
// If spell that caused this aura has Croud Control or Daze effect
|
||||||
if((GetAllSpellMechanicMask(aurSpellInfo) & MECHANIC_NOT_REMOVED_BY_SHAPESHIFT) ||
|
if((aurMechMask & MECHANIC_NOT_REMOVED_BY_SHAPESHIFT) ||
|
||||||
// some Daze spells have these parameters instead of MECHANIC_DAZE
|
// some Daze spells have these parameters instead of MECHANIC_DAZE (skip snare spells)
|
||||||
(aurSpellInfo->SpellIconID == 15 && aurSpellInfo->Dispel == 0))
|
aurSpellInfo->SpellIconID == 15 && aurSpellInfo->Dispel == 0 && (aurMechMask & (1 << MECHANIC_SNARE))==0)
|
||||||
{
|
{
|
||||||
++iter;
|
++iter;
|
||||||
continue;
|
continue;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "8351"
|
#define REVISION_NR "8352"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue