Changeset 114

Timestamp:

Jul 28, 2014, 11:27:14 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (1 diff)
• 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/AssemblyInfo.cs (modified) (1 diff)
• 7dtd-server-fixes/src/CommandExtensions.cs (modified) (1 diff)
• 7dtd-server-fixes/src/TelnetCommands/Kill.cs (modified) (3 diffs)
• 7dtd-server-fixes/src/TelnetCommands/Version.cs (added)
• NamePatcher/ManualPatches.cs (modified) (1 diff)

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

@@ -61 +61 @@
     <Compile Include="src\TelnetCommands\ListLandProtection.cs" />
     <Compile Include="src\TelnetCommands\RemoveLandProtection.cs" />
+    <Compile Include="src\TelnetCommands\Version.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

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

@@ -18 +18 @@
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("0.8.7.32040")]
+[assembly: AssemblyVersion("0.087.*")]
 
 // The following attributes are used to specify the signing key for the assembly, 

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

@@ -17 +17 @@
                         manager.m_GUIConsole.AddCommand (new SetTimeReal (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new ShowInventory (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new Version (manager.m_GUIConsole));
                 } catch (Exception e) {
                         Log.Out ("Error registering custom commands: " + e);

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

@@ -20 +20 @@
         public override void Run (string[] _params)
         {
-                m_Console.SendResult("Command \"kill\" is currently not implemented!");
-                return;
-                /*
                 try {
                         if (_params.Length != 1) {
@@ -29 +26 @@
                         }
 
-                        ClientInfo ci = CommonMappingFunctions.GetClientInfoFromNameOrID(_params[0], false);
+                        ClientInfo ci = CommonMappingFunctions.GetClientInfoFromNameOrID (_params [0], false);
 
                         if (ci == null) {
@@ -36 +33 @@
                         }
 
-                        EntityPlayer p = CommonMappingFunctions.GetEntityPlayer(ci);
-                        p.Stats.Health.Value = 1;
-                        p.Stats.SendAll();
-                        m_Console.SendResult ("Killed player " + _params[0]);
+                        EntityPlayer p = CommonMappingFunctions.GetEntityPlayer (ci);
+                        p.DamageEntity(new DamageSource(EnumDamageSourceType.Bullet), 9999, false);
+                        m_Console.SendResult ("Killed player " + _params [0]);
                 } catch (Exception e) {
                         Log.Out ("Error in Kill.Run: " + e);
-                }*/
+                }
         }
 }

binary-improvements/NamePatcher/ManualPatches.cs

@@ -83 +83 @@
 
 
+                        md = getMethodInType (mainModule.GetType ("EntityPlayer").BaseType.Resolve (), (method, isConstructor, retType, paramCount, paramList) => {
+                                return !isConstructor && method.IsPublic && paramCount == 3 && method.Name.Equals ("DamageEntity");
+                        }
+                        );
+                        if (md != null) {
+                                TypeDefinition typeDamageSource = md.Parameters[0].ParameterType.Resolve();
+                                renameMember (typeDamageSource, "DamageSource");
+                        } else {
+                                Console.WriteLine ("FAILED: DamageSource");
+                        }
+
+
                         renameMember (mainModule.GetType ("ItemBlock").BaseType.Resolve (), "ItemBase");