aboutsummaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorkaelima <kaelima@live.se>2013-01-20 21:30:11 +0100
committerkaelima <kaelima@live.se>2013-01-20 21:30:11 +0100
commit4d7b2c4929c7efc5ce5c82f7a884d383094cc087 (patch)
treee234d4db1d7bb0e80590eb56d8c268b5c0040a99 /src/server
parent4372d24a7cc9dab325a9352bedf053a7580ac7b4 (diff)
Corrections to 1eab850cab9c71c0e8086af538aded557c526914
Diffstat (limited to 'src/server')
-rw-r--r--src/server/game/Entities/Player/Player.h2
-rwxr-xr-xsrc/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp2
2 files changed, 2 insertions, 2 deletions
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<Player>
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<Creature>::_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;