swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-01-17 00:04:52 -05:00
Code Issues Projects Releases Wiki Activity

Revert "remove a check that was malfunctioning"

Browse Source 
This reverts commit 6aae26ed4bbfbabb95d236f38052edaf176da7b8.
This commit is contained in:
DarthArgus
2017-01-01 17:50:33 +00:00
parent 3efe5c9759
commit cce8140c5f
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
engine/server/library/serverGame/src/shared/core/Client.cpp
View File

@@ -2229,13 +2229,24 @@ 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();
}
// wtf, the checks above do nothing
/*if (value && !m_godValidated)
if (value && !m_godValidated)
{
LOG("CustomerService", ("Avatar:%s denied god mode because it wasn't validated.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str() ));
m_godMode = false;
}*/
}
CreatureObject *primaryControlledObject = safe_cast<CreatureObject*>(m_primaryControlledObject.getObject());
if (!primaryControlledObject)