Changeset 202 for binary-improvements/7dtd-server-fixes/src/CustomCommands/ListLandProtection.cs

Timestamp:

Oct 23, 2014, 3:09:29 PM (10 years ago)

Author:

alloc

Message:

Server fixes

File:

• binary-improvements/7dtd-server-fixes/src/CustomCommands/ListLandProtection.cs (modified) (4 diffs)

binary-improvements/7dtd-server-fixes/src/CustomCommands/ListLandProtection.cs

@@ -20 +20 @@
                 }
 
+                public override void ExecuteRemote (string _sender, string[] _params)
+                {
+                        try {
+                                if (_params.Length >= 1 && _params [0].ToLower ().Equals ("nearby")) {
+                                        string[] params2 = new string[_params.Length + 1];
+                                        for (int i = 0; i < _params.Length; i++)
+                                                params2 [i] = _params [i];
+                                        params2 [_params.Length] = _sender;
+                                        _params = params2;
+                                }
+                                Run (_params);
+                        } catch (Exception e) {
+                                Log.Out ("Error in ListLandProtection.ExecuteRemote: " + e);
+                        }
+                }
+
                 public override void Run (string[] _params)
                 {
@@ -28 +44 @@
                                 bool summaryOnly = false;
                                 string steamIdFilter = string.Empty;
+                                Vector3i closeTo = default(Vector3i);
+                                bool onlyCloseToPlayer = false;
+                                int closeToDistance = 32;
 
                                 if (_params.Length == 1) {
@@ -45 +64 @@
                                                 }
                                         }
+                                } else if (_params.Length >= 2) {
+                                        if (_params [0].ToLower ().Equals ("nearby")) {
+                                                try {
+                                                        if (_params.Length == 3) {
+                                                                if (!int.TryParse (_params[1], out closeToDistance)) {
+                                                                        m_Console.SendResult ("Given radius is not an integer!");
+                                                                }
+                                                        }
+                                                        ClientInfo ci = CommonMappingFunctions.GetClientInfoFromSteamID (_params [_params.Length - 1]);
+                                                        EntityPlayer ep = CommonMappingFunctions.GetEntityPlayer (ci);
+                                                        closeTo = new Vector3i (ep.GetPosition ());
+                                                        onlyCloseToPlayer = true;
+                                                } catch (Exception e) {
+                                                        m_Console.SendResult ("Error getting current player's position");
+                                                        Log.Out ("Error in ListLandProtection.Run: " + e);
+                                                }
+                                        } else {
+                                                m_Console.SendResult ("Illegal parameter list");
+                                                return;
+                                        }
                                 }
 
@@ -51 +90 @@
                                         Dictionary<PersistentPlayerData, List<Vector3i>> owners = new Dictionary<PersistentPlayerData, List<Vector3i>> ();
                                         foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
-                                                if (!owners.ContainsKey (kvp.Value)) {
-                                                        owners.Add (kvp.Value, new List<Vector3i> ());
+                                                if (!onlyCloseToPlayer || (Math.Abs (kvp.Key.x - closeTo.x) <= closeToDistance && Math.Abs (kvp.Key.z - closeTo.z) <= closeToDistance)) {
+                                                        if (!owners.ContainsKey (kvp.Value)) {
+                                                                owners.Add (kvp.Value, new List<Vector3i> ());
+                                                        }
+                                                        owners [kvp.Value].Add (kvp.Key);
                                                 }
-                                                owners [kvp.Value].Add (kvp.Key);
                                         }
 
                                         foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
                                                 if (steamIdFilter.Length == 0 || kvp.Key.PlayerId.Equals (steamIdFilter)) {
-                                                        string name = PersistentData.PersistentContainer.Instance.Players[kvp.Key.PlayerId].Name;
+                                                        string name = PersistentData.PersistentContainer.Instance.Players [kvp.Key.PlayerId].Name;
                                                         name += " (" + kvp.Key.PlayerId + ")";