From b7b37dca298682a44cd1d0c635e0bf40476eefb6 Mon Sep 17 00:00:00 2001 From: QAston Date: Sat, 25 Feb 2012 11:52:28 +0100 Subject: Core/Spells: send spell error messages on spell cast condition checks. --- src/server/game/Spells/Spell.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index db36eb30191..b8d3c5318aa 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4785,11 +4785,16 @@ SpellCastResult Spell::CheckCast(bool strict) // TODO: using WorldSession::SendNotification is not blizzlike if (Player* playerCaster = m_caster->ToPlayer()) { - if (playerCaster->GetSession() && condInfo.mLastFailedCondition + if (playerCaster->GetSession() && condInfo.mLastFailedCondition->ErrorTextId) + { playerCaster->GetSession()->SendNotification(condInfo.mLastFailedCondition->ErrorTextId); + return SPELL_FAILED_DONT_REPORT; + } } - return SPELL_FAILED_DONT_REPORT; + if (!condInfo.mLastFailedCondition->ConditionTarget) + return SPELL_FAILED_CASTER_AURASTATE; + return SPELL_FAILED_BAD_TARGETS; } } -- cgit v1.2.3