server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Logout Request Packet (#128)

Browse Source 
* Fixed possible logout problems in Major Cities and Inns.
This commit is contained in:
Meltie2013 2021-01-31 11:18:00 -06:00 committed by GitHub
parent c0f1ddbcab
commit 5a4ed6d0d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/game/WorldHandlers/MiscHandler.cpp
View File

@ -329,9 +329,12 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recv_data*/)
DoLootRelease(lootGuid); DoLootRelease(lootGuid);
} }
uint8 reason = 0; bool instantLogout = (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->IsTaxiFlying() || GetSecurity() >= (AccountTypes)sWorld.getConfig(CONFIG_UINT32_INSTANT_LOGOUT));
if (GetPlayer()->IsInCombat()) bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
uint8 reason = 0;
if (GetPlayer()->IsInCombat() && !canLogoutInCombat)
{ {
reason = 1; reason = 1;
} }
@ -344,24 +347,20 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recv_data*/)
reason = 2; // FIXME - Need the correct value reason = 2; // FIXME - Need the correct value
} }
WorldPacket data(SMSG_LOGOUT_RESPONSE, 1 + 4);
data << uint32(reason);
data << uint8(instantLogout);
SendPacket(&data);
if (reason) if (reason)
{ {
WorldPacket data(SMSG_LOGOUT_RESPONSE, 1+4); LogoutRequest(time(0));
data << uint32(reason);
data << uint8(0);
SendPacket(&data);
LogoutRequest(0);
return; return;
} }
// instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in mangosd.conf // instant logout in taverns/cities or on taxi or for admins, gm's, mod's if its enabled in mangosd.conf
if (GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->IsTaxiFlying() || if (instantLogout)
GetSecurity() >= (AccountTypes)sWorld.getConfig(CONFIG_UINT32_INSTANT_LOGOUT))
{ {
WorldPacket data(SMSG_LOGOUT_RESPONSE, 1+4);
data << uint32(0);
data << uint8(1);
SendPacket(&data);
LogoutPlayer(true); LogoutPlayer(true);
return; return;
} }
@ -379,10 +378,6 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket& /*recv_data*/)
GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED); GetPlayer()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_STUNNED);
} }
WorldPacket data(SMSG_LOGOUT_RESPONSE, 1 + 4);
data << uint32(0);
data << uint8(0);
SendPacket(&data);
LogoutRequest(time(NULL)); LogoutRequest(time(NULL));
} }
@ -395,6 +390,12 @@ void WorldSession::HandleLogoutCancelOpcode(WorldPacket& /*recv_data*/)
{ {
DEBUG_LOG("WORLD: Received opcode CMSG_LOGOUT_CANCEL Message"); DEBUG_LOG("WORLD: Received opcode CMSG_LOGOUT_CANCEL Message");
// Player have already logged out serverside, too late to cancel
if (!GetPlayer())
{
return;
}
LogoutRequest(0); LogoutRequest(0);
WorldPacket data(SMSG_LOGOUT_CANCEL_ACK, 0); WorldPacket data(SMSG_LOGOUT_CANCEL_ACK, 0);