Changeset 448 for binary-improvements/7dtd-server-fixes

Timestamp:

Jun 16, 2023, 3:31:26 PM (2 years ago)

Author:

alloc

Message:

24_29_42

Location:

binary-improvements/7dtd-server-fixes

Files:

• ModInfo.xml (modified) (1 diff)
• src/LandClaimList.cs (modified) (1 diff)
• src/PersistentData/PersistentContainer.cs (modified) (4 diffs)

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="28" />
+                <Version value="29" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -45 +45 @@
                                         PlatformUserIdentifierAbs platformId = kvp.Key.PlatformUserIdentifier;
                                         PlatformUserIdentifierAbs internalId = kvp.Key.UserIdentifier;
-                                        PlatformUserIdentifierAbs crossPlatformId = platformId.Equals (internalId) ? null : internalId;
+                                        PlatformUserIdentifierAbs crossPlatformId = platformId == null || platformId.Equals (internalId) ? null : internalId;
                                         p = new Player (internalId, platformId, crossPlatformId);
                                 }

binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs

@@ -7 +7 @@
         [Serializable]
         public class PersistentContainer {
+                private const string persistentDataFileName = "/AllocsPersistentData.bin";
+                
                 private Players players;
                 [OptionalField] private Attributes attributes;
@@ -44 +46 @@
                 private PersistentContainer () {
                 }
-
+                
                 public void Save () {
-                        Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Create);
-                        BinaryFormatter bFormatter = new BinaryFormatter ();
-                        bFormatter.Serialize (stream, this);
-                        stream.Close ();
+                        lock (fileLockObject) {
+                                using Stream stream = File.Open (GameIO.GetSaveGameDir () + persistentDataFileName, FileMode.Create);
+                                BinaryFormatter bFormatter = new BinaryFormatter ();
+                                bFormatter.Serialize (stream, this);
+                        }
                 }
 
                 public static bool Load () {
-                        if (!File.Exists (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
+                        if (!File.Exists (GameIO.GetSaveGameDir () + persistentDataFileName)) {
                                 return false;
                         }
@@ -59 +62 @@
                         try {
                                 PersistentContainer obj;
-                                Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
-                                BinaryFormatter bFormatter = new BinaryFormatter ();
-                                obj = (PersistentContainer) bFormatter.Deserialize (stream);
-                                stream.Close ();
+                                lock (fileLockObject) {
+                                        using Stream stream = File.Open (GameIO.GetSaveGameDir () + persistentDataFileName, FileMode.Open);
+                                        BinaryFormatter bFormatter = new BinaryFormatter ();
+                                        obj = (PersistentContainer)bFormatter.Deserialize (stream);
+                                }
+
                                 instance = obj;
                                 return true;
@@ -72 +77 @@
                         return false;
                 }
+
+                private static readonly object fileLockObject = new();
         }
 }