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

Timestamp:

Nov 9, 2021, 6:28:33 PM (3 years ago)

Author:

alloc

Message:

Preparations for A20 release
Changes usage of "SteamID" to "UserID" in console commands
Also changes a bunch of the WebAPI stuff to show / use UserIDs

File:

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

binary-improvements/AllocsCommands/Commands/RemoveLandProtection.cs

@@ -11 +11 @@
                 public override string GetHelp () {
                         return "Usage:" +
-                               "  1. removelandprotection <steamid>\n" +
+                               "  1. removelandprotection <userid>\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" +
+                               "1. Remove all land claims owned by the user with the given UserID\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";
@@ -25 +25 @@
                 private void removeById (string _id) {
                         try {
-                                PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
-
-                                if (_id.Length < 1 || !ppl.Players.ContainsKey (_id)) {
+                                if (!PlatformUserIdentifierAbs.TryFromCombinedString (_id, out PlatformUserIdentifierAbs userId)) {
                                         SdtdConsole.Instance.Output (
                                                 "Not a valid Steam ID or user has never logged on. Use \"listlandprotection\" to get a list of keystones.");
                                         return;
                                 }
+                                
+                                PersistentPlayerList ppl = GameManager.Instance.GetPersistentPlayerList ();
 
-                                if (ppl.Players [_id].LPBlocks == null || ppl.Players [_id].LPBlocks.Count == 0) {
+                                if (ppl.Players [userId].LPBlocks == null || ppl.Players [userId].LPBlocks.Count == 0) {
                                         SdtdConsole.Instance.Output (
                                                 "Player does not own any keystones. Use \"listlandprotection\" to get a list of keystones.");
@@ -40 +40 @@
 
                                 List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
-                                foreach (Vector3i pos in ppl.Players [_id].LPBlocks) {
+                                foreach (Vector3i pos in ppl.Players [userId].LPBlocks) {
                                         BlockChangeInfo bci = new BlockChangeInfo (pos, new BlockValue (0), true, false);
                                         changes.Add (bci);
@@ -58 +58 @@
 
                 private void removeByPosition (List<string> _coords) {
-                        int x, y, z;
-                        int.TryParse (_coords [0], out x);
-                        int.TryParse (_coords [1], out y);
-                        int.TryParse (_coords [2], out z);
+                        int.TryParse (_coords [0], out int x);
+                        int.TryParse (_coords [1], out int y);
+                        int.TryParse (_coords [2], out int z);
 
                         if (x == int.MinValue || y == int.MinValue || z == int.MinValue) {
@@ -81 +80 @@
                         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> {bci};
 
                         GameManager.Instance.SetBlocksRPC (changes);
@@ -90 +88 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        try {
+                        if (_params.Count > 0 && _params [0].EqualsCaseInsensitive ("nearby")) {
                                 if (_senderInfo.RemoteClientInfo != null) {
-                                        if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) {
-                                                _params.Add (_senderInfo.RemoteClientInfo.playerId);
-                                        }
+                                        _params.Add (_senderInfo.RemoteClientInfo.entityId.ToString ());
+                                } else if (_senderInfo.IsLocalGame && !GameManager.IsDedicatedServer) {
+                                        _params.Add (GameManager.Instance.World.GetPrimaryPlayerId ().ToString ());
                                 }
 
-                                if (_params.Count > 0 && _params [0].EqualsCaseInsensitive ("nearby")) {
-                                        try {
-                                                int closeToDistance = 32;
-                                                if (_params.Count == 3) {
-                                                        if (!int.TryParse (_params [1], out closeToDistance)) {
-                                                                SdtdConsole.Instance.Output ("Given length is not an integer!");
-                                                                return;
-                                                        }
-
-                                                        closeToDistance /= 2;
+                                try {
+                                        int closeToDistance = 32;
+                                        if (_params.Count == 3) {
+                                                if (!int.TryParse (_params [1], out closeToDistance)) {
+                                                        SdtdConsole.Instance.Output ("Given length is not an integer!");
+                                                        return;
                                                 }
 
-                                                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 =
-                                                        {LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance)};
-                                                Dictionary<Player, List<Vector3i>> claims = LandClaimList.GetLandClaims (null, posFilters);
+                                                closeToDistance /= 2;
+                                        }
 
-                                                try {
-                                                        List<BlockChangeInfo> changes = new List<BlockChangeInfo> ();
-                                                        foreach (KeyValuePair<Player, List<Vector3i>> kvp in claims) {
-                                                                foreach (Vector3i v in kvp.Value) {
-                                                                        BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false);
-                                                                        changes.Add (bci);
-                                                                }
+                                        int entityId = int.Parse (_params [_params.Count - 1]);
+                                        EntityPlayer ep = GameManager.Instance.World.Players.dict [entityId];
+                                        Vector3i closeTo = new Vector3i (ep.GetPosition ());
+                                        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<Player, List<Vector3i>> kvp in claims) {
+                                                        foreach (Vector3i v in kvp.Value) {
+                                                                BlockChangeInfo bci = new BlockChangeInfo (v, new BlockValue (0), true, false);
+                                                                changes.Add (bci);
                                                         }
+                                                }
 
-                                                        GameManager.Instance.SetBlocksRPC (changes);
-                                                } catch (Exception e) {
-                                                        SdtdConsole.Instance.Output ("Error removing claims");
-                                                        Log.Out ("Error in RemoveLandProtection.Run: " + e);
-                                                }
+                                                GameManager.Instance.SetBlocksRPC (changes);
                                         } catch (Exception e) {
-                                                SdtdConsole.Instance.Output ("Error getting current player's position");
+                                                SdtdConsole.Instance.Output ("Error removing claims");
                                                 Log.Out ("Error in RemoveLandProtection.Run: " + e);
                                         }
-                                } else if (_params.Count == 1) {
-                                        removeById (_params [0]);
-                                } else if (_params.Count == 3) {
-                                        removeByPosition (_params);
-                                } else {
-                                        SdtdConsole.Instance.Output ("Illegal parameters");
+                                } catch (Exception e) {
+                                        SdtdConsole.Instance.Output ("Error getting current player's position");
+                                        Log.Out ("Error in RemoveLandProtection.Run: " + e);
                                 }
-                        } catch (Exception e) {
-                                Log.Out ("Error in RemoveLandProtection.Run: " + e);
+                        } else if (_params.Count == 1) {
+                                removeById (_params [0]);
+                        } else if (_params.Count == 3) {
+                                removeByPosition (_params);
+                        } else {
+                                SdtdConsole.Instance.Output ("Illegal parameters");
                         }
                 }