diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-01-06 16:40:57 -0800 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-01-06 16:40:57 -0800 |
| commit | facefe09091c32317d73277978886bf2f633cbce (patch) | |
| tree | 59138f5aa4c484cfab7986d7d2d21799cb2ac011 /src/server | |
| parent | 5fe399195f8f46ba1934ac69d6c8f6a2efac794c (diff) | |
| parent | 8743e9d368361e2ba1e8ff7d2758f1783cad73ac (diff) | |
Merge pull request #8870 from Valcorb/PetSpeedFix
Make sure that "guardians" also gain the owner's speed (such as water elemental)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 5d1ab9aa17a..7124995dd10 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12716,7 +12716,7 @@ void Unit::UpdateSpeed(UnitMoveType mtype, bool forced) if (GetTypeId() == TYPEID_UNIT) { Unit* pOwner = GetCharmerOrOwner(); - if (isPet() && !isInCombat() && pOwner) // Must check for owner or crash on "Tame Beast" + if ((isPet() || isGuardian()) && !isInCombat() && pOwner) // Must check for owner or crash on "Tame Beast" { // For every yard over 5, increase speed by 0.01 // to help prevent pet from lagging behind and despawning |