aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells/SpellEffects.cpp
diff options
context:
space:
mode:
authorsilinoron <none@none>2010-08-23 15:51:34 -0700
committersilinoron <none@none>2010-08-23 15:51:34 -0700
commit34384a38326d2fe8152d266566ebcf8dc6fccb3b (patch)
tree394ec11bfc79410350286d9ecf164b2f857ed7cd /src/server/game/Spells/SpellEffects.cpp
parent2a38ba09caf6dc19c904d447c718d17e01b7d068 (diff)
Spell 62124 should allow critical hits.
Based on patch by Toni.Shocker (yes, again). Fixes issue #3554 Also get rid of GuildScript in TODO, as it already exists. --HG-- branch : trunk
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rw-r--r--src/server/game/Spells/SpellEffects.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index a7d2dfbacf1..c99f25fc325 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -4138,8 +4138,11 @@ void Spell::EffectTaunt(uint32 /*i*/)
if (m_spellInfo->Id == 62124)
{
int32 damageDone = int32(1 + m_caster->GetTotalAttackPowerValue(BASE_ATTACK) * 0.5f);
+ bool is_crit = m_caster->isSpellCrit(unitTarget, m_spellInfo, m_spellSchoolMask, m_attackType);
+ if (is_crit)
+ damageDone *= 2;
m_caster->DealDamage(unitTarget, damageDone, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_HOLY, m_spellInfo, false);
- m_caster->SendSpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damageDone, SPELL_SCHOOL_MASK_HOLY, 0, 0, false, false, false);
+ m_caster->SendSpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damageDone, SPELL_SCHOOL_MASK_HOLY, 0, 0, false, false, is_crit);
}
// Also use this effect to set the taunter's threat to the taunted creature's highest value