Changeset 391 for binary-improvements2/7dtd-server-fixes/src/PersistentData/PersistentContainer.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/PersistentData/PersistentContainer.cs (modified) (2 diffs)

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

@@ -10 +10 @@
                 [OptionalField] private Attributes attributes;
 
-                public Players Players {
-                        get {
-                                if (players == null) {
-                                        players = new Players ();
-                                }
+                public Players Players => players ?? (players = new Players ());
 
-                                return players;
-                        }
-                }
-
-                public Attributes Attributes {
-                        get {
-                                if (attributes == null) {
-                                        attributes = new Attributes ();
-                                }
-
-                                return attributes;
-                        }
-                }
+                public Attributes 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 ?? (instance = new PersistentContainer ());
 
                 private PersistentContainer () {
@@ -58 +34 @@
 
                         try {
-                                PersistentContainer obj;
                                 Stream stream = File.Open (GameIO.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
                                 BinaryFormatter bFormatter = new BinaryFormatter ();
-                                obj = (PersistentContainer) bFormatter.Deserialize (stream);
+                                PersistentContainer obj = (PersistentContainer) bFormatter.Deserialize (stream);
                                 stream.Close ();
                                 instance = obj;