Changeset 391 for binary-improvements2/7dtd-server-fixes/src/LandClaimList.cs

Timestamp:

Aug 7, 2022, 3:02:24 PM (2 years ago)

Author:

alloc

Message:

Major refactoring/cleanup

File:

• binary-improvements2/7dtd-server-fixes/src/LandClaimList.cs (modified) (1 diff)

binary-improvements2/7dtd-server-fixes/src/LandClaimList.cs

@@ -20 +20 @@
                         Dictionary<PersistentPlayerData, List<Vector3i>> owners =
                                 new Dictionary<PersistentPlayerData, List<Vector3i>> ();
-                        foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
+                        foreach ((Vector3i claimPos, PersistentPlayerData owner) in d) {
                                 bool allowed = true;
                                 if (_positionFilters != null) {
                                         foreach (PositionFilter pf in _positionFilters) {
-                                                if (!pf (kvp.Key)) {
-                                                        allowed = false;
-                                                        break;
+                                                if (pf (claimPos)) {
+                                                        continue;
                                                 }
+
+                                                allowed = false;
+                                                break;
                                         }
                                 }
 
-                                if (allowed) {
-                                        if (!owners.ContainsKey (kvp.Value)) {
-                                                owners.Add (kvp.Value, new List<Vector3i> ());
-                                        }
+                                if (!allowed) {
+                                        continue;
+                                }
 
-                                        owners [kvp.Value].Add (kvp.Key);
+                                if (!owners.ContainsKey (owner)) {
+                                        owners.Add (owner, new List<Vector3i> ());
                                 }
+
+                                owners [owner].Add (claimPos);
                         }
 
-                        foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-                                Player p = PersistentContainer.Instance.Players [kvp.Key.UserIdentifier, false];
-                                if (p == null) {
-                                        p = new Player (kvp.Key.UserIdentifier);
-                                }
+                        foreach ((PersistentPlayerData owner, List<Vector3i> claimPositions) in owners) {
+                                Player p = PersistentContainer.Instance.Players [owner.UserIdentifier, false] ?? new Player (owner.UserIdentifier);
 
                                 bool allowed = true;
                                 if (_ownerFilters != null) {
                                         foreach (OwnerFilter of in _ownerFilters) {
-                                                if (!of (p)) {
-                                                        allowed = false;
-                                                        break;
+                                                if (of (p)) {
+                                                        continue;
                                                 }
+
+                                                allowed = false;
+                                                break;
                                         }
                                 }
 
-                                if (allowed) {
-                                        result.Add (p, new List<Vector3i> ());
-                                        foreach (Vector3i v in kvp.Value) {
-                                                result [p].Add (v);
-                                        }
+                                if (!allowed) {
+                                        continue;
+                                }
+
+                                result.Add (p, new List<Vector3i> ());
+                                foreach (Vector3i v in claimPositions) {
+                                        result [p].Add (v);
                                 }
                         }