diff options
| author | QAston <none@none> | 2009-05-02 17:43:41 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-05-02 17:43:41 +0200 |
| commit | 8a05a5b91cf884c87c9ada5b0bd0ab872a3167e0 (patch) | |
| tree | 17e34b1e90476bd1fbf20fc93c33f01d236f07f4 /src/game/Unit.cpp | |
| parent | a1f73a8a0801f217df5fe56cbe7051cd029b5f77 (diff) | |
Handle spell effects in order from dbcs
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5f946045192..458fb466cef 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -3681,7 +3681,7 @@ int32 Unit::GetMaxNegativeAuraModifierByMiscValue(AuraType auratype, int32 misc_ return modifier; } -bool Unit::AddAura(Aura *Aur) +bool Unit::AddAura(Aura *Aur, bool handleEffects) { // aura doesn't apply effects-return if (!Aur->GetEffectMask() || Aur->IsExpired()) @@ -3779,7 +3779,8 @@ bool Unit::AddAura(Aura *Aur) m_ccAuras.push_back(Aur); } - Aur->HandleEffects(true); + if (handleEffects) + Aur->HandleEffects(true); sLog.outDebug("Aura %u now is in use", Aur->GetId()); return true; @@ -10175,7 +10176,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) // for some spells this mod is applied on vehicle owner uint32 owner_speed_mod = ((Vehicle*)this)->GetOwner()->GetMaxPositiveAuraModifier(SPELL_AURA_MOD_INCREASE_VEHICLE_FLIGHT_SPEED); - main_speed_mod>owner_speed_mod ? main_speed_mod : owner_speed_mod; + main_speed_mod = main_speed_mod>owner_speed_mod ? main_speed_mod : owner_speed_mod; } else if (IsMounted()) { |