Temporary revert 6743 commit. I fix this patch across 1-2 days.

--HG--
branch : trunk

1 files changed, 5 insertions, 6 deletions

diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index 2608f60dcb8..c9692b2ebef 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -48,7 +48,6 @@
 #include "Vehicle.h"
 #include "CreatureAI.h"
 #include "DBCEnums.h"
-#include "TimeMgr.h"
 
 void WorldSession::HandleRepopRequestOpcode( WorldPacket & recv_data )
 {
@@ -383,7 +382,7 @@ void WorldSession::HandleLogoutRequestOpcode( WorldPacket & /*recv_data*/ )
     data << uint32(0);
     data << uint8(0);
     SendPacket( &data );
-    LogoutRequest(sGameTime.GetGameTime());
+    LogoutRequest(time(NULL));
 }
 
 void WorldSession::HandlePlayerLogoutOpcode( WorldPacket & /*recv_data*/ )
@@ -443,7 +442,7 @@ void WorldSession::HandleTogglePvP( WorldPacket & recv_data )
     else
     {
         if(!GetPlayer()->pvpInfo.inHostileArea && GetPlayer()->IsPvP())
-            GetPlayer()->pvpInfo.endTimer = sGameTime.GetGameTime();     // start toggle-off
+            GetPlayer()->pvpInfo.endTimer = time(NULL);     // start toggle-off
     }
 
     //if(OutdoorPvP * pvp = _player->GetOutdoorPvP())
@@ -734,7 +733,7 @@ void WorldSession::HandleReclaimCorpseOpcode(WorldPacket &recv_data)
         return;
 
     // prevent resurrect before 30-sec delay after body release not finished
-    if(corpse->GetGhostTime() + GetPlayer()->GetCorpseReclaimDelay(corpse->GetType()==CORPSE_RESURRECTABLE_PVP) > sGameTime.GetGameTime())
+    if(corpse->GetGhostTime() + GetPlayer()->GetCorpseReclaimDelay(corpse->GetType()==CORPSE_RESURRECTABLE_PVP) > time(NULL))
         return;
 
     if (!corpse->IsWithinDistInMap(GetPlayer(), CORPSE_RECLAIM_RADIUS, true))
@@ -868,7 +867,7 @@ void WorldSession::HandleAreaTriggerOpcode(WorldPacket & recv_data)
     {
         // set resting flag we are in the inn
         GetPlayer()->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
-        GetPlayer()->InnEnter(sGameTime.GetGameTime(), atEntry->mapid, atEntry->x, atEntry->y, atEntry->z);
+        GetPlayer()->InnEnter(time(NULL), atEntry->mapid, atEntry->x, atEntry->y, atEntry->z);
         GetPlayer()->SetRestType(REST_TYPE_IN_TAVERN);
 
         if(sWorld.IsFFAPvPRealm())
@@ -1622,6 +1621,6 @@ void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& recv_data)
     sLog.outDebug("WORLD: CMSG_WORLD_STATE_UI_TIMER_UPDATE");
 
     WorldPacket data(SMSG_WORLD_STATE_UI_TIMER_UPDATE, 4);
-    data << uint32(sGameTime.GetGameTime());
+    data << uint32(time(NULL));
     SendPacket(&data);
 }