Changeset 359 for binary-improvements/AllocsCommands/Commands/ShowInventory.cs

Timestamp:

Oct 29, 2019, 11:20:45 AM (5 years ago)

Author:

alloc

Message:

Removed unnecessary try-catch-blocks from commands (command handler catches exceptions anyway and provides more detailed output)

File:

• binary-improvements/AllocsCommands/Commands/ShowInventory.cs (modified) (1 diff)

binary-improvements/AllocsCommands/Commands/ShowInventory.cs

@@ -25 +25 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                if (_params.Count < 1) {
-                                        SdtdConsole.Instance.Output ("Usage: showinventory <steamid|playername|entityid> [tag]");
-                                        return;
-                                }
+                        if (_params.Count < 1) {
+                                SdtdConsole.Instance.Output ("Usage: showinventory <steamid|playername|entityid> [tag]");
+                                return;
+                        }
 
-                                string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true);
-                                if (steamid == null) {
-                                        SdtdConsole.Instance.Output (
-                                                "Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s).");
-                                        return;
-                                }
+                        string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true);
+                        if (steamid == null) {
+                                SdtdConsole.Instance.Output (
+                                        "Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s).");
+                                return;
+                        }
 
-                                string tag = null;
-                                if (_params.Count > 1 && _params [1].Length > 0) {
-                                        tag = _params [1];
-                                }
+                        string tag = null;
+                        if (_params.Count > 1 && _params [1].Length > 0) {
+                                tag = _params [1];
+                        }
 
-                                Player p = PersistentContainer.Instance.Players [steamid, false];
-                                PersistentData.Inventory inv = p.Inventory;
+                        Player p = PersistentContainer.Instance.Players [steamid, false];
+                        PersistentData.Inventory inv = p.Inventory;
 
-                                if (tag == null) {
-                                        SdtdConsole.Instance.Output ("Belt of player " + p.Name + ":");
-                                }
+                        if (tag == null) {
+                                SdtdConsole.Instance.Output ("Belt of player " + p.Name + ":");
+                        }
 
-                                PrintInv (inv.belt, p.EntityID, "belt", tag);
-                                if (tag == null) {
-                                        SdtdConsole.Instance.Output (string.Empty);
-                                }
+                        PrintInv (inv.belt, p.EntityID, "belt", tag);
+                        if (tag == null) {
+                                SdtdConsole.Instance.Output (string.Empty);
+                        }
 
-                                if (tag == null) {
-                                        SdtdConsole.Instance.Output ("Bagpack of player " + p.Name + ":");
-                                }
+                        if (tag == null) {
+                                SdtdConsole.Instance.Output ("Bagpack of player " + p.Name + ":");
+                        }
 
-                                PrintInv (inv.bag, p.EntityID, "backpack", tag);
-                                if (tag == null) {
-                                        SdtdConsole.Instance.Output (string.Empty);
-                                }
+                        PrintInv (inv.bag, p.EntityID, "backpack", tag);
+                        if (tag == null) {
+                                SdtdConsole.Instance.Output (string.Empty);
+                        }
 
-                                if (tag == null) {
-                                        SdtdConsole.Instance.Output ("Equipment of player " + p.Name + ":");
-                                }
+                        if (tag == null) {
+                                SdtdConsole.Instance.Output ("Equipment of player " + p.Name + ":");
+                        }
 
-                                PrintEquipment (inv.equipment, p.EntityID, "equipment", tag);
+                        PrintEquipment (inv.equipment, p.EntityID, "equipment", tag);
 
-                                if (tag != null) {
-                                        SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag +
-                                                                     ", SHOWINVENTORY DONE");
-                                }
-                        } catch (Exception e) {
-                                Log.Out ("Error in ShowInventory.Run: " + e);
+                        if (tag != null) {
+                                SdtdConsole.Instance.Output ("tracker_item id=" + p.EntityID + ", tag=" + tag +
+                                                             ", SHOWINVENTORY DONE");
                         }
                 }