server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #65 from Chuck5ta/develop21

Browse Source 
fix by H0zen moved back to its original location
This commit is contained in:
MadMax 2016-01-21 16:00:31 +00:00
commit 816a068b40
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/WorldHandlers/Spell.cpp
View File

@ -4241,12 +4241,7 @@ SpellCastResult Spell::CheckCast(bool strict)
else if (m_caster == target) else if (m_caster == target)
{ {
if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->IsInWorld()) if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->IsInWorld())
{ {
// Arcane Missile self cast forbidden
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_MAGE &&
m_spellInfo->SpellFamilyFlags & UI64LIT(0x00000800))
{ return SPELL_FAILED_BAD_TARGETS; }
// Additional check for some spells // Additional check for some spells
// If 0 spell effect empty - client not send target data (need use selection) // If 0 spell effect empty - client not send target data (need use selection)
// TODO: check it on next client version // TODO: check it on next client version
@ -4255,6 +4250,12 @@ SpellCastResult Spell::CheckCast(bool strict)
{ {
target = m_caster->GetMap()->GetUnit(((Player*)m_caster)->GetSelectionGuid()); target = m_caster->GetMap()->GetUnit(((Player*)m_caster)->GetSelectionGuid());
if (!target) if (!target)
{ return SPELL_FAILED_BAD_TARGETS; }
// Arcane Missile self cast forbidden
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_MAGE &&
m_spellInfo->SpellFamilyFlags & UI64LIT(0x00000800) &&
m_caster == target)
{ return SPELL_FAILED_BAD_TARGETS; } { return SPELL_FAILED_BAD_TARGETS; }
m_targets.setUnitTarget(target); m_targets.setUnitTarget(target);