Changeset 103 for binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs

Timestamp:

Jul 24, 2014, 3:25:58 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs

@@ -6 +6 @@
         public static string[] GetAllowedCommandsList (AdminTools admTools, string _steamID)
         {
-                AdminToolsClientInfo tmpInfo = admTools.GetClientCommandInfo (_steamID);
-
-                List<AdminToolsCommandPermissions> perms = admTools.commandPermissions;
                 List<string> allowed = new List<string> ();
 
-                ConsoleSdtd console = ConnectionManager.Instance.gameManager.m_GUIConsole;
+                try {
+                        AdminToolsClientInfo tmpInfo = admTools.GetClientCommandInfo (_steamID);
 
-                foreach (AdminToolsCommandPermissions atcp in perms) {
-                        if (tmpInfo.SteamID != null && tmpInfo.SteamID.Length > 0) {
-                                if ((atcp.PermissionLevel >= tmpInfo.PermissionLevel) || (atcp.PermissionLevel >= 1000)) {
-                                        addAllowed (console, allowed, atcp.Command);
-                                }
-                        } else {
-                                if (atcp.PermissionLevel >= 1000) {
-                                        addAllowed (console, allowed, atcp.Command);
+                        List<AdminToolsCommandPermissions> perms = admTools.commandPermissions;
+                        ConsoleSdtd console = CommonMappingFunctions.GetGameManager ().m_GUIConsole;
+
+                        foreach (AdminToolsCommandPermissions atcp in perms) {
+                                if (tmpInfo.SteamID != null && tmpInfo.SteamID.Length > 0) {
+                                        if ((atcp.PermissionLevel >= tmpInfo.PermissionLevel) || (atcp.PermissionLevel >= 1000)) {
+                                                addAllowed (console, allowed, atcp.Command);
+                                        }
+                                } else {
+                                        if (atcp.PermissionLevel >= 1000) {
+                                                addAllowed (console, allowed, atcp.Command);
+                                        }
                                 }
                         }
+                } catch (Exception e) {
+                        Log.Out ("Error in GetAllowedCommandsList: " + e);
                 }
+
 
                 return allowed.ToArray ();