Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge. A m_casttime check is added to prevent redundent check of canseeordetect.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-06-07 11:59:12 -05:00
parent c48c20cb98 2e4fae75a4
commit 79b76f10cd
4 changed files with 929 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/game/Spell.cpp
View File

@@ -2555,18 +2555,29 @@ void Spell::cancel()
void Spell::cast(bool skipCheck)
{
SetExecutedCurrently(true);
// update pointers base at GUIDs to prevent access to non-existed already object
UpdatePointers();
// cancel at lost main target unit
if(!m_targets.getUnitTarget() && m_targets.getUnitTargetGUID() && m_targets.getUnitTargetGUID() != m_caster->GetGUID())
if(m_targets.getUnitTarget())
{
cancel();
SetExecutedCurrently(false);
return;
// three check: prepare, cast (m_casttime > 0), hit (delayed)
if(m_casttime && m_targets.getUnitTarget()->isAlive() && !m_caster->canSeeOrDetect(m_targets.getUnitTarget(), true)))
{
cancel();
return;
}
}
else
{
// cancel at lost main target unit
if(m_targets.getUnitTargetGUID() && m_targets.getUnitTargetGUID() != m_caster->GetGUID())
{
cancel();
return;
}
}
SetExecutedCurrently(true);
if(m_caster->GetTypeId() != TYPEID_PLAYER && m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
m_caster->SetInFront(m_targets.getUnitTarget());