Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fixed spell effect 93 (SPELL_EFFECT_FORCE_DESELECT) (#19001)

Browse Source 
(cherrypicked from 9e1b286984)
This commit is contained in:
xinef1
2017-02-04 20:21:12 +01:00
committed by Shauren
parent c050c4f968
commit 92e95ddf55
3 changed files with 116 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/server/game/Spells/SpellEffects.cpp
View File

@@ -22,6 +22,7 @@
#include "Battleground.h"
#include "BattlegroundMgr.h"
#include "BattlePetMgr.h"
#include "CellImpl.h"
#include "CombatLogPackets.h"
#include "CombatPackets.h"
#include "Common.h"
@@ -36,6 +37,7 @@
#include "GameObjectAI.h"
#include "Garrison.h"
#include "GossipDef.h"
#include "GridNotifiers.h"
#include "Group.h"
#include "Guild.h"
#include "InstanceScript.h"
@@ -4089,9 +4091,28 @@ void Spell::EffectForceDeselect(SpellEffIndex /*effIndex*/)
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
return;
float dist = m_caster->GetVisibilityRange();
// clear focus
WorldPackets::Combat::BreakTarget breakTarget;
breakTarget.UnitGUID = m_caster->GetGUID();
Trinity::MessageDistDelivererToHostile notifierBreak(m_caster, breakTarget.Write(), dist);
Cell::VisitWorldObjects(m_caster, notifierBreak, dist);
// and selection
WorldPackets::Spells::ClearTarget clearTarget;
clearTarget.Guid = m_caster->GetGUID();
m_caster->SendMessageToSet(clearTarget.Write(), true);
Trinity::MessageDistDelivererToHostile notifierClear(m_caster, clearTarget.Write(), dist);
Cell::VisitWorldObjects(m_caster, notifierClear, dist);
// we should also force pets to remove us from current target
Unit::AttackerSet attackerSet;
for (Unit::AttackerSet::const_iterator itr = m_caster->getAttackers().begin(); itr != m_caster->getAttackers().end(); ++itr)
if ((*itr)->GetTypeId() == TYPEID_UNIT && !(*itr)->CanHaveThreatList())
attackerSet.insert(*itr);
for (Unit::AttackerSet::const_iterator itr = attackerSet.begin(); itr != attackerSet.end(); ++itr)
(*itr)->AttackStop();
}
void Spell::EffectSelfResurrect(SpellEffIndex /*effIndex*/)