aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2016-04-09 15:31:26 +0200
committerShauren <shauren.trinity@gmail.com>2016-04-09 17:58:24 +0200
commit417c19bdad585648b717dcae9253d8548db6abee (patch)
treed376e3f8f8891b550d90d104f3e8507eda8911e4 /src
parentd5d06cadf754bb62ccb02e2272a7d2c681159100 (diff)
Core/Spells: Don't report spell errors to client when spell was triggered and failed some internal condition
(cherry picked from commit a9b4375bb7ef58ad1f3b46350ef9a0f551dc3cac)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/Spell.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 14d6b96d5f2..e82bec0279e 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4888,6 +4888,10 @@ SpellCastResult Spell::CheckCast(bool strict)
m_customError = SpellCustomErrors(condInfo.mLastFailedCondition->ErrorTextId);
return SpellCastResult(condInfo.mLastFailedCondition->ErrorType);
}
+
+ if (_triggeredCastFlags & TRIGGERED_DONT_REPORT_CAST_ERROR)
+ return SPELL_FAILED_DONT_REPORT;
+
if (!condInfo.mLastFailedCondition || !condInfo.mLastFailedCondition->ConditionTarget)
return SPELL_FAILED_CASTER_AURASTATE;
return SPELL_FAILED_BAD_TARGETS;