diff options
| author | ShinDarth <borzifrancesco@gmail.com> | 2016-08-14 12:32:01 +0200 |
|---|---|---|
| committer | ShinDarth <borzifrancesco@gmail.com> | 2016-08-14 12:32:01 +0200 |
| commit | 8b02090c0e82604c9bc6f66f7b507161b8036917 (patch) | |
| tree | 70a781554d8b16113b294e81bc893a22d6e52316 | |
| parent | f6b759adced1c876ff729fe08df697de379f1aca (diff) | |
| parent | 48e522aa47b6369e38304ee6fb4361b4f5eb562d (diff) | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | src/game/Handlers/MiscHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Handlers/MiscHandler.cpp b/src/game/Handlers/MiscHandler.cpp index b5b65ba667..76e970dbfe 100644 --- a/src/game/Handlers/MiscHandler.cpp +++ b/src/game/Handlers/MiscHandler.cpp @@ -410,7 +410,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/) if (uint64 lguid = GetPlayer()->GetLootGUID()) DoLootRelease(lguid); - bool instantLogout = (GetSecurity() > SEC_PLAYER || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || GetPlayer()->IsInFlight(); + bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || GetPlayer()->IsInFlight(); /// TODO: Possibly add RBAC permission to log out in combat bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING); |