diff options
author | Lukas Pioch <lukas@zgow.de> | 2015-12-30 15:31:42 +0100 |
---|---|---|
committer | Lukas Pioch <lukas@zgow.de> | 2016-01-17 20:11:37 +0100 |
commit | e1ba104359b70d83303caaefce4bcf58c9bd6b76 (patch) | |
tree | 02fbb0b9a7e9299f837196b191f244f75ab43fc0 /src | |
parent | Merge pull request #2887 from LogicParrot/water (diff) | |
download | cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.tar cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.tar.gz cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.tar.bz2 cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.tar.lz cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.tar.xz cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.tar.zst cuberite-e1ba104359b70d83303caaefce4bcf58c9bd6b76.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/ClientHandle.h | 2 | ||||
-rw-r--r-- | src/Server.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ClientHandle.h b/src/ClientHandle.h index d7468d345..22d052f22 100644 --- a/src/ClientHandle.h +++ b/src/ClientHandle.h @@ -415,7 +415,7 @@ private: int m_LastStreamedChunkZ; /** Number of ticks since the last network packet was received (increased in Tick(), reset in OnReceivedData()) */ - int m_TicksSinceLastPacket; + std::atomic<int> m_TicksSinceLastPacket; /** Duration of the last completed client ping. */ std::chrono::steady_clock::duration m_Ping; diff --git a/src/Server.h b/src/Server.h index 4d0bc1c18..9131697c2 100644 --- a/src/Server.h +++ b/src/Server.h @@ -189,7 +189,7 @@ private: bool m_bIsConnected; // true - connected false - not connected - bool m_bRestarting; + std::atomic<bool> m_bRestarting; /** The private key used for the assymetric encryption start in the protocols */ cRsaPrivateKey m_PrivateKey; |