Merge pull request #2871 from cuberite/seadragon91-patch1

Fixed race conditions

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;

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;