summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-23 18:54:03 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-23 18:54:03 +0200
commita3b7dbb13def773cd9d6ef39e793a07eef281ff5 (patch)
tree1f6b232474d2a2d058e59b9e19f75d7e2b072196
parentFixed players not spawning to others when they join the server. (diff)
downloadcuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.tar
cuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.tar.gz
cuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.tar.bz2
cuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.tar.lz
cuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.tar.xz
cuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.tar.zst
cuberite-a3b7dbb13def773cd9d6ef39e793a07eef281ff5.zip
-rw-r--r--source/Protocol132.cpp3
-rw-r--r--source/cClientHandle.cpp3
2 files changed, 5 insertions, 1 deletions
diff --git a/source/Protocol132.cpp b/source/Protocol132.cpp
index 2b8d4c19c..48ecff0b2 100644
--- a/source/Protocol132.cpp
+++ b/source/Protocol132.cpp
@@ -297,6 +297,9 @@ void cProtocol132::SendLogin(const cPlayer & a_Player, const cWorld & a_World)
Flush();
SendCompass(a_World);
+
+ // Send the initial position (so that confirmation works, FS #245):
+ SendPlayerMoveLook();
}
diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index 75efce3dc..5802fc1d1 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -241,6 +241,8 @@ void cClientHandle::Authenticate(void)
m_Player->SetIP (m_Socket.GetIPString());
cRoot::Get()->GetPluginManager()->CallHook(cPluginManager::HOOK_PLAYER_SPAWN, 1, m_Player);
+
+ m_ConfirmPosition = m_Player->GetPosition();
// Return a server login packet
m_Protocol->SendLogin(*m_Player, *World);
@@ -1499,7 +1501,6 @@ void cClientHandle::SendConfirmPosition(void)
cRoot::Get()->GetServer()->BroadcastChat(m_Username + " joined the game!", this);
}
- m_ConfirmPosition = m_Player->GetPosition();
SendPlayerMoveLook();
}