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

Timestamp:

Aug 30, 2014, 6:32:41 PM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements/7dtd-server-fixes/src

Files:

• CustomCommands/ShowInventory.cs (modified) (2 diffs)
• PersistentData/InvItem.cs (modified) (1 diff)
• PersistentData/Inventory.cs (modified) (1 diff)
• PersistentData/Player.cs (modified) (1 diff)
• PersistentData/Players.cs (modified) (1 diff)
• StateManager.cs (modified) (1 diff)

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

@@ -29 +29 @@
                                 }
 
-                                string steamid = PersistentContainer.Instance.Players.GetSteamID(_params[0], true);
+                                string steamid = PersistentContainer.Instance.Players.GetSteamID (_params [0], true);
                                 if (steamid == null) {
                                         m_Console.SendResult ("Playername or entity/steamid id not found or no inventory saved (first saved after a player has been online for 30s).");
@@ -35 +35 @@
                                 }
 
-                                Log.Out ( "SteamID: " + steamid);
-
-                                Player p = PersistentContainer.Instance.Players[steamid];
-
-                                Log.Out ("Player");
-
+                                Player p = PersistentContainer.Instance.Players [steamid];
                                 PersistentData.Inventory inv = p.Inventory;
-
-                                Log.Out ("Inv");
 
                                 m_Console.SendResult ("Belt of player:");
                                 for (int i = 0; i < inv.belt.Count; i++) {
-                                        m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.belt[i].count, inv.belt[i].itemName));
+                                        if (inv.belt [i] != null)
+                                                m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.belt [i].count, inv.belt [i].itemName));
                                 }
                                 m_Console.SendResult (string.Empty);
                                 m_Console.SendResult ("Bagpack of player:");
                                 for (int i = 0; i < inv.bag.Count; i++) {
-                                        m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.bag[i].count, inv.bag[i].itemName));
+                                        if (inv.bag [i] != null)
+                                                m_Console.SendResult (string.Format ("    Slot {0}: {1:000} * {2}", i, inv.bag [i].count, inv.bag [i].itemName));
                                 }
                                 m_Console.SendResult (string.Empty);

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

@@ -12 +12 @@
                 public InvItem (string itemName, int count)
                 {
+                        this.itemName = itemName;
+                        this.count = count;
                 }
         }

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

@@ -23 +23 @@
                         ProcessInv (bag, pdf.bag);
                         ProcessInv (belt, pdf.inventory);
-                        Log.Out ("Now: belt: " + belt.Count + " - bag: " + bag.Count);
                 }
 

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

@@ -24 +24 @@
                 public int EntityID {
                         get { return entityId; }
-                        set { entityId = value; }
                 }
 
                 public string Name {
                         get { return name; }
-                        set { name = value; }
                 }
 
                 public string IP {
                         get { return ip; }
-                        set { ip = value; }
                 }
 

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

@@ -47 +47 @@
                                                 }
                                         }
+                                }
 
-                                        _nameOrId = _nameOrId.ToLower ();
-                                        foreach (KeyValuePair<string, Player> kvp in players) {
-                                                string name = kvp.Value.Name.ToLower ();
-                                                if (_ignoreColorCodes) {
-                                                        name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
-                                                }
-                                                if (kvp.Value.IsOnline && kvp.Value.Name.Equals (name)) {
-                                                        return kvp.Key;
-                                                }
+                                _nameOrId = _nameOrId.ToLower ();
+                                foreach (KeyValuePair<string, Player> kvp in players) {
+                                        string name = kvp.Value.Name.ToLower ();
+                                        if (_ignoreColorCodes) {
+                                                name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
+                                        }
+                                        if (kvp.Value.IsOnline && name.Equals (_nameOrId)) {
+                                                return kvp.Key;
                                         }
                                 }

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

@@ -18 +18 @@
                 {
                         try {
+                                Log.Out ("Server shutting down!");
                                 PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {