From d3d2eb91bbac388f9ffc1e89147c4129e7bcf9af Mon Sep 17 00:00:00 2001
From: Nevan <none@none>
Date: Tue, 18 Aug 2009 19:37:31 +0200
Subject: *Fix Pet movement speed at combar reset. Thanks BlackYoghurt.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 897db20e48b..d21e870a533 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10448,7 +10448,8 @@ void Unit::ClearInCombat()
         if(Unit *owner = GetOwner())
         {
             for(uint8 i = 0; i < MAX_MOVE_TYPE; ++i)
-                SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true);
+                if(owner->GetSpeedRate(UnitMoveType(i)) > GetSpeedRate(UnitMoveType(i)))
+                    SetSpeed(UnitMoveType(i), owner->GetSpeedRate(UnitMoveType(i)), true);
         }
     }
     else if(!isCharmed())
-- 
cgit v1.2.3