Changeset 359 for binary-improvements/AllocsCommands/Commands/Give.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/Give.cs (modified) (1 diff)

binary-improvements/AllocsCommands/Commands/Give.cs

@@ -25 +25 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
-                                if (_params.Count != 3 && _params.Count != 4) {
-                                        SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count +
-                                                                     ".");
+                        if (_params.Count != 3 && _params.Count != 4) {
+                                SdtdConsole.Instance.Output ("Wrong number of arguments, expected 3 or 4, found " + _params.Count +
+                                                             ".");
+                                return;
+                        }
+
+                        ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]);
+
+                        if (ci == null) {
+                                SdtdConsole.Instance.Output ("Playername or entity id not found.");
+                                return;
+                        }
+
+                        ItemValue iv = ItemClass.GetItem (_params [1], true);
+                        if (iv.type == ItemValue.None.type) {
+                                SdtdConsole.Instance.Output ("Item not found.");
+                                return;
+                        }
+
+                        iv = new ItemValue (iv.type, true);
+
+                        int n;
+                        if (!int.TryParse (_params [2], out n) || n <= 0) {
+                                SdtdConsole.Instance.Output ("Amount is not an integer or not greater than zero.");
+                                return;
+                        }
+
+                        int quality = Constants.cItemMaxQuality;
+
+                        if (_params.Count == 4) {
+                                if (!int.TryParse (_params [3], out quality) || quality <= 0) {
+                                        SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero.");
                                         return;
                                 }
+                        }
 
-                                ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]);
+                        if (ItemClass.list [iv.type].HasSubItems) {
+                                for (int i = 0; i < iv.Modifications.Length; i++) {
+                                        ItemValue tmp = iv.Modifications [i];
+                                        tmp.Quality = quality;
+                                        iv.Modifications [i] = tmp;
+                                }
+                        } else if (ItemClass.list [iv.type].HasQuality) {
+                                iv.Quality = quality;
+                        }
 
-                                if (ci == null) {
-                                        SdtdConsole.Instance.Output ("Playername or entity id not found.");
-                                        return;
-                                }
+                        EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId];
 
-                                ItemValue iv = ItemClass.GetItem (_params [1], true);
-                                if (iv.type == ItemValue.None.type) {
-                                        SdtdConsole.Instance.Output ("Item not found.");
-                                        return;
-                                }
+                        ItemStack invField = new ItemStack (iv, n);
 
-                                iv = new ItemValue (iv.type, true);
+                        GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero);
 
-                                int n;
-                                if (!int.TryParse (_params [2], out n) || n <= 0) {
-                                        SdtdConsole.Instance.Output ("Amount is not an integer or not greater than zero.");
-                                        return;
-                                }
-
-                                int quality = Constants.cItemMaxQuality;
-
-                                if (_params.Count == 4) {
-                                        if (!int.TryParse (_params [3], out quality) || quality <= 0) {
-                                                SdtdConsole.Instance.Output ("Quality is not an integer or not greater than zero.");
-                                                return;
-                                        }
-                                }
-
-                                if (ItemClass.list [iv.type].HasSubItems) {
-                                        for (int i = 0; i < iv.Modifications.Length; i++) {
-                                                ItemValue tmp = iv.Modifications [i];
-                                                tmp.Quality = quality;
-                                                iv.Modifications [i] = tmp;
-                                        }
-                                } else if (ItemClass.list [iv.type].HasQuality) {
-                                        iv.Quality = quality;
-                                }
-
-                                EntityPlayer p = GameManager.Instance.World.Players.dict [ci.entityId];
-
-                                ItemStack invField = new ItemStack (iv, n);
-
-                                GameManager.Instance.ItemDropServer (invField, p.GetPosition (), Vector3.zero);
-
-                                SdtdConsole.Instance.Output ("Dropped item");
-                        } catch (Exception e) {
-                                Log.Out ("Error in Give.Run: " + e);
-                        }
+                        SdtdConsole.Instance.Output ("Dropped item");
                 }
         }