Changeset 114


Ignore:
Timestamp:
Jul 28, 2014, 11:27:14 PM (5 years ago)
Author:
alloc
Message:

fixes

Location:
binary-improvements
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

    r113 r114  
    6161    <Compile Include="src\TelnetCommands\ListLandProtection.cs" />
    6262    <Compile Include="src\TelnetCommands\RemoveLandProtection.cs" />
     63    <Compile Include="src\TelnetCommands\Version.cs" />
    6364  </ItemGroup>
    6465  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  • binary-improvements/7dtd-server-fixes/src/AssemblyInfo.cs

    r79 r114  
    1818// and "{Major}.{Minor}.{Build}.*" will update just the revision.
    1919
    20 [assembly: AssemblyVersion("0.8.7.32040")]
     20[assembly: AssemblyVersion("0.087.*")]
    2121
    2222// The following attributes are used to specify the signing key for the assembly,
  • binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

    r113 r114  
    1717                        manager.m_GUIConsole.AddCommand (new SetTimeReal (manager.m_GUIConsole));
    1818                        manager.m_GUIConsole.AddCommand (new ShowInventory (manager.m_GUIConsole));
     19                        manager.m_GUIConsole.AddCommand (new Version (manager.m_GUIConsole));
    1920                } catch (Exception e) {
    2021                        Log.Out ("Error registering custom commands: " + e);
  • binary-improvements/7dtd-server-fixes/src/TelnetCommands/Kill.cs

    r113 r114  
    2020        public override void Run (string[] _params)
    2121        {
    22                 m_Console.SendResult("Command \"kill\" is currently not implemented!");
    23                 return;
    24                 /*
    2522                try {
    2623                        if (_params.Length != 1) {
     
    2926                        }
    3027
    31                         ClientInfo ci = CommonMappingFunctions.GetClientInfoFromNameOrID(_params[0], false);
     28                        ClientInfo ci = CommonMappingFunctions.GetClientInfoFromNameOrID (_params [0], false);
    3229
    3330                        if (ci == null) {
     
    3633                        }
    3734
    38                         EntityPlayer p = CommonMappingFunctions.GetEntityPlayer(ci);
    39                         p.Stats.Health.Value = 1;
    40                         p.Stats.SendAll();
    41                         m_Console.SendResult ("Killed player " + _params[0]);
     35                        EntityPlayer p = CommonMappingFunctions.GetEntityPlayer (ci);
     36                        p.DamageEntity(new DamageSource(EnumDamageSourceType.Bullet), 9999, false);
     37                        m_Console.SendResult ("Killed player " + _params [0]);
    4238                } catch (Exception e) {
    4339                        Log.Out ("Error in Kill.Run: " + e);
    44                 }*/
     40                }
    4541        }
    4642}
  • binary-improvements/NamePatcher/ManualPatches.cs

    r113 r114  
    8383
    8484
     85                        md = getMethodInType (mainModule.GetType ("EntityPlayer").BaseType.Resolve (), (method, isConstructor, retType, paramCount, paramList) => {
     86                                return !isConstructor && method.IsPublic && paramCount == 3 && method.Name.Equals ("DamageEntity");
     87                        }
     88                        );
     89                        if (md != null) {
     90                                TypeDefinition typeDamageSource = md.Parameters[0].ParameterType.Resolve();
     91                                renameMember (typeDamageSource, "DamageSource");
     92                        } else {
     93                                Console.WriteLine ("FAILED: DamageSource");
     94                        }
     95
     96
    8597                        renameMember (mainModule.GetType ("ItemBlock").BaseType.Resolve (), "ItemBase");
    8698
Note: See TracChangeset for help on using the changeset viewer.