*Merge.

--HG--
branch : trunk

1 files changed, 11 insertions, 0 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 82efd2e54a4..14ad660df6d 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -513,6 +513,17 @@ void Unit::UpdateInterruptMask()
             m_interruptMask |= spell->m_spellInfo->ChannelInterruptFlags;
 }
 
+bool Unit::HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint32 familyFlags) const
+{
+    if(!HasAuraType(auraType)) return false;
+    AuraEffectList const &auras = GetAurasByType(auraType);
+    for(AuraEffectList::const_iterator itr = auras.begin(); itr != auras.end(); ++itr)
+        if(SpellEntry const *iterSpellProto = (*itr)->GetSpellProto())
+            if(iterSpellProto->SpellFamilyName == familyName && iterSpellProto->SpellFamilyFlags[0] & familyFlags)
+                return true;
+    return false;
+}
+
 /* Called by DealDamage for auras that have a chance to be dispelled on damage taken. */
 void Unit::RemoveSpellbyDamageTaken(uint32 damage, uint32 spell)
 {