Changeset 253 for binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

Timestamp:

Dec 12, 2015, 4:08:53 PM (9 years ago)

Author:

alloc

Message:

Fixes 6_8_10

File:

• binary-improvements/AllocsCommands/Commands/ListLandProtection.cs (modified) (2 diffs)

binary-improvements/AllocsCommands/Commands/ListLandProtection.cs

@@ -86 +86 @@
                                 }
 
-                                Dictionary<Vector3i, PersistentPlayerData> d = ppl.m_lpBlockMap;
-                                if (d != null) {
-                                        Dictionary<PersistentPlayerData, List<Vector3i>> owners = new Dictionary<PersistentPlayerData, List<Vector3i>> ();
-                                        foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
-                                                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);
-                                                }
-                                        }
 
-                                        foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-                                                if (steamIdFilter.Length == 0 || kvp.Key.PlayerId.Equals (steamIdFilter)) {
-                                                        PersistentData.Player p = PersistentData.PersistentContainer.Instance.Players [kvp.Key.PlayerId, false];
-                                                        string name = string.Empty;
-                                                        if (p != null) {
-                                                                name = p.Name;
-                                                        }
-                                                        name += " (" + kvp.Key.PlayerId + ")";
+                                LandClaimList.OwnerFilter[] ownerFilters = null;
+                                if (!string.IsNullOrEmpty (steamIdFilter)) {
+                                        ownerFilters = new LandClaimList.OwnerFilter[] { LandClaimList.SteamIdFilter (steamIdFilter) };
+                                }
+                                LandClaimList.PositionFilter[] posFilters = null;
+                                if (onlyCloseToPlayer) {
+                                        posFilters = new LandClaimList.PositionFilter[] { LandClaimList.CloseToFilter2dRect (closeTo, closeToDistance) };
+                                }
 
-                                                        SdtdConsole.Instance.Output (String.Format ("Player \"{0}\" owns {3} keystones (protected: {1}, current hardness multiplier: {2})", name, w.IsLandProtectionValidForPlayer (kvp.Key), w.GetLandProtectionHardnessModifierForPlayer (kvp.Key), kvp.Value.Count));
-                                                        if (!summaryOnly) {
-                                                                foreach (Vector3i v in kvp.Value) {
-                                                                        SdtdConsole.Instance.Output ("   (" + v.ToString () + ")");
-                                                                }
-                                                        }
+                                Dictionary<PersistentData.Player, List<Vector3i>> claims = LandClaimList.GetLandClaims (ownerFilters, posFilters);
+
+                                foreach (KeyValuePair<PersistentData.Player, List<Vector3i>> kvp in claims) {
+                                        SdtdConsole.Instance.Output (String.Format (
+                                                "Player \"{0} ({1})\" owns {4} keystones (protected: {2}, current hardness multiplier: {3})",
+                                                kvp.Key.Name,
+                                                kvp.Key.SteamID,
+                                                kvp.Key.LandProtectionActive,
+                                                kvp.Key.LandProtectionMultiplier,
+                                                kvp.Value.Count));
+                                        if (!summaryOnly) {
+                                                foreach (Vector3i v in kvp.Value) {
+                                                        SdtdConsole.Instance.Output ("   (" + v.ToString () + ")");
                                                 }
                                         }
@@ -118 +114 @@
 
                                 if (steamIdFilter.Length == 0)
-                                        SdtdConsole.Instance.Output ("Total of " + d.Count + " keystones in the game");
+                                        SdtdConsole.Instance.Output ("Total of " + ppl.m_lpBlockMap.Count + " keystones in the game");
                         } catch (Exception e) {
                                 Log.Out ("Error in ListLandProtection.Run: " + e);