Index: binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs	(revision 211)
+++ binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs	(revision 213)
@@ -20,56 +20,25 @@
 		public static string GetPlayerName (ClientInfo _ci)
 		{
-			try {
-				int entityId = GetConnectionManager ().mapClientToEntity [_ci.clientId];
-				return GetGameManager ().World.playerEntities.dict [entityId].EntityName;
-			} catch (Exception e) {
-				Log.Out ("Error getting player name for ClientInfo: " + e);
-			}
-			return null;
+			return _ci.playerName;
 		}
 
 		public static EntityPlayer GetEntityPlayer (ClientInfo _ci)
 		{
-			try {
-				int entityId = GetConnectionManager ().mapClientToEntity [_ci.clientId];
-				return GetGameManager ().World.playerEntities.dict [entityId];
-			} catch (Exception e) {
-				Log.Out ("Error getting entity player for ClientInfo: " + e);
-			}
-			return null;
+			return GetGameManager ().World.playerEntities.dict [_ci.entityId];
 		}
 
 		public static string GetSteamID (ClientInfo _ci)
 		{
-			return Steam.Authentication.Server.GetPlayerId (GetPlayerName (_ci));
-		}
-
-		public static string GetSteamID (string _playerName)
-		{
-			return Steam.Authentication.Server.GetPlayerId (_playerName);
+			return _ci.playerId;
 		}
 
 		public static int GetClientID (ClientInfo _ci)
 		{
-			if (_ci != null) {
-				if (GetConnectionManager ().connectedClients.ContainsKey (_ci.clientId))
-					return _ci.clientId;
-			}
-			return -1;
+			return _ci.clientId;
 		}
 
 		public static int GetEntityID (ClientInfo _ci)
 		{
-			try {
-				ConnectionManager cm = GetConnectionManager ();
-
-				if (cm.mapClientToEntity.ContainsKey (_ci.clientId))
-					return cm.mapClientToEntity [_ci.clientId];
-				else
-					return -1;
-			} catch (Exception e) {
-				Log.Out ("Error getting entity ID for ClientInfo: " + e);
-			}
-			return -1;
+			return _ci.entityId;
 		}
 
@@ -79,13 +48,5 @@
 				ConnectionManager cm = GetConnectionManager ();
 
-				if (cm.mapClientToEntity.ContainsValue (_entityId)) {
-					foreach (KeyValuePair<int, int> kvp in cm.mapClientToEntity) {
-						if (kvp.Value == _entityId) {
-							return cm.connectedClients [kvp.Key];
-						}
-					}
-				}
-
-				return null;
+				return cm.GetClientInfoForEntityId (_entityId);
 			} catch (Exception e) {
 				Log.Out ("Error getting ClientInfo for entity ID: " + e);
@@ -157,15 +118,5 @@
 		public static ClientInfo GetClientInfoFromSteamID (string _steamId)
 		{
-			try {
-				foreach (string name in Steam.Authentication.Server.usersToIDs.Keys) {
-					string curId = string.Empty + Steam.Authentication.Server.usersToIDs[name].steamID.m_SteamID;
-					if (curId.Equals (_steamId)) {
-						return GetClientInfoFromPlayerName (name, false);
-					}
-				}
-			} catch (Exception e) {
-				Log.Out ("Error getting ClientInfo for steam ID: " + e);
-			}
-			return null;
+			return GetConnectionManager ().GetClientInfoForPlayerId (_steamId);
 		}
 
Index: binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs	(revision 211)
+++ binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs	(revision 213)
@@ -24,12 +24,12 @@
 		private static IConnection issuerOfCurrentCommand;
 
-		public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerID, string _command)
+		public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerName, string _playerID, string _command)
 		{
-			Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
+			Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerName + "\"");
 
 			lock (netCommandQueue) {
 				isCurrentCommandFromClient = true;
 				console.issuerOfCurrentClientCommand = _networkPlayer;
-				console.ExecuteClientCmdInternal (_playerID, _command);
+				console.ExecuteClientCmdInternal (_playerName, _playerID, _command);
 				isCurrentCommandFromClient = false;
 			}