fix(Core/CreatureScript): Sindragosa - Ice Tomb and Frost Imbued Blade buff (#2210)

This commit is contained in:
Ali Khazaee
2019-08-30 11:53:23 +04:30
committed by Stoabrogga
parent 9880b20b32
commit e13d1cd9e4

View File

@@ -242,6 +242,9 @@ struct LastPhaseIceTombTargetSelector : public std::unary_function<Unit*, bool>
if (target->GetTypeId() != TYPEID_PLAYER) if (target->GetTypeId() != TYPEID_PLAYER)
return false; return false;
if (target->HasAura(SPELL_FROST_IMBUED_BLADE))
return false;
if (target->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL) || target->HasAura(SPELL_ICE_TOMB_UNTARGETABLE) || target->HasAura(SPELL_ICE_TOMB_DAMAGE) || target->HasAura(SPELL_TANK_MARKER_AURA) || target->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)) if (target->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL) || target->HasAura(SPELL_ICE_TOMB_UNTARGETABLE) || target->HasAura(SPELL_ICE_TOMB_DAMAGE) || target->HasAura(SPELL_TANK_MARKER_AURA) || target->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION))
return false; return false;
@@ -1154,12 +1157,12 @@ class SindragosaIceTombCheck
public: public:
bool operator()(Unit* unit) const bool operator()(Unit* unit) const
{ {
return unit->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL); return unit->HasAura(SPELL_FROST_IMBUED_BLADE) || unit->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL);
} }
bool operator()(WorldObject* object) const bool operator()(WorldObject* object) const
{ {
return object->ToUnit() && object->ToUnit()->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL); return object->ToUnit() && (object->ToUnit()->HasAura(SPELL_FROST_IMBUED_BLADE) || object->ToUnit()->IsImmunedToDamageOrSchool(SPELL_SCHOOL_MASK_ALL));
} }
}; };