aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBlaymoira <none@none>2009-03-15 19:26:01 +0100
committerBlaymoira <none@none>2009-03-15 19:26:01 +0100
commit0b0ca166f2ef87b0d265992bf93ed6d5ab3744e9 (patch)
treee3f53e476b83600c59e23f6aa85760bb286f5f5d /src
parentccefda0578a6f436eb1a184de95083d18e13b606 (diff)
*Fix typo in torment the weak
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Unit.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index c420150bba8..9798b53833e 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4381,8 +4381,8 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode)
{
if(AurSpellInfo->Effect[i] == SPELL_EFFECT_SUMMON &&
(AurSpellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED ||
- AurSpellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 ||
- AurSpellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3))
+ AurSpellInfo->EffectMiscValueB[i] == SUMMON_TYPE_RACE_CONTROLLER ||
+ AurSpellInfo->EffectMiscValueB[i] == SUMMON_TYPE_STEAM_TONK))
{
((Player*)caster)->StopCastingCharm();
break;
@@ -8698,7 +8698,8 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
{
if ((*i)->GetSpellProto()->SpellIconID == 3263 && (*i)->isAffectedOnSpell(spellProto))
{
- DoneTotalMod *=float((*i)->GetModifier()->m_amount + 100.f) / 100.f;
+ if(pVictim->HasAuraType(SPELL_AURA_MOD_DECREASE_SPEED)
+ DoneTotalMod *=float((*i)->GetModifier()->m_amount + 100.f) / 100.f;
break;
}
}