Index: binary-improvements/7dtd-server-fixes/src/CustomCommands/ListPlayersExtended.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CustomCommands/ListPlayersExtended.cs	(revision 141)
+++ binary-improvements/7dtd-server-fixes/src/CustomCommands/ListPlayersExtended.cs	(revision 144)
@@ -32,34 +32,34 @@
 					}
 					m_Console.SendResult (string.Concat (new object[]
-			{
-				string.Empty,
-				++num,
-				". id=",
-				current.Value.fd008f,
-				", ",
-				current.Value.EntityName,
-				", pos=",
-				current.Value.GetPosition (),
-				", rot=",
-				current.Value.rotation,
-				", remote=",
-				current.Value.fd00b2,
-				", health=",
-				current.Value.Health,
-				", deaths=",
-				current.Value.Died,
-				", zombies=",
-				current.Value.KilledZombies,
-				", players=",
-				current.Value.KilledPlayers,
-				", score=",
-				current.Value.Score,
-				", steamid=",
-				CommonMappingFunctions.GetSteamID (ci),
-				", ip=",
-				ip,
-				", ping=",
-				current.Value.pingToServer
-			}
+						{
+							string.Empty,
+							++num,
+							". id=",
+							current.Value.fd008f,
+							", ",
+							current.Value.EntityName,
+							", pos=",
+							current.Value.GetPosition (),
+							", rot=",
+							current.Value.rotation,
+							", remote=",
+							current.Value.fd00b2,
+							", health=",
+							current.Value.Health,
+							", deaths=",
+							current.Value.Died,
+							", zombies=",
+							current.Value.KilledZombies,
+							", players=",
+							current.Value.KilledPlayers,
+							", score=",
+							current.Value.Score,
+							", steamid=",
+							CommonMappingFunctions.GetSteamID (ci),
+							", ip=",
+							ip,
+							", ping=",
+							current.Value.pingToServer
+						}
 					)
 					);
Index: binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs	(revision 141)
+++ binary-improvements/7dtd-server-fixes/src/CustomCommands/ShowInventory.cs	(revision 144)
@@ -1,2 +1,3 @@
+using AllocsFixes.PersistentData;
 using System;
 using System.Collections.Generic;
@@ -6,14 +7,11 @@
 	public class ShowInventory : ConsoleCommand
 	{
-		private GameManager manager;
-
 		public ShowInventory (ConsoleSdtd cons) : base(cons)
 		{
-			manager = m_Console.gameManager;
 		}
 
 		public override string Description ()
 		{
-			return "list inventory of a given player (entity id or name)";
+			return "list inventory of a given player (steam id, entity id or name)";
 		}
 
@@ -27,38 +25,32 @@
 			try {
 				if (_params.Length < 1) {
-					m_Console.SendResult ("Usage: showinventory <playername|entityid>");
+					m_Console.SendResult ("Usage: showinventory <steamid|playername|entityid>");
 					return;
 				}
 
-				int entityId = -1;
-				PlayerDataStuff.PlayerItems items = null;
-				if (int.TryParse (_params [0], out entityId)) {
-					items = PlayerDataStuff.GetPlayerItems (entityId);
-				}
-
-				if (items == null) {
-					string playerName = _params [0].ToLower ();
-					foreach (KeyValuePair<int, EntityPlayer> kvp in manager.World.playerEntities.dict) {
-						if (kvp.Value.EntityName.ToLower ().Equals (playerName)) {
-							entityId = kvp.Key;
-							break;
-						}
-					}
-				}
-				items = PlayerDataStuff.GetPlayerItems (entityId);
-
-				if (items == null) {
-					m_Console.SendResult ("Playername or entity id not found or no inventory saved (first saved after a player has been online for 30s).");
+				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).");
 					return;
 				}
 
+				Log.Out ( "SteamID: " + steamid);
+
+				Player p = PersistentContainer.Instance.Players[steamid];
+
+				Log.Out ("Player");
+
+				PersistentData.Inventory inv = p.Inventory;
+
+				Log.Out ("Inv");
+
 				m_Console.SendResult ("Belt of player:");
-				foreach (KeyValuePair<string, int> kvp in items.belt) {
-					m_Console.SendResult (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+				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));
 				}
 				m_Console.SendResult (string.Empty);
 				m_Console.SendResult ("Bagpack of player:");
-				foreach (KeyValuePair<string, int> kvp in items.bag) {
-					m_Console.SendResult (string.Format ("    {0:000} * {1}", kvp.Value, kvp.Key));
+				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));
 				}
 				m_Console.SendResult (string.Empty);