From 519192f2108a4ae13d9f7c3906da6d726da60df3 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 5 Jul 2020 16:21:58 +0200 Subject: Core/Spells: Add missing code from corpse target type cherry-picks --- src/server/game/Spells/Spell.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 740b22c8855..668b951eb2d 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1801,7 +1801,7 @@ uint32 Spell::GetSearcherTypeMask(SpellTargetObjectTypes objType, ConditionConta retMask &= GRID_MAP_TYPE_MASK_PLAYER | GRID_MAP_TYPE_MASK_CREATURE; break; } - // No break here + /* fallthrough */ case TARGET_OBJECT_TYPE_CORPSE: case TARGET_OBJECT_TYPE_CORPSE_ENEMY: case TARGET_OBJECT_TYPE_CORPSE_ALLY: @@ -4467,6 +4467,9 @@ void Spell::UpdateSpellCastDataTargets(WorldPackets::Spells::SpellCastData& data for (GOTargetInfo const& targetInfo : m_UniqueGOTargetInfo) data.HitTargets->push_back(targetInfo.TargetGUID); // Always hits + for (CorpseTargetInfo const& targetInfo : m_UniqueCorpseTargetInfo) + data.HitTargets->push_back(targetInfo.TargetGUID); // Always hits + // Reset m_needAliveTargetMask for non channeled spell if (!m_spellInfo->IsChanneled()) m_channelTargetEffectMask = 0; -- cgit v1.2.3