Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/authserver/Server/AuthSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Server/WorldSocket.h
This commit is contained in:
commit
55eafa247d
21 files changed
+817
-337
No files matched your search
@@ -134,7 +134,7 @@ WorldSession::WorldSession(uint32 id, uint32 battlenetAccountId, std::shared_ptr
|
||||
|
||||
if (sock)
|
||||
{
|
||||
m_Address = sock->GetRemoteIpAddress();
|
||||
m_Address = sock->GetRemoteIpAddress().to_string();
|
||||
ResetTimeOutTime();
|
||||
LoginDatabase.PExecute("UPDATE account SET online = 1 WHERE id = %u;", GetAccountId()); // One-time query
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user