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

Timestamp:

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

Author:

alloc

Message:

fixes

File:

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

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ShowInventory.cs

@@ -23 +23 @@
         public override void Run (string[] _params)
         {
-                if (_params.Length < 1) {
-                        m_Console.md000a ("Usage: showinventory <playername|entityid>");
-                        return;
-                }
+                try {
+                        if (_params.Length < 1) {
+                                m_Console.md000a ("Usage: showinventory <playername|entityid>");
+                                return;
+                        }
 
-                int entityId = -1;
-                PlayerDataStuff.PlayerItems items = null;
-                if (int.TryParse (_params [0], out entityId)) {
-                        items = PlayerDataStuff.GetPlayerItems (entityId);
-                }
+                        int entityId = -1;
+                        PlayerDataStuff.PlayerItems items = null;
+                        if (int.TryParse (_params [0], out entityId)) {
+                                items = PlayerDataStuff.GetPlayerItems (entityId);
+                        }
 
-                if (items == null) {
-                        string playerName = _params [0].ToLower ();
-                        foreach (KeyValuePair<int, EntityPlayer> kvp in manager.World.playerEntities.dict) {
-                                if (kvp.Value.EntityName.ToLower ().Equals (playerName)) {
-                                        entityId = kvp.Key;
-                                        break;
+                        if (items == null) {
+                                string playerName = _params [0].ToLower ();
+                                foreach (KeyValuePair<int, EntityPlayer> kvp in manager.World.playerEntities.dict) {
+                                        if (kvp.Value.EntityName.ToLower ().Equals (playerName)) {
+                                                entityId = kvp.Key;
+                                                break;
+                                        }
                                 }
                         }
+                        items = PlayerDataStuff.GetPlayerItems (entityId);
+
+                        if (items == null) {
+                                m_Console.md000a ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
+                                return;
+                        }
+
+                        m_Console.md000a ("Belt of player:");
+                        foreach (KeyValuePair<string, int> kvp in items.belt) {
+                                m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+                        }
+                        m_Console.md000a (string.Empty);
+                        m_Console.md000a ("Bagpack of player:");
+                        foreach (KeyValuePair<string, int> kvp in items.bag) {
+                                m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+                        }
+                        m_Console.md000a (string.Empty);
+                } catch (Exception e) {
+                        Log.Out ("Error in ShowInventory.Run: " + e);
                 }
-                items = PlayerDataStuff.GetPlayerItems (entityId);
-
-                if (items == null) {
-                        m_Console.md000a ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
-                        return;
-                }
-
-                m_Console.md000a ("Belt of player:");
-                foreach (KeyValuePair<string, int> kvp in items.belt) {
-                        m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
-                }
-                m_Console.md000a (string.Empty);
-                m_Console.md000a ("Bagpack of player:");
-                foreach (KeyValuePair<string, int> kvp in items.bag) {
-                        m_Console.md000a (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
-                }
-                m_Console.md000a (string.Empty);
         }
 }