aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2015-06-17 16:45:28 +0200
committerDDuarte <dnpd.dd@gmail.com>2015-06-26 01:26:22 +0100
commit2538a84d0c0449c9f437b081e1017a52edfdc4a9 (patch)
tree148b1585d22817bd9e1ec805510fa77f5e2c31fa
parent24b5dfcb4dd3a8bfd08562db8d9c1590529ed457 (diff)
Core/Units: Changed SPELL_AURA_MOD_MINIMUM_SPEED to always be applied, not only if under a slow aura (SPELL_AURA_MOD_MINIMUM_SPEED can set the minimum speed higher than base speed)
(cherry picked from commit d2142ac380863716ecea6f4aa44f7e556e44dfd9)
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 9b0da57fa31..b9d4650de47 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -12322,15 +12322,15 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced)
// Apply strongest slow aura mod to speed
int32 slow = GetMaxNegativeAuraModifier(SPELL_AURA_MOD_DECREASE_SPEED);
if (slow)
- {
AddPct(speed, slow);
- if (float minSpeedMod = (float)GetMaxPositiveAuraModifier(SPELL_AURA_MOD_MINIMUM_SPEED))
- {
- float min_speed = minSpeedMod / 100.0f;
- if (speed < min_speed)
- speed = min_speed;
- }
+
+ if (float minSpeedMod = (float)GetMaxPositiveAuraModifier(SPELL_AURA_MOD_MINIMUM_SPEED))
+ {
+ float min_speed = minSpeedMod / 100.0f;
+ if (speed < min_speed)
+ speed = min_speed;
}
+
SetSpeed(mtype, speed, forced);
}