aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-08 15:57:56 +0200
committerQAston <none@none>2009-04-08 15:57:56 +0200
commitd94a23e61a0cf1e921b47390e80182eb435890de (patch)
tree2cf6ab38343c849202a5a95754513a6a7440df89 /src/game/Unit.cpp
parent6cd7985fe8b6cb278f6be549cc28368cc63c171e (diff)
*Fix a typo causing freeze in RemoveSpellbyDamageTaken
--HG-- branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 93fc0e66dcf..182d661fdde 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -519,8 +519,8 @@ void Unit::RemoveSpellbyDamageTaken(uint32 damage, uint32 spell)
{
uint32 removedAuras = m_removedAuras.size();
RemoveAura(aur);
- if (removedAuras+1<m_ccAuras.size())
- iter=m_interruptableAuras.begin();
+ if (removedAuras+1<m_removedAuras.size())
+ iter=m_ccAuras.begin();
}
}
}
@@ -5613,6 +5613,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
// Leader of the Pack
case 24932:
{
+ if (triggerAmount <= 0)
+ return false;
basepoints0 = triggerAmount * GetMaxHealth() / 100;
target = this;
triggered_spell_id = 34299;