Changeset 83

Timestamp:

Jul 18, 2014, 3:48:29 AM (10 years ago)

Author:

alloc

Message:

server fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (2 diffs)
• 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/AllocsLogFunctions.cs (added)
• 7dtd-server-fixes/src/AllocsNetTelnetServer.cs (modified) (1 diff)
• 7dtd-server-fixes/src/AllocsRequestToSpawnPlayer.cs (deleted)
• 7dtd-server-fixes/src/TelnetCommands/GetGamePrefs.cs (added)
• 7dtd-server-fixes/src/TelnetCommands/SayToPlayer.cs (added)
• NamePatcher/NamePatcher.cs (modified) (1 diff)
• NamePatcher/bin (deleted)
• assembly-patcher/Assembly-Patcher.userprefs (modified) (1 diff)
• assembly-patcher/Main.cs (modified) (2 diffs)
• assembly-patcher/bin (deleted)

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

@@ -31 +31 @@
     <Reference Include="System" />
     <Reference Include="Assembly-CSharp">
-      <HintPath>..\assembly-patcher\bin\Release\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\NamePatcher\bin\Release\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>..\assembly-patcher\bin\Release\UnityEngine.dll</HintPath>
     </Reference>
   </ItemGroup>
@@ -39 +42 @@
     <Compile Include="src\AllocsTelnetConnection.cs" />
     <Compile Include="src\TelnetCommands\GetTime.cs" />
-    <Compile Include="src\AllocsRequestToSpawnPlayer.cs" />
     <Compile Include="src\TelnetCommands\ListPlayersExtended.cs" />
     <Compile Include="src\TelnetCommands\GetGamePrefs.cs" />
+    <Compile Include="src\TelnetCommands\SayToPlayer.cs" />
+    <Compile Include="src\AllocsLogFunctions.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -136 +136 @@
                 console.AddCommand(new GetTime(console));
                 console.AddCommand(new ListPlayersExtended(console));
+                console.AddCommand(new SayToPlayer(console));
         }
 

binary-improvements/NamePatcher/NamePatcher.cs

@@ -103 +103 @@
                                 TypeDefinition typeConsole = mainModule.GetType (consoleTypeName);
                                 string consoleCommandTypeName = string.Empty;
+                                foreach (MethodDefinition md in typeConsole.Methods) {
+                                        if (!md.IsConstructor) {
+                                                if (md.Parameters.Count == 3 && md.Parameters [0].ParameterType.Name.Equals ("NetworkPlayer")) {
+                                                        Console.WriteLine ("Renaming console method -> ExecuteCmdFromClient");
+                                                        NameNormalizer.setName (md, "ExecuteCmdFromClient");
+                                                }
+                                        }
+                                }
                                 foreach (FieldDefinition fd in typeConsole.Fields) {
                                         TypeReference fdType = fd.FieldType;

binary-improvements/assembly-patcher/Assembly-Patcher.userprefs

@@ -1 +1 @@
 <Properties>
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="AssemblyInfo.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Main.cs">
     <Files>
-      <File FileName="Main.cs" Line="38" Column="4" />
+      <File FileName="Main.cs" Line="48" Column="3" />
       <File FileName="AssemblyInfo.cs" Line="21" Column="1" />
     </Files>

binary-improvements/assembly-patcher/Main.cs

@@ -13 +13 @@
                         telnetPatch (module);
                         connectLogPatch (module);
+                        executionLogPatch( module);
                         module.Write ("Assembly-CSharp.dll");
                         Console.WriteLine ("Done");
@@ -26 +27 @@
 
                         markTypePatched (module, type);
-                        addHook (type, "RequestToSpawnPlayer", true, 5, true, typeof(AllocsRequestToSpawnPlayer).GetMethod ("RequestToSpawnPlayer"));
+                        addHook (type, "RequestToSpawnPlayer", true, 5, true, typeof(AllocsLogFunctions).GetMethod ("RequestToSpawnPlayer"));
+                }
+
+                private static void executionLogPatch (ModuleDefinition module)
+                {
+                        TypeDefinition type = module.GetType ("ConsoleSdtd");
+
+                        if (isPatched (type)) {
+                                return;
+                        }
+
+                        markTypePatched (module, type);
+                        addHook (type, "ExecuteCmdFromClient", true, 3, false, typeof(AllocsLogFunctions).GetMethod ("ExecuteCmdFromClient"));
                 }