[patch 303][6995] Fix Auto-Shoot Hunter

[Woweur]

What bug does the patch fix? What features does the patch add?

Hunter can't use another spell when he use auto-shoot.

For which repository revision was the patch created?

6848

Who has been writing this patch? Please include either forum user names or email addresses.

Woweur.

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index f94b221..150b857 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1953,9 +1953,13 @@ void Spell::Prepare(SpellCastTargets * targets, Aura* triggeredByAura)
    //Prevent casting at cast another spell (ServerSide check)
    if(m_caster->IsNonMeleeSpellCasted(false, true) && m_cast_count)
    {
-        SendCastResult(SPELL_FAILED_SPELL_IN_PROGRESS);
-        finish(false);
-        return;
+        // Check if player cast Auto Repeat Spell.
+        if(!m_caster->m_currentSpells[CURRENT_AUTOREPEAT_SPELL])
+        {
+            SendCastResult(SPELL_FAILED_SPELL_IN_PROGRESS);
+            finish(false);
+            return;
+        }
    }

    // Fill cost data

[xeross]

Thank you for this fix

[tase]

Wouldn't it be more appropriate to fix Unit::IsNonMeleeSpellCasted since it has an agurment to skip autorepeat spells (aka return false if spell=autorepeat and skipping=true), which is set at true here, but it still returns true.

So one of the conditions in Unit::IsNonMeleeSpellCasted are true before the function has the time to reach the CURRENT_AUTOREPEAT_SPELL check.

[xeross]

Testing now, as long as it works im satisfied.

[Woweur]

Yes it's Hack. i haven't think to fix it in Unit::IsNonMeleeSpellCasted.

[VladimirMangos]

If this hack then what it do in this section....

[xeross]

Hmm, maybe so that people could use it till there's a non hacked fix for this.

So what would be the correct fix ?

Regards, Xeross

[VladimirMangos]

hunter auto-shoot spell must be considered as CURRENT_AUTOREPEAT_SPELL and

Same what checked in suggested patch can be done just use

IsNonMeleeSpellCasted(false, true, true) call instead current.

Ofc, if original bug report is correct in all cases.

[waza123]

Thanks...!

[VladimirMangos]

Must be fixed in [6995]

[xeross]

You used this code or other?

[VladimirMangos]

I use version suggested by me: adding true for NonMeleeSpellCasted 3 arg.