Changeset 146

Timestamp:

Aug 30, 2014, 8:08:25 PM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (1 diff)
• 7dtd-server-fixes/src/AllocsLogFunctions.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/CommandExtensions.cs (modified) (1 diff)
• 7dtd-server-fixes/src/CustomCommands/ListLandProtection.cs (modified) (1 diff)
• 7dtd-server-fixes/src/PersistentData/PersistentContainer.cs (modified) (1 diff)
• 7dtd-server-fixes/src/PersistentData/Player.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/PersistentData/Players.cs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -99 +99 @@
     <Compile Include="src\PersistentData\Players.cs" />
     <Compile Include="src\PersistentData\Player.cs" />
+    <Compile Include="src\CustomCommands\ListKnownPlayers.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -30 +30 @@
 
                                 PersistentContainer.Instance.Players[steamId].SetOnline(ci);
+                                PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.RequestToSpawnPlayer: " + e);
@@ -42 +43 @@
                                 if (players.SteamIDs.Contains(steamId))
                                         players[steamId].SetOffline();
+                                PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.PlayerDisconnected: " + e);

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

@@ -17 +17 @@
                                 manager.m_GUIConsole.AddCommand (new Kill (manager.m_GUIConsole));
                                 manager.m_GUIConsole.AddCommand (new ListItems (manager.m_GUIConsole));
+                                manager.m_GUIConsole.AddCommand (new ListKnownPlayers (manager.m_GUIConsole));
                                 manager.m_GUIConsole.AddCommand (new ListLandProtection (manager.m_GUIConsole));
                                 manager.m_GUIConsole.AddCommand (new ListPlayersExtended (manager.m_GUIConsole));

binary-improvements/7dtd-server-fixes/src/CustomCommands/ListLandProtection.cs

@@ -59 +59 @@
                                         foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
                                                 if (steamIdFilter.Length == 0 || kvp.Key.PlayerId.Equals (steamIdFilter)) {
-                                                        ClientInfo ci = CommonMappingFunctions.GetClientInfoFromEntityID (kvp.Key.EntityId);
-                                                        string name = string.Empty;
-                                                        if (ci != null) {
-                                                                name = CommonMappingFunctions.GetPlayerName (ci);
-                                                        }
+                                                        string name = PersistentData.PersistentContainer.Instance.Players[kvp.Key.PlayerId].Name;
                                                         name += " (" + kvp.Key.PlayerId + ")";
 

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

@@ -45 +45 @@
                 {
                         if (File.Exists (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin")) {
-                                PersistentContainer obj;
-                                Stream stream = File.Open (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
-                                BinaryFormatter bFormatter = new BinaryFormatter ();
-                                obj = (PersistentContainer)bFormatter.Deserialize (stream);
-                                stream.Close ();
-                                instance = obj;
-                                return true;
-                        } else
-                                return false;
+                                try {
+                                        PersistentContainer obj;
+                                        Stream stream = File.Open (StaticDirectories.GetSaveGameDir () + "/AllocsPeristentData.bin", FileMode.Open);
+                                        BinaryFormatter bFormatter = new BinaryFormatter ();
+                                        obj = (PersistentContainer)bFormatter.Deserialize (stream);
+                                        stream.Close ();
+                                        instance = obj;
+                                        return true;
+                                } catch (Exception e) {
+                                        Log.Out ("Exception in PersistentContainer.Load: " + e.Message);
+                                }
+                        }
+                        return false;
                 }
 

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

@@ -13 +13 @@
                 private string ip;
                 private long totalPlayTime;
+                [OptionalField]
+                private DateTime
+                        lastOnline;
                 private Inventory inventory;
                 [NonSerialized]
@@ -70 +73 @@
                 }
 
+                public DateTime LastOnline {
+                        get {
+                                if (IsOnline)
+                                        return DateTime.Now;
+                                else
+                                        return lastOnline;
+                        }
+                }
+
                 public void SetOffline ()
                 {
                         Log.Out ("Player set to offline: " + steamId);
                         totalPlayTime += (long)(Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
+                        lastOnline = DateTime.Now;
                         clientInfo = null;
                 }

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

@@ -29 +29 @@
                 public List<string> SteamIDs {
                         get { return new List<string> (players.Keys); }
+                }
+
+                public int Count {
+                        get { return players.Count; }
                 }
 

binary-improvements/bin/Release/7dtd-server-fixes_version.txt

@@ -1 @@
-Version:       0.91.5355.33374
+Version:       0.91.5355.36217