Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Server/WorldSession.cpp
This commit is contained in:
Vincent-Michael committed 2013-09-01 23:48:40 +02:00
commit 97fc632b9d
28 files changed
+565 -229

No files matched your search

+3 -2
View File
@@ -103,10 +103,11 @@ public:
ACE_Based::Thread::Sleep(1000);
uint32 curtime = getMSTime();
// normal work
if (_loops != World::m_worldLoopCounter)
uint32 worldLoopCounter = World::m_worldLoopCounter.value();
if (_loops != worldLoopCounter)
{
_lastChange = curtime;
_loops = World::m_worldLoopCounter;
_loops = worldLoopCounter;
}
// possible freeze
else if (getMSTimeDiff(_lastChange, curtime) > _delaytime)