From c3a47076233f3ba6d61b37908cace54d848675ae Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 1 Jan 2017 18:02:40 +0000 Subject: [PATCH] back to stock --- .../serverGame/src/shared/core/Client.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/core/Client.cpp b/engine/server/library/serverGame/src/shared/core/Client.cpp index 12d2b1d0..2c4ebd71 100755 --- a/engine/server/library/serverGame/src/shared/core/Client.cpp +++ b/engine/server/library/serverGame/src/shared/core/Client.cpp @@ -2230,22 +2230,11 @@ 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) { - LOG("CustomerService", ("Avatar:%s denied god mode because it wasn't validated.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str() )); - m_godMode = false; + LOG("CustomerService", ("Avatar:%s denied god mode because it wasn't validated.", PlayerObject::getAccountDescription(getCharacterObjectId()).c_str() )); + m_godMode = false; } CreatureObject *primaryControlledObject = safe_cast(m_primaryControlledObject.getObject());