aboutsummaryrefslogtreecommitdiff
path: root/src/game/Spell.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-29 12:22:49 -0600
committermegamage <none@none>2008-12-29 12:22:49 -0600
commit35ce5ca6ba2ac8f0a70049cca652a541f2e10bec (patch)
treea7c78051aee7bf4a6c9c47b2cb8581b0cdaa69b3 /src/game/Spell.cpp
parentbf8c7b928fd2211661a5e83146d6522825e2218d (diff)
*Update to Mangos 6973.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
-rw-r--r--src/game/Spell.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index d78db70b653..a2fd9bf6eaf 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -670,7 +670,7 @@ void Spell::prepareDataForTriggerSystem()
m_procAttacker = PROC_FLAG_SUCCESSFUL_POSITIVE_SPELL;
m_procVictim = PROC_FLAG_TAKEN_POSITIVE_SPELL;
}
- else if (m_spellInfo->Id == 5019) // Wands
+ else if (m_spellInfo->Id != SPELL_ID_AUTOSHOT) // Wands
{
m_procAttacker = PROC_FLAG_SUCCESSFUL_RANGED_SPELL_HIT;
m_procVictim = PROC_FLAG_TAKEN_RANGED_SPELL_HIT;
@@ -2424,7 +2424,7 @@ void Spell::SendSpellCooldown()
// shoot spells used equipped item cooldown values already assigned in GetAttackTime(RANGED_ATTACK)
// prevent 0 cooldowns set by another way
- if (rec <= 0 && catrec <= 0 && (cat == 76 || cat == 351))
+ if (rec <= 0 && catrec <= 0 && (cat == 76 || m_spellInfo->Id != SPELL_ID_AUTOSHOT))
rec = _player->GetAttackTime(RANGED_ATTACK);
// Now we have cooldown data (if found any), time to apply mods