summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-16 10:41:35 +0100
committermadmaxoft <github@xoft.cz>2013-12-16 10:41:51 +0100
commitf521cbeb31e90e4c5c25edb6686544530ddbaf99 (patch)
tree23bb2c79cfa99432976685e7fcdf06068f6a47b7 /src/ClientHandle.cpp
parentFixed multiple player spawn broadcasts. (diff)
downloadcuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.gz
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.bz2
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.lz
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.xz
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.zst
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.zip
Diffstat (limited to '')
-rw-r--r--src/ClientHandle.cpp49
1 files changed, 43 insertions, 6 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index d082725b6..8a41b5fac 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1476,12 +1476,6 @@ void cClientHandle::Tick(float a_Dt)
}
m_Protocol->DataReceived(IncomingData.data(), IncomingData.size());
- if (m_State == csAuthenticated)
- {
- StreamChunks();
- m_State = csDownloadingWorld;
- }
-
m_TimeSinceLastPacket += a_Dt;
if (m_TimeSinceLastPacket > 30000.f) // 30 seconds time-out
{
@@ -1536,6 +1530,49 @@ void cClientHandle::Tick(float a_Dt)
+void cClientHandle::ServerTick(float a_Dt)
+{
+ // Handle clients that are waiting for final close while destroyed:
+ if (m_State == csDestroyedWaiting)
+ {
+ // Do not wait while the client is not in the world, simply cut them off.
+ m_State = csDestroyed;
+ return;
+ }
+
+ // Process received network data:
+ AString IncomingData;
+ {
+ cCSLock Lock(m_CSIncomingData);
+ std::swap(IncomingData, m_IncomingData);
+ }
+ m_Protocol->DataReceived(IncomingData.data(), IncomingData.size());
+
+ if (m_State == csAuthenticated)
+ {
+ StreamChunks();
+
+ // Remove the client handle from the server, it will be ticked from its cPlayer object from now on
+ cRoot::Get()->GetServer()->ClientMovedToWorld(this);
+
+ // Add the player to the world (start ticking from there):
+ m_State = csDownloadingWorld;
+ m_Player->GetWorld()->AddPlayer(m_Player);
+ return;
+ }
+
+ m_TimeSinceLastPacket += a_Dt;
+ if (m_TimeSinceLastPacket > 30000.f) // 30 seconds time-out
+ {
+ SendDisconnect("Nooooo!! You timed out! D: Come back!");
+ Destroy();
+ }
+}
+
+
+
+
+
void cClientHandle::SendAttachEntity(const cEntity & a_Entity, const cEntity * a_Vehicle)
{
m_Protocol->SendAttachEntity(a_Entity, a_Vehicle);