Changeset 325 for binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

Timestamp:

Sep 4, 2018, 1:00:48 PM (6 years ago)

Author:

alloc

Message:

Code style cleanup (mostly whitespace changes, enforcing braces, using cleanup)

File:

• binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs (modified) (8 diffs)

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
+using AllocsFixes.PersistentData;
 
-namespace AllocsFixes.CustomCommands
-{
-        public class RemoveLandProtection : ConsoleCmdAbstract
-        {
-                public override string GetDescription ()
-                {
+namespace AllocsFixes.CustomCommands {
+        public class RemoveLandProtection : ConsoleCmdAbstract {
+                public override string GetDescription () {
                         return "removes the association of a land protection block to the owner";
                 }
@@ -13 +11 @@
                 public override string GetHelp () {
                         return "Usage:" +
-                                   "  1. removelandprotection <steamid>\n" +
-                                   "  2. removelandprotection <x> <y> <z>\n" +
-                                   "  3. removelandprotection nearby [length]\n" +
-                                   "1. Remove all land claims owned by the user with the given SteamID\n" +
-                                   "2. Remove only the claim block on the exactly given block position\n" +
-                                   "3. Remove all claims in a square with edge length of 64 (or the optionally specified size) around the executing player";
+                               "  1. removelandprotection <steamid>\n" +
+                               "  2. removelandprotection <x> <y> <z>\n" +
+                               "  3. removelandprotection nearby [length]\n" +
+                               "1. Remove all land claims owned by the user with the given SteamID\n" +
+                               "2. Remove only the claim block on the exactly given block position\n" +
+                               "3. Remove all claims in a square with edge length of 64 (or the optionally specified size) around the executing player";
                 }
 
-                public override string[] GetCommands ()
-                {
-                        return new string[] { "removelandprotection", "rlp" };
+                public override string[] GetCommands () {
+                        return new[] {"removelandprotection", "rlp"};
                 }
 
-                private void removeById (string _id)
-                {
+                private void removeById (string _id) {
                         try {
                                 PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
 
                                 if (_id.Length < 1 || !ppl.Players.ContainsKey (_id)) {
-                                        SdtdConsole.Instance.Output ("Not a valid Steam ID or user has never logged on. Use \"listlandprotection\" to get a list of keystones.");
+                                        SdtdConsole.Instance.Output (
+                                                "Not a valid Steam ID or user has never logged on. Use \"listlandprotection\" to get a list of keystones.");
                                         return;
                                 }
+
                                 if (ppl.Players [_id].LPBlocks == null || ppl.Players [_id].LPBlocks.Count == 0) {
-                                        SdtdConsole.Instance.Output ("Player does not own any keystones. Use \"listlandprotection\" to get a list of keystones.");
+                                        SdtdConsole.Instance.Output (
+                                                "Player does not own any keystones. Use \"listlandprotection\" to get a list of keystones.");
                                         return;
                                 }
 
                                 List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
-                                foreach (Vector3i pos in ppl.Players[_id].LPBlocks) {
+                                foreach (Vector3i pos in ppl.Players [_id].LPBlocks) {
                                         BlockChangeInfo bci = new BlockChangeInfo (pos, new BlockValue (0), true, false);
                                         changes.Add (bci);
                                 }
+
                                 GameManager.Instance.SetBlocksRPC (changes);
 
-                                SdtdConsole.Instance.Output ("Tried to remove #" + changes.Count + " land protection blocks for player \"" + _id + "\". Note "+
-                                                      "that only blocks in chunks that are currently loaded (close to any player) could be removed. "+
-                                                      "Please check for remaining blocks by running:");
-                                SdtdConsole.Instance.Output("  listlandprotection " + _id);
+                                SdtdConsole.Instance.Output ("Tried to remove #" + changes.Count +
+                                                             " land protection blocks for player \"" + _id + "\". Note " +
+                                                             "that only blocks in chunks that are currently loaded (close to any player) could be removed. " +
+                                                             "Please check for remaining blocks by running:");
+                                SdtdConsole.Instance.Output ("  listlandprotection " + _id);
                         } catch (Exception e) {
                                 Log.Out ("Error in RemoveLandProtection.removeById: " + e);
@@ -56 +57 @@
                 }
 
-                private void removeByPosition (List<string> _coords)
-                {
+                private void removeByPosition (List<string> _coords) {
                         try {
                                 int x = int.MinValue;
@@ -77 +77 @@
                                 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.");
+                                        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;
                                 }
@@ -88 +89 @@
                                 GameManager.Instance.SetBlocksRPC (changes);
 
-                                SdtdConsole.Instance.Output ("Land protection block at (" + v.ToString () + ") removed");
+                                SdtdConsole.Instance.Output ("Land protection block at (" + v + ") removed");
                         } catch (Exception e) {
                                 Log.Out ("Error in RemoveLandProtection.removeByPosition: " + e);
@@ -94 +95 @@
                 }
 
-                public override void Execute (List<string> _params, CommandSenderInfo _senderInfo)
-                {
+                public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
                         try {
                                 if (_senderInfo.RemoteClientInfo != null) {
@@ -107 +107 @@
                                                 int closeToDistance = 32;
                                                 if (_params.Count == 3) {
-                                                        if (!int.TryParse (_params[1], out closeToDistance)) {
+                                                        if (!int.TryParse (_params [1], out closeToDistance)) {
                                                                 SdtdConsole.Instance.Output ("Given length is not an integer!");
                                                                 return;
                                                         }
+
                                                         closeToDistance /= 2;
                                                 }
+
                                                 ClientInfo ci = ConsoleHelper.ParseParamSteamIdOnline (_params [_params.Count - 1]);
                                                 EntityPlayer ep = GameManager.Instance.World.Players.dict [ci.entityId];
                                                 Vector3i closeTo = new Vector3i (ep.GetPosition ());
-                                                LandClaimList.PositionFilter[] posFilters = new LandClaimList.PositionFilter[] { LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance) };
-                                                Dictionary<PersistentData.Player, List<Vector3i>> claims = LandClaimList.GetLandClaims (null, posFilters);
+                                                LandClaimList.PositionFilter[] posFilters =
+                                                        {LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance)};
+                                                Dictionary<Player, List<Vector3i>> claims = LandClaimList.GetLandClaims (null, posFilters);
 
                                                 try {
                                                         List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
-                                                        foreach (KeyValuePair<PersistentData.Player, List<Vector3i>> kvp in claims) {
+                                                        foreach (KeyValuePair<Player, List<Vector3i>> kvp in claims) {
                                                                 foreach (Vector3i v in kvp.Value) {
                                                                         BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false);
@@ -127 +130 @@
                                                                 }
                                                         }
+
                                                         GameManager.Instance.SetBlocksRPC (changes);
                                                 } catch (Exception e) {
                                                         SdtdConsole.Instance.Output ("Error removing claims");
                                                         Log.Out ("Error in RemoveLandProtection.Run: " + e);
-                                                        return;
                                                 }
                                         } catch (Exception e) {
                                                 SdtdConsole.Instance.Output ("Error getting current player's position");
                                                 Log.Out ("Error in RemoveLandProtection.Run: " + e);
-                                                return;
                                         }
                                 } else if (_params.Count == 1) {