Changeset 369 for binary-improvements/AllocsCommands/Commands/ListLandProtection.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/ListLandProtection.cs (modified) (9 diffs)

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -12 +12 @@
                         return "Usage:\n" +
                                "  1. listlandprotection summary\n" +
-                               "  2. listlandprotection <steam id / player name / entity id> [parseable]\n" +
+                               "  2. listlandprotection <user id / player name / entity id> [parseable]\n" +
                                "  3. listlandprotection nearby [length]\n" +
                                "1. Lists only players that own claimstones, the number they own and the protection status\n" +
-                               "2. Lists only the claims of the player given by his SteamID / entity id / playername, including the individual claim positions.\n" +
+                               "2. Lists only the claims of the player given by his UserID / entity id / playername, including the individual claim positions.\n" +
                                "   If \"parseable\" is specified the output of the individual claims will be in a format better suited for programmatical readout.\n" +
                                "3. Lists claims in a square with edge length of 64 (or the optionally specified size) around the executing player\n";
@@ -25 +25 @@
 
                 public override void Execute (List<string> _params, CommandSenderInfo _senderInfo) {
-                        if (_senderInfo.RemoteClientInfo != null) {
-                                if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) {
-                                        _params.Add (_senderInfo.RemoteClientInfo.playerId);
+                        if (_params.Count >= 1 && _params [0].EqualsCaseInsensitive ("nearby")) {
+                                if (_senderInfo.RemoteClientInfo != null) {
+                                        _params.Add (_senderInfo.RemoteClientInfo.entityId.ToString ());
+                                } else if (_senderInfo.IsLocalGame && !GameManager.IsDedicatedServer) {
+                                        _params.Add (GameManager.Instance.World.GetPrimaryPlayerId ().ToString ());
                                 }
                         }
@@ -35 +37 @@
 
                         bool summaryOnly = false;
-                        string steamIdFilter = string.Empty;
+                        PlatformUserIdentifierAbs userIdFilter = null;
                         Vector3i closeTo = default (Vector3i);
                         bool onlyCloseToPlayer = false;
@@ -47 +49 @@
 
                         if (_params.Count == 1) {
-                                long tempLong;
-
                                 if (_params [0].EqualsCaseInsensitive ("summary")) {
                                         summaryOnly = true;
-                                } else if (_params [0].Length == 17 && long.TryParse (_params [0], out tempLong)) {
-                                        steamIdFilter = _params [0];
+                                } else if (PlatformUserIdentifierAbs.TryFromCombinedString (_params[0], out userIdFilter)) {
                                 } else {
                                         ClientInfo ci = ConsoleHelper.ParseParamIdOrName (_params [0]);
                                         if (ci != null) {
-                                                steamIdFilter = ci.playerId;
+                                                userIdFilter = ci.PlatformId;
                                         } else {
                                                 SdtdConsole.Instance.Output ("Player name or entity id \"" + _params [0] + "\" not found.");
@@ -74 +73 @@
                                                 }
 
-                                                ClientInfo ci = ConsoleHelper.ParseParamSteamIdOnline (_params [_params.Count - 1]);
-                                                EntityPlayer ep = w.Players.dict [ci.entityId];
+                                                int entityId = int.Parse (_params [_params.Count - 1]);
+                                                EntityPlayer ep = w.Players.dict [entityId];
                                                 closeTo = new Vector3i (ep.GetPosition ());
                                                 onlyCloseToPlayer = true;
@@ -91 +90 @@
 
                         LandClaimList.OwnerFilter[] ownerFilters = null;
-                        if (!string.IsNullOrEmpty (steamIdFilter)) {
-                                ownerFilters = new[] {LandClaimList.SteamIdFilter (steamIdFilter)};
+                        if (userIdFilter != null) {
+                                ownerFilters = new[] {LandClaimList.UserIdFilter (userIdFilter)};
                         }
 
@@ -106 +105 @@
                                         "Player \"{0} ({1})\" owns {4} keystones (protected: {2}, current hardness multiplier: {3})",
                                         kvp.Key.Name,
-                                        kvp.Key.SteamID,
+                                        kvp.Key.PlatformId,
                                         kvp.Key.LandProtectionActive,
                                         kvp.Key.LandProtectionMultiplier,
@@ -113 +112 @@
                                         foreach (Vector3i v in kvp.Value) {
                                                 if (parseableOutput) {
-                                                        SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.SteamID +
+                                                        SdtdConsole.Instance.Output ("LandProtectionOf: id=" + kvp.Key.PlatformId +
                                                                                      ", playerName=" + kvp.Key.Name + ", location=" + v);
                                                 } else {
@@ -122 +121 @@
                         }
 
-                        if (string.IsNullOrEmpty (steamIdFilter)) {
+                        if (userIdFilter == null) {
                                 SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game");
                         }