Changes in binary-improvements [213:211]

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (2 diffs)
• 7dtd-server-fixes/src/CommonMappingFunctions.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs (modified) (1 diff)
• assembly-patcher/Main.cs (modified) (1 diff)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• bin/Release/7dtd-server-fixes_version.txt (modified) (1 diff)
• bin/Release/Assembly-CSharp.patched.dll (modified) ( previous)
• server-fixes.userprefs (modified) (2 diffs)

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

@@ -48 +48 @@
       <HintPath>..\7dtd-binaries\UnityEngine.dll</HintPath>
     </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\7dtd-binaries\Assembly-CSharp.dll</HintPath>
+    </Reference>
     <Reference Include="EasyAntiCheat.Client">
       <HintPath>..\7dtd-binaries\EasyAntiCheat.Client.dll</HintPath>
@@ -59 +62 @@
     <Reference Include="LogLibrary">
       <HintPath>..\7dtd-binaries\LogLibrary.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\7dtd-binaries\Assembly-CSharp.dll</HintPath>
     </Reference>
   </ItemGroup>

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

@@ -20 +20 @@
                 public static string GetPlayerName (ClientInfo _ci)
                 {
-                        return _ci.playerName;
+                        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;
                 }
 
                 public static EntityPlayer GetEntityPlayer (ClientInfo _ci)
                 {
-                        return GetGameManager ().World.playerEntities.dict [_ci.entityId];
+                        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;
                 }
 
                 public static string GetSteamID (ClientInfo _ci)
                 {
-                        return _ci.playerId;
+                        return Steam.Authentication.Server.GetPlayerId (GetPlayerName (_ci));
+                }
+
+                public static string GetSteamID (string _playerName)
+                {
+                        return Steam.Authentication.Server.GetPlayerId (_playerName);
                 }
 
                 public static int GetClientID (ClientInfo _ci)
                 {
-                        return _ci.clientId;
+                        if (_ci != null) {
+                                if (GetConnectionManager ().connectedClients.ContainsKey (_ci.clientId))
+                                        return _ci.clientId;
+                        }
+                        return -1;
                 }
 
                 public static int GetEntityID (ClientInfo _ci)
                 {
-                        return _ci.entityId;
+                        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;
                 }
 
@@ -48 +79 @@
                                 ConnectionManager cm = GetConnectionManager ();
 
-                                return cm.GetClientInfoForEntityId (_entityId);
+                                if (cm.mapClientToEntity.ContainsValue (_entityId)) {
+                                        foreach (KeyValuePair<int, int> kvp in cm.mapClientToEntity) {
+                                                if (kvp.Value == _entityId) {
+                                                        return cm.connectedClients [kvp.Key];
+                                                }
+                                        }
+                                }
+
+                                return null;
                         } catch (Exception e) {
                                 Log.Out ("Error getting ClientInfo for entity ID: " + e);
@@ -118 +157 @@
                 public static ClientInfo GetClientInfoFromSteamID (string _steamId)
                 {
-                        return GetConnectionManager ().GetClientInfoForPlayerId (_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;
                 }
 

binary-improvements/7dtd-server-fixes/src/NetConnections/ConsoleOutputSeparator.cs

@@ -24 +24 @@
                 private static IConnection issuerOfCurrentCommand;
 
-                public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerName, string _playerID, string _command)
+                public static void C_ExecuteCmdFromClient (ConsoleSdtd console, NetworkPlayer _networkPlayer, string _playerID, string _command)
                 {
-                        Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerName + "\"");
+                        Log.Out ("Executed command \"" + _command + "\" from player \"" + _playerID + "\"");
 
                         lock (netCommandQueue) {
                                 isCurrentCommandFromClient = true;
                                 console.issuerOfCurrentClientCommand = _networkPlayer;
-                                console.ExecuteClientCmdInternal (_playerName, _playerID, _command);
+                                console.ExecuteClientCmdInternal (_playerID, _command);
                                 isCurrentCommandFromClient = false;
                         }

binary-improvements/assembly-patcher/Main.cs

@@ -41 +41 @@
                 {
                         TypeDefinition type = module.GetType ("ConsoleSdtd");
-                        replaceMethod (type, "ExecuteCmdFromClient", true, 4, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_ExecuteCmdFromClient"));
+                        replaceMethod (type, "ExecuteCmdFromClient", true, 3, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_ExecuteCmdFromClient"));
                         addHook (type, "Run", true, 0, true, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_Run"));
                         replaceMethod (type, "SendResult", true, 1, typeof(AllocsFixes.NetConnections.ConsoleOutputSeparator).GetMethod ("C_SendResult"));

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

@@ -1 @@
-Version:       0.103.5461.3294
+Version:       0.103.5459.40864

binary-improvements/server-fixes.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release_Version" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/CommonMappingFunctions.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs">
     <Files>
       <File FileName="7dtd-server-fixes/src/PersistentData/Players.cs" Line="40" Column="70" />
@@ -12 +12 @@
       <File FileName="7dtd-server-fixes/src/CustomCommands/webstat.cs" Line="6" Column="22" />
       <File FileName="7dtd-server-fixes/src/CustomCommands/ListLandProtection.cs" Line="70" Column="44" />
-      <File FileName="7dtd-server-fixes/src/CommonMappingFunctions.cs" Line="163" Column="47" />
+      <File FileName="7dtd-server-fixes/src/CommonMappingFunctions.cs" Line="88" Column="5" />
       <File FileName="7dtd-server-fixes/src/AllocsLogFunctions.cs" Line="24" Column="33" />
-      <File FileName="7dtd-server-fixes/src/CustomCommands/ListPlayerIds.cs" Line="47" Column="1" />
-      <File FileName="7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs" Line="20" Column="27" />
-      <File FileName="7dtd-server-fixes/src/AssemblyInfo.cs" Line="20" Column="34" />
+      <File FileName="7dtd-server-fixes/src/CustomCommands/ListPlayersExtended.cs" Line="46" Column="5" />
+      <File FileName="7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs" Line="21" Column="1" />
     </Files>
     <Pads>