summaryrefslogtreecommitdiffstats
path: root/source/Server.h
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-08-13 22:45:29 +0200
committermadmaxoft <github@xoft.cz>2013-08-13 22:45:29 +0200
commit9020dc993241a4a90e8e98b3435d9b2576f313ea (patch)
tree477b87baeecb8321cc8002e55fdcceb7bd085e3c /source/Server.h
parentFixed logging into debug console. (diff)
downloadcuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.tar
cuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.tar.gz
cuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.tar.bz2
cuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.tar.lz
cuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.tar.xz
cuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.tar.zst
cuberite-9020dc993241a4a90e8e98b3435d9b2576f313ea.zip
Diffstat (limited to '')
-rw-r--r--source/Server.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/Server.h b/source/Server.h
index fad7fc12a..6f8576ece 100644
--- a/source/Server.h
+++ b/source/Server.h
@@ -131,8 +131,9 @@ private:
cListenThread m_ListenThreadIPv4;
cListenThread m_ListenThreadIPv6;
- cCriticalSection m_CSClients; ///< Locks client list
- cClientHandleList m_Clients; ///< Clients that are connected to the server and not yet assigned to a cWorld
+ cCriticalSection m_CSClients; ///< Locks client lists
+ cClientHandleList m_Clients; ///< Clients that are connected to the server and not yet assigned to a cWorld
+ cClientHandleList m_ClientsToRemove; ///< Clients that have just been moved into a world and are to be removed from m_Clients in the next Tick()
cSocketThreads m_SocketThreads;
@@ -164,6 +165,9 @@ private:
void PrepareKeys(void);
bool Tick(float a_Dt);
+
+ /// Ticks the clients in m_Clients, manages the list in respect to removing clients
+ void TickClients(float a_Dt);
// cListenThread::cCallback overrides:
virtual void OnConnectionAccepted(cSocket & a_Socket) override;