swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-13 21:01:08 -04:00
Code Issues Projects Releases Wiki Activity

add seemingly redundant check to allow godmode properly

Browse Source
This commit is contained in:
DarthArgus
2017-01-01 17:22:42 +00:00
parent de68ba41ea
commit 5a693791f6
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/core/Client.cpp
+14 -2
View File
@@ -244,8 +244,8 @@ Client::Client(ConnectionServerConnection & connection, const NetworkId & charac
connectToEmitter(connection, "ConnectionServerConnectionDestroyed");
// Check god permissions
if ( ConfigServerGame::getAdminGodToAll()
|| ( (!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure)
if (ConfigServerGame::getAdminGodToAll()
|| ((!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure)
&& AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel)
&& (!ConfigServerGame::getUseIPForGodAccess() || AdminAccountManager::isInternalIp(ipAddr))))
{
@@ -2229,6 +2229,18 @@ bool Client::setGodMode(bool value)
{
bool wasInGodMode = m_godMode;
m_godMode = value;
// Check god permissions
// the check above seems not to work
if (ConfigServerGame::getAdminGodToAll()
|| ((!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure)
&& AdminAccountManager::isAdminAccount(Unicode::toLower(m_accountName), m_godLevel)
&& (!ConfigServerGame::getUseIPForGodAccess() || AdminAccountManager::isInternalIp(m_ipAddress))))
{
m_godValidated = true;
if (ConfigServerGame::getAdminGodToAll())
m_godLevel = ConfigServerGame::getAdminGodToAllGodLevel();
}
if (value && !m_godValidated)
{