summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-05-27 09:37:51 +0200
committerMattes D <github@xoft.cz>2014-05-27 09:37:51 +0200
commit2a74e822d549fdee6de6bc22aff6764d7ebd2fd9 (patch)
tree3648634ed5acb75162c2317b259ee268956e2d99 /src
parentUpdate main.css (diff)
parentClientHandle.cpp: Process look before pos (diff)
downloadcuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.tar
cuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.tar.gz
cuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.tar.bz2
cuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.tar.lz
cuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.tar.xz
cuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.tar.zst
cuberite-2a74e822d549fdee6de6bc22aff6764d7ebd2fd9.zip
Diffstat (limited to 'src')
-rw-r--r--src/ClientHandle.cpp24
1 files changed, 2 insertions, 22 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 83b21ae3c..9b03bead9 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1391,28 +1391,8 @@ void cClientHandle::HandlePlayerLook(float a_Rotation, float a_Pitch, bool a_IsO
void cClientHandle::HandlePlayerMoveLook(double a_PosX, double a_PosY, double a_PosZ, double a_Stance, float a_Rotation, float a_Pitch, bool a_IsOnGround)
{
- if ((m_Player == NULL) || (m_State != csPlaying))
- {
- // The client hasn't been spawned yet and sends nonsense, we know better
- return;
- }
-
- /*
- // TODO: Invalid stance check
- if ((a_PosY >= a_Stance) || (a_Stance > a_PosY + 1.65))
- {
- LOGD("Invalid stance");
- SendPlayerMoveLook();
- return;
- }
- */
-
- m_Player->MoveTo(Vector3d(a_PosX, a_PosY, a_PosZ));
- m_Player->SetStance (a_Stance);
- m_Player->SetTouchGround(a_IsOnGround);
- m_Player->SetHeadYaw (a_Rotation);
- m_Player->SetYaw (a_Rotation);
- m_Player->SetPitch (a_Pitch);
+ HandlePlayerLook(a_Rotation, a_Pitch, a_IsOnGround);
+ HandlePlayerPos(a_PosX, a_PosY, a_PosZ, a_Stance, a_IsOnGround);
}