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

Timestamp:

Apr 18, 2015, 4:27:57 PM (10 years ago)

Author:

alloc

Message:

Binary improvements

File:

• binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs (modified) (3 diffs)

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

@@ -8 +8 @@
         public class AllocsLogFunctions
         {
-                public static void RequestToSpawnPlayer (GameManager manager, int _clientId, string _name, int _chunkViewDim, PlayerProfile _playerProfile)
+                public static void RequestToSpawnPlayer (int _clientId, string _name, int _chunkViewDim, PlayerProfile _playerProfile)
                 {
                         try {
-                                ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID (_clientId);
-                                int entityId = CommonMappingFunctions.GetEntityID (ci);
-                                EntityPlayer ep = CommonMappingFunctions.GetEntityPlayer (ci);
-                                string steamId = CommonMappingFunctions.GetSteamID (ci);
-
-                                string ip = ci.ip;
-                                string name = string.Empty;
-
-                                if (ep != null)
-                                        name = ep.EntityName;
+                                ClientInfo ci = ConnectionManager.Instance.GetClient (_clientId);
 
                                 Log.Out ("Player connected, clientid=" + _clientId +
-                                        ", entityid=" + entityId +
-                                        ", name=" + name +
-                                        ", steamid=" + steamId +
-                                        ", ip=" + ip
+                                        ", entityid=" + ci.entityId +
+                                        ", name=" + ci.playerName +
+                                        ", steamid=" + ci.playerId +
+                                        ", ip=" + ci.ip
                                 );
 
-                                PersistentContainer.Instance.Players [steamId].SetOnline (ci);
+                                PersistentContainer.Instance.Players [ci.playerId].SetOnline (ci);
                                 PersistentData.PersistentContainer.Instance.Save ();
-
-                                Mods.CallRequestToSpawnPlayer (_clientId, _name, _chunkViewDim, _playerProfile);
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.RequestToSpawnPlayer: " + e);
@@ -38 +27 @@
                 }
 
-                public static void PlayerDisconnected (ConnectionManager manager, ClientInfo _cInfo, bool _bShutdown)
+                public static void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown)
                 {
                         try {
@@ -48 +37 @@
                                 }
                                 PersistentData.PersistentContainer.Instance.Save ();
-
-                                Mods.CallPlayerDisconnected (_cInfo, _bShutdown);
                         } catch (Exception e) {
                                 Log.Out ("Error in AllocsLogFunctions.PlayerDisconnected: " + e);