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

Timestamp:

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

Author:

alloc

Message:

Binary improvements

Location:

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

Files:

• API.cs (added)
• AllocsLogFunctions.cs (modified) (3 diffs)
• AssemblyInfo.cs (modified) (1 diff)
• CommandExtensions.cs (deleted)
• CommonMappingFunctions.cs (deleted)
• ModAPI.cs (deleted)
• Mods.cs (deleted)
• NetConnections (deleted)
• PersistentData/PersistentContainer.cs (modified) (1 diff)
• PersistentData/Player.cs (modified) (2 diffs)
• PlayerDataStuff.cs (modified) (1 diff)
• StateManager.cs (modified) (3 diffs)
• Version.cs (deleted)

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

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

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

binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs

@@ -54 +54 @@
                                         return true;
                                 } catch (Exception e) {
-                                        Log.Out ("Exception in PersistentContainer.Load: " + e.Message);
+                                        Log.Error ("Exception in PersistentContainer.Load");
+                                        Log.Exception (e);
                                 }
                         }

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -59 +59 @@
                         get {
                                 if (IsOnline) {
-                                        return CommonMappingFunctions.GetEntityPlayer (clientInfo);
+                                        return GameManager.Instance.World.Players.dict [clientInfo.entityId];
                                 } else {
                                         return null;
@@ -116 +116 @@
                         Log.Out ("Player set to online: " + steamId);
                         clientInfo = ci;
-                        entityId = CommonMappingFunctions.GetEntityID (ci);
-                        name = CommonMappingFunctions.GetPlayerName (ci);
+                        entityId = ci.entityId;
+                        name = ci.playerName;
                         ip = ci.ip;
                 }

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

@@ -11 +11 @@
                 {
                         try {
-                                ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID(_clientId);
-                                string steamId = CommonMappingFunctions.GetSteamID(ci);
-                                PersistentContainer.Instance.Players[steamId].Inventory.Update(_playerDataFile);
-                                Mods.CallSavePlayerData (_clientId, _playerDataFile);
+                                ClientInfo ci = ConnectionManager.Instance.GetClient (_clientId);
+                                PersistentContainer.Instance.Players[ci.playerId].Inventory.Update(_playerDataFile);
                         } catch (Exception e) {
                                 Log.Out ("Error in GM_SavePlayerData: " + e);

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

@@ -1 @@
-using AllocsFixes.NetConnections.Servers.Telnet;
 using System;
 using System.Reflection;
@@ -7 +6 @@
         public class StateManager
         {
-                public static void Awake (GameManager manager)
+                public static void Awake ()
                 {
                         try {
                                 Log.Out ("[7dtd-server-fixes by Alloc] Version: " + Assembly.GetExecutingAssembly ().GetName ().Version);
-
-                                Mods.LoadMods ();
-                                Mods.CallGameAwake ();
-                                CommandExtensions.InitCommandExtensions (manager);
-
-                                new Telnet ();
 
                                 ItemList.Instance.Init ();
@@ -26 +19 @@
                 }
 
-                public static void Shutdown (GameManager manager)
+                public static void Shutdown ()
                 {
                         try {
                                 Log.Out ("Server shutting down!");
-                                Mods.CallGameShutdown ();
                                 PersistentData.PersistentContainer.Instance.Save ();
                         } catch (Exception e) {