*Fix the bug that player turn is not updated in server side.
--HG-- branch : trunk
This commit is contained in:
+8
-2
@@ -5646,10 +5646,12 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
|
|||||||
// mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
|
// mover->RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
|
||||||
//AURA_INTERRUPT_FLAG_JUMP not sure
|
//AURA_INTERRUPT_FLAG_JUMP not sure
|
||||||
|
|
||||||
if(GetOrientation() != orientation)
|
bool turn = (GetOrientation() != orientation);
|
||||||
|
bool move2d = (teleport || GetPositionX() != x || GetPositionY() != y);
|
||||||
|
|
||||||
|
if(turn)
|
||||||
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
|
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TURNING);
|
||||||
|
|
||||||
bool move2d = (teleport || GetPositionX() != x || GetPositionY() != y);
|
|
||||||
if(move2d || GetPositionZ() != z)
|
if(move2d || GetPositionZ() != z)
|
||||||
{
|
{
|
||||||
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE);
|
RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_MOVE);
|
||||||
@@ -5669,6 +5671,10 @@ bool Player::SetPosition(float x, float y, float z, float orientation, bool tele
|
|||||||
|
|
||||||
CheckExploreSystem();
|
CheckExploreSystem();
|
||||||
}
|
}
|
||||||
|
else if(turn)
|
||||||
|
{
|
||||||
|
SetOrientation(orientation);
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user