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

*Do not check power for triggered spells. This fix broken execute.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-04 10:06:16 -06:00
parent 36f7dd04b3
commit 18cbc94dd4
2 changed files with 6396 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6382
CRLFfix.diff Normal file
View File

File diff suppressed because it is too large Load Diff

26
src/game/Spell.cpp
View File

@@ -2100,8 +2100,9 @@ void Spell::prepare(SpellCastTargets * targets, Aura* triggeredByAura)
{
m_caster->SetCurrentCastedSpell( this );
m_selfContainer = &(m_caster->m_currentSpells[GetCurrentContainer()]);
SendSpellStart();
}
SendSpellStart();
}
}
@@ -2182,13 +2183,16 @@ void Spell::cast(bool skipCheck)
if(m_caster->GetTypeId() != TYPEID_PLAYER && m_targets.getUnitTarget() && m_targets.getUnitTarget() != m_caster)
m_caster->SetInFront(m_targets.getUnitTarget());
castResult = CheckPower();
if(castResult != 0)
if(!m_IsTriggeredSpell)
{
SendCastResult(castResult);
finish(false);
SetExecutedCurrently(false);
return;
castResult = CheckPower();
if(castResult != 0)
{
SendCastResult(castResult);
finish(false);
SetExecutedCurrently(false);
return;
}
}
// triggered cast called from Spell::prepare where it was already checked
@@ -2224,7 +2228,7 @@ void Spell::cast(bool skipCheck)
// CAST SPELL
SendSpellCooldown();
SendCastResult(castResult);
//SendCastResult(castResult);
SendSpellGo(); // we must send smsg_spell_go packet before m_castItem delete in TakeCastItem()...
if(m_customAttr & SPELL_ATTR_CU_DIRECT_DAMAGE)
@@ -3646,16 +3650,14 @@ uint8 Spell::CanCast(bool strict)
}
}*/
if(!m_skipCheck && !m_triggeredByAuraSpell)
if(!m_IsTriggeredSpell)
{
if(uint8 castResult = CheckRange(strict))
return castResult;
if(!m_IsTriggeredSpell)
{
if(uint8 castResult = CheckPower())
return castResult;
//if(!m_triggeredByAuraSpell) // triggered spell not affected by stun/etc
if(uint8 castResult = CheckCasterAuras())
return castResult;
}