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

Timestamp:

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

Author:

alloc

Message:

fixes

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (2 diffs)
• src/AllocsLogFunctions.cs (modified) (1 diff)
• src/AssemblyInfo.cs (modified) (1 diff)
• src/CommonMappingFunctions.cs (modified) (3 diffs)
• src/CustomCommands/Kill.cs (modified) (1 diff)
• src/CustomCommands/ListPlayersExtended.cs (modified) (2 diffs)
• src/CustomCommands/TeleportPlayer.cs (modified) (3 diffs)

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

@@ -48 +48 @@
       <HintPath>..\7dtd-binaries\UnityEngine.dll</HintPath>
     </Reference>
-    <Reference Include="SteamworksManaged">
-      <HintPath>..\7dtd-binaries\SteamworksManaged.dll</HintPath>
-    </Reference>
     <Reference Include="Assembly-CSharp">
       <HintPath>..\7dtd-binaries\Assembly-CSharp.dll</HintPath>
@@ -59 +56 @@
     <Reference Include="EasyAntiCheat.Server">
       <HintPath>..\7dtd-binaries\EasyAntiCheat.Server.dll</HintPath>
+    </Reference>
+    <Reference Include="Assembly-CSharp-firstpass">
+      <HintPath>..\7dtd-binaries\Assembly-CSharp-firstpass.dll</HintPath>
+    </Reference>
+    <Reference Include="LogLibrary">
+      <HintPath>..\7dtd-binaries\LogLibrary.dll</HintPath>
     </Reference>
   </ItemGroup>

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

@@ -8 +8 @@
         public class AllocsLogFunctions
         {
-                public static void RequestToSpawnPlayer (GameManager manager, int _clientId, string _name, string _playerClassname, string _skinTexture, int _chunkViewDim)
+                public static void RequestToSpawnPlayer (GameManager manager, int _clientId, string _name, int _chunkViewDim, PlayerProfile _playerProfile)
                 {
                         try {

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

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

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using ManagedSteam.SteamTypes;
+using Steamworks;
 
 namespace AllocsFixes
@@ -42 +42 @@
                 public static string GetSteamID (ClientInfo _ci)
                 {
-                        return SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (GetPlayerName (_ci));
+                        return Steam.Authentication.Server.GetPlayerId (GetPlayerName (_ci));
                 }
 
                 public static string GetSteamID (string _playerName)
                 {
-                        return SingletonMonoBehaviour<Authenticator>.Instance.GetPlayerId (_playerName);
+                        return Steam.Authentication.Server.GetPlayerId (_playerName);
                 }
 
@@ -158 +158 @@
                 {
                         try {
-                                Dictionary<string, object> uToID = Authenticator.Instance.usersToIDs;
-                                foreach (KeyValuePair<string, object> kvp in uToID) {
-                                        string curId = string.Empty + ((SteamID)kvp.Value).AsUInt64;
+                                Dictionary<string, CSteamID> uToID = Steam.Authentication.Server.usersToIDs;
+                                foreach (KeyValuePair<string, CSteamID> kvp in uToID) {
+                                        string curId = string.Empty + kvp.Value.m_SteamID;
                                         if (curId.Equals (_steamId)) {
                                                 return GetClientInfoFromPlayerName (kvp.Key, false);

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) {