diff --git a/src/game/Globals/UnitCondition.cpp b/src/game/Globals/UnitCondition.cpp index 08688a5ddc..334e334f72 100644 --- a/src/game/Globals/UnitCondition.cpp +++ b/src/game/Globals/UnitCondition.cpp @@ -166,7 +166,7 @@ int32 UnitConditionMgr::getConditionValue(Unit const* source, Unit const* target case UnitCondition::HAS_HARMFUL_AURA_SCHOOL: return source->HasAuraHolder([value](SpellAuraHolder* holder) { - return !holder->IsPositive() && GetSpellSchoolMask(holder->GetSpellProto()) & (1 << value); + return !holder->IsPositive() && holder->GetSpellProto()->GetSchoolMask() & (1 << value); }) ? value : 0; case UnitCondition::DAMAGE_PHYSICAL: break; case UnitCondition::DAMAGE_HOLY: break; diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h index 75630bc5e0..757bd49ca2 100644 --- a/src/game/Server/DBCStructure.h +++ b/src/game/Server/DBCStructure.h @@ -833,6 +833,11 @@ struct SpellEntry return mask; } + SpellSchoolMask GetSchoolMask() const + { + return SpellSchoolMask(1 << School); + } + private: // prevent creating custom entries (copy data from original in fact) SpellEntry(SpellEntry const&); // DON'T must have implementation