Changeset 113

Timestamp:

Jul 27, 2014, 11:30:15 AM (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/CommandExtensions.cs (modified) (1 diff)
• 7dtd-server-fixes/src/TelnetCommands/Kill.cs (modified) (2 diffs)
• 7dtd-server-fixes/src/TelnetCommands/ListLandProtection.cs (added)
• 7dtd-server-fixes/src/TelnetCommands/RemoveLandProtection.cs (added)
• NamePatcher/ManualPatches.cs (modified) (7 diffs)

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

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

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

@@ -10 +10 @@
                         manager.m_GUIConsole.AddCommand (new GetTime (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new Kill (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new ListLandProtection (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new ListPlayersExtended (manager.m_GUIConsole));
+                        manager.m_GUIConsole.AddCommand (new RemoveLandProtection (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new Reply (manager.m_GUIConsole));
                         manager.m_GUIConsole.AddCommand (new SayToPlayer (manager.m_GUIConsole));

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) {
@@ -33 +36 @@
                         }
 
-                        CommonMappingFunctions.GetEntityPlayer(ci).Kill(null);
+                        EntityPlayer p = CommonMappingFunctions.GetEntityPlayer(ci);
+                        p.Stats.Health.Value = 1;
+                        p.Stats.SendAll();
                         m_Console.SendResult ("Killed player " + _params[0]);
                 } catch (Exception e) {
                         Log.Out ("Error in Kill.Run: " + e);
-                }
+                }*/
         }
 }

binary-improvements/NamePatcher/ManualPatches.cs

@@ -61 +61 @@
                 public static void applyManualPatches (ModuleDefinition mainModule)
                 {
-                        renameMember (mainModule.GetType ("ItemBlock").BaseType.Resolve (), "ItemBase");
-
                         FieldDefinition fd;
                         MethodDefinition md;
+                        bool renamed = false;
+
+
+                        renamed = false;
+                        foreach (TypeDefinition td in mainModule.Types) {
+                                md = getMethodInType (td, (method, isConstructor, retType, paramCount, paramList) => {
+                                        return !isConstructor && method.IsPublic && method.IsStatic && paramCount == 0 && retType.Name.Equals ("Boolean") && method.Name.Equals ("CheckIfStartedAsDedicatedServer");
+                                }
+                                );
+                                if (md != null) {
+                                        renameMember (td, "StaticDirectories");
+                                        renamed = true;
+                                        break;
+                                }
+                        }
+                        if (!renamed)
+                                Console.WriteLine ("FAILED: StaticDirectories");
+                        renamed = false;
+
+
+                        renameMember (mainModule.GetType ("ItemBlock").BaseType.Resolve (), "ItemBase");
+
+
+                        fd = getFieldInType (mainModule.GetType ("PersistentPlayerList"), (field, fieldType) => {
+                                return fieldType.FullName.Contains ("Dictionary") && fieldType.FullName.Contains ("Vector3i") && fieldType.FullName.Contains ("PersistentPlayerData"); }
+                        );
+                        if (fd != null) {
+                                makeFieldPublic (fd);
+                                renameMember (fd, "positionToLPBlockOwner");
+                        } else {
+                                Console.WriteLine ("FAILED: PersistentPlayerList.positionToLPBlockOwner");
+                        }
 
 
@@ -78 +108 @@
 
 
+                        // Fields in PlayerDataFile
                         fd = getFieldInType (mainModule.GetType ("PlayerDataFile"), (field, fieldType) => {
                                 return field.Name.Equals ("inventory") && fieldType.IsArray; }
@@ -109 +140 @@
 
 
+                        // Fields in AdminTools
                         fd = getFieldInType (mainModule.GetType ("AdminTools"), (field, fieldType) => {
                                 return fieldType.FullName.Contains ("List") && fieldType.FullName.Contains ("AdminToolsCommandPermissions"); }
@@ -120 +152 @@
 
 
+                        // Fields and methods in World
                         fd = getFieldInType (mainModule.GetType ("World"), (field, fieldType) => {
                                 return fieldType.FullName.Equals ("System.UInt64"); }
@@ -130 +163 @@
 
 
+                        md = getMethodInType (mainModule.GetType ("World"), (method, isConstructor, retType, paramCount, paramList) => {
+                                return !isConstructor && paramCount == 1 && paramList [0].ParameterType.Name.Equals ("PersistentPlayerData") && method.IsPrivate && retType.Name.Equals ("Boolean");
+                        }
+                        );
+                        if (md != null) {
+                                md.IsPrivate = false;
+                                md.IsPublic = true;
+                                renameMember (md, "LandClaimIsActive");
+                        } else {
+                                Console.WriteLine ("FAILED: World.LandClaimIsActive()");
+                        }
+
+
+                        md = getMethodInType (mainModule.GetType ("World"), (method, isConstructor, retType, paramCount, paramList) => {
+                                return !isConstructor && paramCount == 1 && paramList [0].ParameterType.Name.Equals ("PersistentPlayerData") && method.IsPrivate && retType.Name.Equals ("Single");
+                        }
+                        );
+                        if (md != null) {
+                                md.IsPrivate = false;
+                                md.IsPublic = true;
+                                renameMember (md, "LandClaimPower");
+                        } else {
+                                Console.WriteLine ("FAILED: World.LandClaimPower()");
+                        }
+
+
+                        // Fields in GameManager
                         fd = getFieldInType (mainModule.GetType ("GameManager"), (field, fieldType) => {
                                 return fieldType.FullName.Equals ("ConnectionManager"); }
@@ -141 +201 @@
 
 
+                        // Fields in ConnectionManager
                         fd = getFieldInType (mainModule.GetType ("ConnectionManager"), (field, fieldType) => {
                                 return fieldType.FullName.Equals ("GameManager"); }
@@ -176 +237 @@
                         TypeDefinition typeConsole = null;
 
+                        // Fields in NetTelnetServer
                         fd = getFieldInType (mainModule.GetType ("NetTelnetServer"), (field, fieldType) => {
                                 return NameNormalizer.makeValidName (fieldType.Name) != null; }