From 4d7b2c4929c7efc5ce5c82f7a884d383094cc087 Mon Sep 17 00:00:00 2001 From: kaelima Date: Sun, 20 Jan 2013 21:30:11 +0100 Subject: Corrections to 1eab850cab9c71c0e8086af538aded557c526914 --- src/server/game/Entities/Player/Player.h | 2 +- .../game/Movement/MovementGenerators/TargetedMovementGenerator.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 6d9d63b8fda..a1e6591413f 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2222,7 +2222,7 @@ class Player : public Unit, public GridObject void SetBGTeam(uint32 team) { m_bgData.bgTeam = team; - SetByteValue(PLAYER_BYTES_3, 3, uint8(team == ALLIANCE ? TEAM_ALLIANCE : TEAM_HORDE)); + SetByteValue(PLAYER_BYTES_3, 3, uint8(team == ALLIANCE ? 1 : 0)); } uint32 GetBGTeam() const { return m_bgData.bgTeam ? m_bgData.bgTeam : GetTeam(); } diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp index 20c9c6cb608..7a1cf552731 100755 --- a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp +++ b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp @@ -276,7 +276,7 @@ template<> void FollowMovementGenerator::_updateSpeed(Creature& owner) { // pet only sync speed with owner - /// Make sure we are not in the process of a map change + /// Make sure we are not in the process of a map change (IsInWorld) if (!owner.isPet() || !owner.IsInWorld() || !i_target.isValid() || i_target->GetGUID() != owner.GetOwnerGUID()) return; -- cgit v1.2.3