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

Timestamp:

Jul 31, 2023, 4:06:13 PM (16 months ago)

Author:

alloc

Message:

25_30_44

• Got rid (mostly) of custom JSON serialization
• Some code cleanup

File:

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

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

@@ -12 +12 @@
                 [OptionalField] private Attributes attributes;
 
-                public Players Players {
-                        get {
-                                if (players == null) {
-                                        players = new Players ();
-                                }
+                public Players Players => players ??= new Players ();
 
-                                return players;
-                        }
-                }
-
-                public Attributes Attributes {
-                        get {
-                                if (attributes == null) {
-                                        attributes = new Attributes ();
-                                }
-
-                                return attributes;
-                        }
-                }
+                public Attributes Attributes => attributes ??= new Attributes ();
 
                 private static PersistentContainer instance;
 
-                public static PersistentContainer Instance {
-                        get {
-                                if (instance == null) {
-                                        instance = new PersistentContainer ();
-                                }
-
-                                return instance;
-                        }
-                }
+                public static PersistentContainer Instance => instance ??= new PersistentContainer ();
 
                 private PersistentContainer () {
@@ -49 +25 @@
                 public void Save () {
                         lock (fileLockObject) {
-                                using Stream stream = File.Open (GameIO.GetSaveGameDir () + persistentDataFileName, FileMode.Create);
+                                using Stream stream = File.Open ($"{GameIO.GetSaveGameDir ()}{persistentDataFileName}", FileMode.Create);
                                 BinaryFormatter bFormatter = new BinaryFormatter ();
                                 bFormatter.Serialize (stream, this);
@@ -56 +32 @@
 
                 public static bool Load () {
-                        if (!File.Exists (GameIO.GetSaveGameDir () + persistentDataFileName)) {
+                        var filePath = $"{GameIO.GetSaveGameDir ()}{persistentDataFileName}";
+                        
+                        if (!File.Exists (filePath)) {
                                 return false;
                         }
@@ -63 +41 @@
                                 PersistentContainer obj;
                                 lock (fileLockObject) {
-                                        using Stream stream = File.Open (GameIO.GetSaveGameDir () + persistentDataFileName, FileMode.Open);
+                                        using Stream stream = File.Open (filePath, FileMode.Open);
                                         BinaryFormatter bFormatter = new BinaryFormatter ();
                                         obj = (PersistentContainer)bFormatter.Deserialize (stream);