diff options
| author | QAston <none@none> | 2009-04-14 20:59:10 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-04-14 20:59:10 +0200 |
| commit | 95b9404f6d74659a680bd657fbed21f22e9c18a4 (patch) | |
| tree | ea97cf2d56bc043fc266d75c0d9accb6738bf088 | |
| parent | b966e63f73ca1a34173964de91a66c0d8f3e7aaf (diff) | |
*Refresh aura after effect handling to get correct amount for Chimera shot-viper
--HG--
branch : trunk
| -rw-r--r-- | src/game/SpellEffects.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 54e1841b681..66d1463299e 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -4127,7 +4127,7 @@ void Spell::SpellDamageWeaponDmg(uint32 i) ((Player*)m_caster)->AddComboPoints(unitTarget, 1); } // Fan of Knives - if(m_spellInfo->SpellFamilyFlags[1] & 0x40000) + else if(m_spellInfo->SpellFamilyFlags[1] & 0x40000) { // 50% more damage with daggers if (Item* item = ((Player*)m_caster)->GetWeaponForAttack(m_attackType)) @@ -4916,8 +4916,6 @@ void Spell::EffectScriptEffect(uint32 effIndex) flag96 familyFlag = aura->GetSpellProto()->SpellFamilyFlags; if (!(familyFlag[1] & 0x00000080 || familyFlag[0] & 0x0000C000)) continue; - // Refresh aura duration - aura->RefreshAura(); // Serpent Sting - Instantly deals 40% of the damage done by your Serpent Sting. if (familyFlag[0] & 0x4000) @@ -4946,9 +4944,13 @@ void Spell::EffectScriptEffect(uint32 effIndex) //{ // spellId = 53366; // 53366 Chimera Shot - Wyvern //} + + // Refresh aura duration + aura->RefreshAura(); + break; } if (spellId) - m_caster->CastCustomSpell(unitTarget, spellId, &basePoint, 0, 0, false); + m_caster->CastCustomSpell(unitTarget, spellId, &basePoint, 0, 0, true); return; } default: |