mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 22:37:03 +00:00
Merge branch 'master' into 303
Conflicts: src/game/ObjectMgr.cpp
This commit is contained in:
commit
6224f95fd5
15 changed files with 167 additions and 93 deletions
|
|
@ -5194,6 +5194,10 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
|
|||
x = GetPositionX();
|
||||
y = GetPositionY();
|
||||
z = GetPositionZ();
|
||||
|
||||
// group update
|
||||
if(GetGroup() && (old_x != x || old_y != y))
|
||||
SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
|
||||
}
|
||||
|
||||
// code block for underwater state update
|
||||
|
|
@ -5201,10 +5205,6 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
|
|||
|
||||
CheckExploreSystem();
|
||||
|
||||
// group update
|
||||
if(GetGroup())
|
||||
SetGroupUpdateFlag(GROUP_UPDATE_FLAG_POSITION);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue