diff options
| author | megamage <none@none> | 2009-04-05 17:11:43 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-05 17:11:43 -0500 |
| commit | 0fd28a68b71fc86dad3661dadc241b84f8d2809f (patch) | |
| tree | 9046a296732d14fa20710a76faa6158ba3808823 /src/game/Unit.cpp | |
| parent | 508a57313c1b99aaf4185390e55eeb4becdae940 (diff) | |
| parent | 6375f8fc8ce0113edbb3a8798bc6cf0a9b9ff014 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 7f0e2636d7a..c9f7adc6a81 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4104,8 +4104,9 @@ void Unit::RemoveAura(AuraMap::iterator &i, AuraRemoveMode mode) m_ccAuras.remove(Aur); } - // Set remove mode - Aur->SetRemoveMode(mode); + // Set remove mode if mode already not set + if (!Aur->GetRemoveMode()) + Aur->SetRemoveMode(mode); // Statue unsummoned at aura remove Totem* statue = NULL; |