aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS_TheReturn/SaveSystem.cs
diff options
context:
space:
mode:
authorAShifter <[email protected]>2017-05-02 19:43:15 -0600
committerAShifter <[email protected]>2017-05-02 19:43:15 -0600
commitb06801028acc3b3da80ef5077abe8f0baaa82dac (patch)
tree5c65cccdd17f8d89125841663749cbaf970ed52a /ShiftOS_TheReturn/SaveSystem.cs
parentbbb21a1b32ff2642eb3f9804ef653e57a8be7e41 (diff)
parent8381c825b1c6d4d47af23e9461ece4f4a1f88cc5 (diff)
downloadshiftos_thereturn-b06801028acc3b3da80ef5077abe8f0baaa82dac.tar.gz
shiftos_thereturn-b06801028acc3b3da80ef5077abe8f0baaa82dac.tar.bz2
shiftos_thereturn-b06801028acc3b3da80ef5077abe8f0baaa82dac.zip
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS_TheReturn/SaveSystem.cs')
-rw-r--r--ShiftOS_TheReturn/SaveSystem.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/ShiftOS_TheReturn/SaveSystem.cs b/ShiftOS_TheReturn/SaveSystem.cs
index a27b04f..945869b 100644
--- a/ShiftOS_TheReturn/SaveSystem.cs
+++ b/ShiftOS_TheReturn/SaveSystem.cs
@@ -198,7 +198,10 @@ namespace ShiftOS.Engine
Thread.Sleep(50);
Console.WriteLine("{SYSTEM_INITIATED}");
-
+
+ if (CurrentSave.Users == null)
+ CurrentSave.Users = new List<ClientSave>();
+
if(CurrentSave.Users.Count == 0)
{
@@ -294,8 +297,10 @@ namespace ShiftOS.Engine
public static List<ClientSave> Users
{
- get;
- private set;
+ get
+ {
+ return CurrentSave.Users;
+ }
}
public static event EmptyEventHandler GameReady;