Changeset 76

Timestamp:

Jul 17, 2014, 1:46:42 AM (10 years ago)

Author:

alloc

Message:

fixer

Location:

binary-improvements

Files:

• 7dtd-server-fixes/bin/Release/7dtd-server-fixes.dll (modified) ( previous)
• 7dtd-server-fixes/bin/Release/Assembly-CSharp.dll (modified) ( previous)
• 7dtd-server-fixes/src/AllocsRequestToSpawnPlayer.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs (modified) (2 diffs)
• assembly-patcher/Main.cs (modified) (4 diffs)
• assembly-patcher/bin/Release/7dtd-fixer.exe (modified) ( previous)

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

@@ -1 +1 @@
 using System;
+using System.Collections.Generic;
 
 public class AllocsRequestToSpawnPlayer
@@ -6 +7 @@
         {
                 string ip = manager.connectionManager.connectedClients [_clientId].networkPlayer.ipAddress;
-                Log.Out ("Player connected, clientid=" + _clientId + ", ip=" + ip);
+                string name = string.Empty;
+                int entityId = -1;
+                Dictionary<int,int> d = manager.connectionManager.mapClientToEntity;
+                if (d.ContainsKey (_clientId)) {
+                        entityId = d [_clientId];
+                        World w = manager.World;
+                        name = w.playerEntities.dict [entityId].EntityName;
+                }
+
+                Log.Out ("Player connected, clientid=" + _clientId +
+                         ", entityid=" + entityId +
+                         ", name=" + name +
+                         ", steamid=" + SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (name) +
+                         ", ip=" + ip);
         }
 }

binary-improvements/7dtd-server-fixes/src/TelnetCommands/ListPlayersExtended.cs

@@ -22 +22 @@
                 foreach (KeyValuePair<int, EntityPlayer> current in w.playerEntities.dict)
                 {
+                        int clientId = -1;
+                        Dictionary<int,int> d = this.m_Console.gameManager.connectionManager.mapClientToEntity;
+                        foreach (KeyValuePair<int, int> mapping in d) {
+                                if (mapping.Value == current.Value.fd0087) {
+                                        clientId = mapping.Key;
+                                }
+                        }
+                        string ip = string.Empty;
+                        if (clientId >= 0) {
+                                ip = this.m_Console.gameManager.connectionManager.connectedClients [clientId].networkPlayer.ipAddress;
+                        }
                         m_Console.md000a (string.Concat (new object[]
                         {
@@ -46 +57 @@
                                 ", score=",
                                 current.Value.Score,
-                                ", ",
-                                SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (current.Value.EntityName)
+                                ", steamid=",
+                                SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (current.Value.EntityName),
+                                ", ip=",
+                                ip
                         }));
                 }

binary-improvements/assembly-patcher/Main.cs

@@ -12 +12 @@
                         ModuleDefinition module = ModuleDefinition.ReadModule ("Assembly-CSharp.dll");
                         telnetPatch (module);
-                        connectLogPatch(module);
+                        connectLogPatch (module);
                         module.Write ("Assembly-CSharp.dll");
                         Console.WriteLine ("Done");
@@ -26 +26 @@
 
                         markTypePatched (module, type);
-                        addHook (type, "RequestToSpawnPlayer", true, 5, typeof(AllocsRequestToSpawnPlayer).GetMethod ("RequestToSpawnPlayer"));
+                        addHook (type, "RequestToSpawnPlayer", true, 5, true, typeof(AllocsRequestToSpawnPlayer).GetMethod ("RequestToSpawnPlayer"));
                 }
 
@@ -49 +49 @@
                 }
 
-                private static void addHook (TypeDefinition type, string methodName, bool addThisRef, int opCount, MethodBase targetMethod)
+                private static void addHook (TypeDefinition type, string methodName, bool addThisRef, int opCount, bool atEnd, MethodBase targetMethod)
                 {
                         foreach (MethodDefinition method in type.Methods) {
@@ -56 +56 @@
                                         var il = method.Body.GetILProcessor ();
                                         var call = il.Create (OpCodes.Call, method.Module.Import (targetMethod));
-                                        var i = 0;
-                                        if (addThisRef)
-                                                il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, 0));
-                                        for (int op = 0; op < opCount; op++) {
-                                                il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, op + 1));
+                                        if (atEnd) {
+                                                int insBefore = method.Body.Instructions.Count;
+                                                if (addThisRef)
+                                                        il.Append (il.Create (OpCodes.Ldarg, 0));
+                                                for (int op = 0; op < opCount; op++) {
+                                                        il.Append (il.Create (OpCodes.Ldarg, op + 1));
+                                                }
+                                                il.Append (call);
+                                                il.Remove (method.Body.Instructions [insBefore - 1]);
+                                                il.Append (il.Create (OpCodes.Ret));
+                                        } else {
+                                                var i = 0;
+                                                if (addThisRef)
+                                                        il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, 0));
+                                                for (int op = 0; op < opCount; op++) {
+                                                        il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, op + 1));
+                                                }
+                                                il.InsertBefore (method.Body.Instructions [i++], call);
                                         }
-                                        il.InsertBefore (method.Body.Instructions [i++], call);
                                 }
                         }