Merged branch 'master' into c++11.

2014-10-24 10:19:13 +02:00
parent 51fa6b4090 190d34e2f7
commit 765bf006ad
47 changed files with 310 additions and 193 deletions
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -19,7 +19,7 @@
 #include "../WorldStorage/StatSerializer.h"
 #include "../CompositeChat.h"

-#include "inifile/iniFile.h"
+#include "../IniFile.h"
 #include "json/json.h"

 // 6000 ticks or 5 minutes
@@ -232,7 +232,6 @@ void cPlayer::Tick(float a_Dt, cChunk & a_Chunk)
 			CanMove = false;
 			TeleportToCoords(m_LastPos.x, m_LastPos.y, m_LastPos.z);
 		}
-		m_ClientHandle->StreamChunks();
 	}

 	if (CanMove)