Changeset 326 for binary-improvements/7dtd-server-fixes/src/LandClaimList.cs

Timestamp:

Sep 4, 2018, 2:33:52 PM (6 years ago)

Author:

alloc

Message:

More cleanup, allocation improvements

File:

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

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

@@ -14 +14 @@
                         Dictionary<Player, List<Vector3i>> result = new Dictionary<Player, List<Vector3i>> ();
 
-                        if (d != null) {
-                                Dictionary<PersistentPlayerData, List<Vector3i>> owners =
-                                        new Dictionary<PersistentPlayerData, List<Vector3i>> ();
-                                foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
-                                        bool allowed = true;
-                                        if (_positionFilters != null) {
-                                                foreach (PositionFilter pf in _positionFilters) {
-                                                        if (!pf (kvp.Key)) {
-                                                                allowed = false;
-                                                                break;
-                                                        }
+                        if (d == null) {
+                                return result;
+                        }
+
+                        Dictionary<PersistentPlayerData, List<Vector3i>> owners =
+                                new Dictionary<PersistentPlayerData, List<Vector3i>> ();
+                        foreach (KeyValuePair<Vector3i, PersistentPlayerData> kvp in d) {
+                                bool allowed = true;
+                                if (_positionFilters != null) {
+                                        foreach (PositionFilter pf in _positionFilters) {
+                                                if (!pf (kvp.Key)) {
+                                                        allowed = false;
+                                                        break;
                                                 }
-                                        }
-
-                                        if (allowed) {
-                                                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) {
-                                        Player p = PersistentContainer.Instance.Players [kvp.Key.PlayerId, false];
-                                        if (p == null) {
-                                                p = new Player (kvp.Key.PlayerId);
+                                if (allowed) {
+                                        if (!owners.ContainsKey (kvp.Value)) {
+                                                owners.Add (kvp.Value, new List<Vector3i> ());
                                         }
 
-                                        bool allowed = true;
-                                        if (_ownerFilters != null) {
-                                                foreach (OwnerFilter of in _ownerFilters) {
-                                                        if (!of (p)) {
-                                                                allowed = false;
-                                                                break;
-                                                        }
+                                        owners [kvp.Value].Add (kvp.Key);
+                                }
+                        }
+
+                        foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
+                                Player p = PersistentContainer.Instance.Players [kvp.Key.PlayerId, false];
+                                if (p == null) {
+                                        p = new Player (kvp.Key.PlayerId);
+                                }
+
+                                bool allowed = true;
+                                if (_ownerFilters != null) {
+                                        foreach (OwnerFilter of in _ownerFilters) {
+                                                if (!of (p)) {
+                                                        allowed = false;
+                                                        break;
                                                 }
                                         }
+                                }
 
-                                        if (allowed) {
-                                                result.Add (p, new List<Vector3i> ());
-                                                foreach (Vector3i v in kvp.Value) {
-                                                        result [p].Add (v);
-                                                }
+                                if (allowed) {
+                                        result.Add (p, new List<Vector3i> ());
+                                        foreach (Vector3i v in kvp.Value) {
+                                                result [p].Add (v);
                                         }
                                 }