aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellEffects.cpp
diff options
context:
space:
mode:
authorForesterDev <11771800+ForesterDev@users.noreply.github.com>2019-06-05 11:09:17 +0400
committerGiacomo Pozzoni <giacomopoz@gmail.com>2019-06-05 09:09:17 +0200
commit1f853480ee07d22fdbe9782d600423bbd4ef4abb (patch)
treed32e92c503a593006018e5fad2d1ce32eb2cce41 /src/server/game/Spells/SpellEffects.cpp
parentb5e04c892084567ccbeacdb1500f0488f1eb48b8 (diff)
Core/Logging: Split logs for unknown and zero triggered spells (#23180)
* Core/Conditions: implement CONDITION_GAMEMASTER * Split logs for unknown and zero triggered spells * Update SpellAuraEffects.cpp * Update SpellAuraEffects.cpp * Update SpellAuraEffects.cpp * Update SpellEffects.cpp * Update SpellAuraEffects.cpp * Update SpellAuraEffects.cpp * Update SpellEffects.cpp * Update SpellEffects.cpp
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rw-r--r--src/server/game/Spells/SpellEffects.cpp30
1 files changed, 26 insertions, 4 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 978974359a1..cdc5936a80b 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -780,11 +780,17 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
}
}
+ if (triggered_spell_id == 0)
+ {
+ TC_LOG_WARN("spells.effect.nospell", "Spell::EffectTriggerSpell: Spell %u [EffectIndex: %u] does not have triggered spell.", m_spellInfo->Id, effIndex);
+ return;
+ }
+
// normal case
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id);
if (!spellInfo)
{
- TC_LOG_ERROR("spells.effecttriggerspell", "Spell::EffectTriggerSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id);
+ TC_LOG_ERROR("spells.effect.nospell", "Spell::EffectTriggerSpell spell %u tried to trigger unknown spell %u", m_spellInfo->Id, triggered_spell_id);
return;
}
@@ -831,12 +837,17 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex)
return;
uint32 triggered_spell_id = m_spellInfo->Effects[effIndex].TriggerSpell;
+ if (triggered_spell_id == 0)
+ {
+ TC_LOG_WARN("spells.effect.nospell", "Spell::EffectTriggerMissileSpell: Spell %u [EffectIndex: %u] does not have triggered spell.", m_spellInfo->Id, effIndex);
+ return;
+ }
// normal case
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id);
if (!spellInfo)
{
- TC_LOG_ERROR("spells.effecttrigermissilespell", "Spell::EffectTriggerMissileSpell spell %u tried to trigger unknown spell %u.", m_spellInfo->Id, triggered_spell_id);
+ TC_LOG_ERROR("spells.effect.nospell", "Spell::EffectTriggerMissileSpell spell %u tried to trigger unknown spell %u.", m_spellInfo->Id, triggered_spell_id);
return;
}
@@ -880,13 +891,18 @@ void Spell::EffectForceCast(SpellEffIndex effIndex)
return;
uint32 triggered_spell_id = m_spellInfo->Effects[effIndex].TriggerSpell;
+ if (triggered_spell_id == 0)
+ {
+ TC_LOG_WARN("spells.effect.nospell", "Spell::EffectForceCast: Spell %u [EffectIndex: %u] does not have triggered spell.", m_spellInfo->Id, effIndex);
+ return;
+ }
// normal case
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id);
if (!spellInfo)
{
- TC_LOG_ERROR("spells", "Spell::EffectForceCast of spell %u: triggering unknown spell id %i.", m_spellInfo->Id, triggered_spell_id);
+ TC_LOG_ERROR("spells.effect.nospell", "Spell::EffectForceCast of spell %u: triggering unknown spell id %i.", m_spellInfo->Id, triggered_spell_id);
return;
}
@@ -930,11 +946,17 @@ void Spell::EffectTriggerRitualOfSummoning(SpellEffIndex effIndex)
return;
uint32 triggered_spell_id = m_spellInfo->Effects[effIndex].TriggerSpell;
+ if (triggered_spell_id == 0)
+ {
+ TC_LOG_WARN("spells.effect.nospell", "Spell::EffectTriggerRitualOfSummoning: Spell %u [EffectIndex: %u] does not have triggered spell.", m_spellInfo->Id, effIndex);
+ return;
+ }
+
SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(triggered_spell_id);
if (!spellInfo)
{
- TC_LOG_ERROR("spells", "EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i.", m_spellInfo->Id, triggered_spell_id);
+ TC_LOG_ERROR("spells.effect.nospell", "EffectTriggerRitualOfSummoning of spell %u: triggering unknown spell id %i.", m_spellInfo->Id, triggered_spell_id);
return;
}