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

quiet some annoying warnings; make godmode behave as it did originally

Browse Source
This commit is contained in:
CodeCodon
2015-07-24 15:44:23 -05:00
parent cda239d06a
commit 34734c8879
4 changed files with 11 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
+4 -1
View File
@@ -242,7 +242,10 @@ Client::Client(ConnectionServerConnection & connection, const NetworkId & charac
connectToEmitter(connection, "ConnectionServerConnectionDestroyed");
// Check god permissions
if (AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel))
if ( ConfigServerGame::getAdminGodToAll()
|| ( (!ConfigServerGame::getUseSecureLoginForGodAccess() || m_isSecure)
&& AdminAccountManager::isAdminAccount(Unicode::toLower(accountName), m_godLevel)
&& (!ConfigServerGame::getUseIPForGodAccess() || AdminAccountManager::isInternalIp(ipAddr))))
{
m_godValidated = true;
if (ConfigServerGame::getAdminGodToAll())
engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ void ConfigServerGame::install(void)
KEY_BOOL (profileScripts, false);
KEY_BOOL (crashOnScriptError, false);
KEY_BOOL (compileScripts, true);
KEY_BOOL (trapScriptCrashes, false);
KEY_BOOL (trapScriptCrashes, true);
KEY_INT (scriptWatcherWarnTime, 5000);
KEY_INT (scriptWatcherInterruptTime, 5000);
KEY_INT (scriptStackErrorLimit, 35);