From ad73b564bc6f24c14dd3077fcea9a19c6ce06051 Mon Sep 17 00:00:00 2001 From: acidmanifesto Date: Thu, 21 Oct 2021 14:55:41 -0400 Subject: [PATCH] fix(Core/Conditions): Conditions not working for area auras (#8648) * Core/Conditions: Fixed conditions not working for area auras Cherry Pick of TC Commit: https://github.com/TrinityCore/TrinityCore/commit/8693ee56955ce4d31e9e69f3971f52e250c1280c --- src/server/game/Conditions/ConditionMgr.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index cbc15e87c..15e87a9cc 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -1530,6 +1530,20 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) break; } + switch (spellInfo->Effects[i].Effect) + { + case SPELL_EFFECT_PERSISTENT_AREA_AURA: + case SPELL_EFFECT_APPLY_AREA_AURA_PARTY: + case SPELL_EFFECT_APPLY_AREA_AURA_RAID: + case SPELL_EFFECT_APPLY_AREA_AURA_FRIEND: + case SPELL_EFFECT_APPLY_AREA_AURA_ENEMY: + case SPELL_EFFECT_APPLY_AREA_AURA_PET: + case SPELL_EFFECT_APPLY_AREA_AURA_OWNER: + continue; + default: + break; + } + // Xinef: chain targets are treated as area targets! Apply conditions! if (spellInfo->Effects[i].ChainTarget > 1) continue;