aboutsummaryrefslogtreecommitdiff
path: root/src/game/Player.cpp
diff options
context:
space:
mode:
authorsilver1ce <none@none>2010-01-20 15:05:58 +0200
committersilver1ce <none@none>2010-01-20 15:05:58 +0200
commit7ce1c094c0af82ff74e2a32d2e911dd81e730d8e (patch)
treea1df3ed4d8c59c3326a1722f865ea92a82d49676 /src/game/Player.cpp
parent6e76e6725353638a79c6f55dcb236e35707ec3f3 (diff)
Fixes #420 fixed out-of-range group member's position update, which broken after 7014f421c8
--HG-- branch : trunk
Diffstat (limited to 'src/game/Player.cpp')
-rw-r--r--src/game/Player.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index b1db9d75107..480a8f26a70 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -5987,22 +5987,17 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
// mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
//AURA_INTERRUPT_FLAG_JUMP not sure
- bool move2d = (teleport || GetPositionX() != x || GetPositionY() != y);
-
- if (move2d || GetPositionZ() != z)
- {
- // group update
- if (move2d && GetGroup())
- SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
+ // group update
+ if (GetGroup())
+ SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
- // code block for underwater state update
- UpdateUnderwaterState(GetMap(), x, y, z);
+ // code block for underwater state update
+ UpdateUnderwaterState(GetMap(), x, y, z);
- if(GetTrader() && !IsWithinDistInMap(GetTrader(), INTERACTION_DISTANCE))
- GetSession()->SendCancelTrade();
+ if(GetTrader() && !IsWithinDistInMap(GetTrader(), INTERACTION_DISTANCE))
+ GetSession()->SendCancelTrade();
- CheckExploreSystem();
- }
+ CheckExploreSystem();
return true;
}