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

--HG--
branch : trunk
This commit is contained in:
n0n4m3
2009-12-24 10:20:15 +01:00
parent acdc4ca15b
commit 250a00cc1c
53 changed files with 365 additions and 354 deletions

View File

@@ -39,7 +39,6 @@
#include "OutdoorPvPMgr.h"
#include "MapManager.h"
#include "SocialMgr.h"
#include "TimeMgr.h"
#include "zlib/zlib.h"
#include "ScriptCalls.h"
@@ -107,13 +106,13 @@ void WorldSession::SendPacket(WorldPacket const* packet)
static uint64 sendPacketCount = 0;
static uint64 sendPacketBytes = 0;
static time_t firstTime = sGameTime.GetGameTime();
static time_t firstTime = time(NULL);
static time_t lastTime = firstTime; // next 60 secs start time
static uint64 sendLastPacketCount = 0;
static uint64 sendLastPacketBytes = 0;
time_t cur_time = sGameTime.GetGameTime();
time_t cur_time = time(NULL);
if((cur_time - lastTime) < 60)
{
@@ -282,7 +281,7 @@ bool WorldSession::Update(uint32 /*diff*/)
}
///- If necessary, log the player out
time_t currTime = sGameTime.GetGameTime();
time_t currTime = time(NULL);
if (!m_Socket || (ShouldLogOut(currTime) && !m_playerLoading))
LogoutPlayer(true);
@@ -659,7 +658,7 @@ void WorldSession::SetAccountData(AccountDataType type, time_t time_, std::strin
void WorldSession::SendAccountDataTimes(uint32 mask)
{
WorldPacket data( SMSG_ACCOUNT_DATA_TIMES, 4+1+4+8*4 ); // changed in WotLK
data << uint32(sGameTime.GetGameTime()); // unix time of something
data << uint32(time(NULL)); // unix time of something
data << uint8(1);
data << uint32(mask); // type mask
for(uint32 i = 0; i < NUM_ACCOUNT_DATA_TYPES; ++i)