nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-21 12:47:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/World/World.h
This commit is contained in:
郑佩茹
2023-02-09 12:40:25 -07:00
parent 2ec6f2d92f b491b2f6f8
commit 03b3f9d051
1253 changed files with 114535 additions and 40950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Server/WorldSession.cpp
View File

@@ -703,7 +703,7 @@ void WorldSession::LogoutPlayer(bool save)
METRIC_EVENT("player_events", "Logout", _player->GetName());
LOG_INFO("entities.player", "Account: {} (IP: {}) Logout Character:[{}] ({}) Level: {}",
GetAccountId(), GetRemoteAddress(), _player->GetName(), _player->GetGUID().ToString(), _player->getLevel());
GetAccountId(), GetRemoteAddress(), _player->GetName(), _player->GetGUID().ToString(), _player->GetLevel());
uint32 statementIndex = CHAR_UPD_ACCOUNT_ONLINE;
uint32 statementParam = GetAccountId();

5
src/server/game/Server/WorldSocket.cpp
View File

@@ -385,7 +385,10 @@ WorldSocket::ReadDataHandlerResult WorldSocket::ReadDataHandler()
}
// Our Idle timer will reset on any non PING opcodes on login screen, allowing us to catch people idling.
_worldSession->ResetTimeOutTime(false);
if (packetToQueue->GetOpcode() != CMSG_WARDEN_DATA)
{
_worldSession->ResetTimeOutTime(false);
}
// Copy the packet to the heap before enqueuing
_worldSession->QueuePacket(packetToQueue);