aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorariel- <ariel-@users.noreply.github.com>2018-02-14 23:10:41 -0300
committerShauren <shauren.trinity@gmail.com>2021-06-21 00:06:41 +0200
commit5323a7d38697967c12abe9b2903b97e271a2cac1 (patch)
treec1d05adb531c3c07bfbf87a742118641b9aa24ed /src
parentcb8ea03175da37f6a59c4586429ffd65217179ca (diff)
Core/Spells: fixed server being too overzealous with autoshot
- Interrupting it when casting another spell and switching targets Ref #21390 (cherry picked from commit 93cbe815cb6dfc1cd7535db2cabf81d42bf60da7)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/Spell.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 59d67d12069..a14c2e04e06 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -2970,7 +2970,7 @@ void Spell::prepare(SpellCastTargets const& targets, AuraEffect const* triggered
m_caster->m_Events.AddEvent(_spellEvent, m_caster->m_Events.CalculateTime(1));
//Prevent casting at cast another spell (ServerSide check)
- if (!(_triggeredCastFlags & TRIGGERED_IGNORE_CAST_IN_PROGRESS) && m_caster->IsNonMeleeSpellCast(false, true, true) && !m_castId.IsEmpty())
+ if (!(_triggeredCastFlags & TRIGGERED_IGNORE_CAST_IN_PROGRESS) && m_caster->IsNonMeleeSpellCast(false, true, true, m_spellInfo->Id == 75) && !m_castId.IsEmpty())
{
SendCastResult(SPELL_FAILED_SPELL_IN_PROGRESS);
finish(false);