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

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -58 +58 @@
 
                 private void removeByPosition (List<string> _coords) {
-                        try {
-                                int x, y, z;
-                                int.TryParse (_coords [0], out x);
-                                int.TryParse (_coords [1], out y);
-                                int.TryParse (_coords [2], out z);
+                        int x, y, z;
+                        int.TryParse (_coords [0], out x);
+                        int.TryParse (_coords [1], out y);
+                        int.TryParse (_coords [2], out z);
 
-                                if (x == int.MinValue || y == int.MinValue || z == int.MinValue) {
-                                        SdtdConsole.Instance.Output ("At least one of the given coordinates is not a valid integer");
-                                        return;
-                                }
+                        if (x == int.MinValue || y == int.MinValue || z == int.MinValue) {
+                                SdtdConsole.Instance.Output ("At least one of the given coordinates is not a valid integer");
+                                return;
+                        }
 
-                                Vector3i v = new Vector3i (x, y, z);
+                        Vector3i v = new Vector3i (x, y, z);
 
-                                PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
+                        PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
 
-                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
-                                if (d == null || !d.ContainsKey (v)) {
-                                        SdtdConsole.Instance.Output (
-                                                "No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones.");
-                                        return;
-                                }
+                        Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
+                        if (d == null || !d.ContainsKey (v)) {
+                                SdtdConsole.Instance.Output (
+                                        "No land protection block at the given position or not a valid position. Use \"listlandprotection\" to get a list of keystones.");
+                                return;
+                        }
 
-                                BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false);
+                        BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false);
 
-                                List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
-                                changes.Add (bci);
+                        List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
+                        changes.Add (bci);
 
-                                GameManager.Instance.SetBlocksRPC (changes);
+                        GameManager.Instance.SetBlocksRPC (changes);
 
-                                SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed");
-                        } catch (Exception e) {
-                                Log.Out ("Error in RemoveLandProtection.removeByPosition: " + e);
-                        }
+                        SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed");
                 }