Changeset 203 for binary-improvements/7dtd-server-fixes/src/CustomCommands

Timestamp:

Nov 22, 2014, 10:54:05 PM (10 years ago)

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes/src/CustomCommands

Files:

• Kill.cs (modified) (1 diff)
• ListPlayersExtended.cs (modified) (2 diffs)
• TeleportPlayer.cs (modified) (3 diffs)

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

@@ -36 +36 @@
 
                                 EntityPlayer p = CommonMappingFunctions.GetEntityPlayer (ci);
-                                p.DamageEntity (new DamageSource (EnumDamageSourceType.Bullet), 9999);
+                                p.DamageEntity (new DamageSource (EnumDamageSourceType.Bullet), 9999, false);
                                 m_Console.SendResult ("Killed player " + _params [0]);
                         } catch (Exception e) {

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

@@ -36 +36 @@
                                                         ++num,
                                                         ". id=",
-                                                        current.Value.fd008e,
+//                                                      current.Value.4E2AA,
                                                         ", ",
                                                         current.Value.EntityName,
@@ -44 +44 @@
                                                         current.Value.rotation,
                                                         ", remote=",
-                                                        current.Value.fd00b1,
+//                                                      current.Value.fd00b1,
                                                         ", health=",
                                                         current.Value.Health,

binary-improvements/7dtd-server-fixes/src/CustomCommands/TeleportPlayer.cs

@@ -2 +2 @@
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using UnityEngine;
 
@@ -8 +9 @@
         public class TeleportPlayer : ConsoleCommand
         {
+                private MethodInfo NetConnection_SendPackage = null;
+
                 public TeleportPlayer (ConsoleSdtd cons) : base(cons)
                 {
+                        Type typeClientInfo = Assembly.GetAssembly (typeof(ClientInfo)).GetType ("ClientInfo");
+                        Type typeNetConnection = typeClientInfo.GetField ("netConnection").FieldType.GetElementType ();
+                        MethodInfo[] mis = typeNetConnection.GetMethods ();
+                        foreach (MethodInfo mi in mis) {
+                                ParameterInfo[] pis = mi.GetParameters ();
+                                if (pis.Length == 1) {
+                                        if (typeof (Package).Equals (pis[0].ParameterType)) {
+                                                NetConnection_SendPackage = mi;
+                                        }
+                                }
+                        }
                 }
 
@@ -72 +86 @@
                                         NetPackage_EntityPosAndRot pkg = new NetPackage_EntityPosAndRot (p1.Entity);
 
-                                        p1.ClientInfo.netConnection [0].Send (pkg);
+                                        if (NetConnection_SendPackage != null) {
+                                                NetConnection_SendPackage.Invoke (p1.ClientInfo.netConnection [0], new object[] {pkg});
+                                        }
                                 }
                         } catch (Exception e) {