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

Timestamp:

Jan 5, 2019, 3:21:40 PM (6 years ago)

Author:

alloc

Message:

Player storing fixes, webmap inventory layout fix

Location:

binary-improvements/7dtd-server-fixes

Files:

• 7dtd-server-fixes.csproj (modified) (3 diffs)
• ModInfo.xml (modified) (1 diff)
• src/API.cs (modified) (2 diffs)
• src/AllocsLogFunctions.cs (deleted)
• src/ChatHookExample.cs (deleted)
• src/PlayerDataStuff.cs (deleted)
• src/StateManager.cs (deleted)

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

@@ -39 +39 @@
     <DefineConstants>ENABLE_PROFILER</DefineConstants>
     <Optimize>true</Optimize>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
@@ -76 +77 @@
   <ItemGroup>
     <Compile Include="src\AssemblyInfo.cs" />
-    <Compile Include="src\AllocsLogFunctions.cs" />
     <Compile Include="src\LiveData\Animals.cs" />
     <Compile Include="src\LiveData\Hostiles.cs" />
-    <Compile Include="src\PlayerDataStuff.cs" />
     <Compile Include="src\PersistentData\PersistentContainer.cs" />
-    <Compile Include="src\StateManager.cs" />
     <Compile Include="src\PersistentData\InvItem.cs" />
     <Compile Include="src\PersistentData\Inventory.cs" />
@@ -101 +99 @@
     <Compile Include="src\FileCache\MapTileCache.cs" />
     <Compile Include="src\API.cs" />
-    <Compile Include="src\ChatHookExample.cs" />
     <Compile Include="src\AllocsUtils.cs" />
     <Compile Include="src\LandClaimList.cs" />

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="20" />
+                <Version value="21" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

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

@@ -1 +1 @@
 using System.Collections.Generic;
+using AllocsFixes.PersistentData;
+using System;
 
 namespace AllocsFixes {
@@ -9 +11 @@
                         ModEvents.PlayerSpawning.RegisterHandler (PlayerSpawning);
                         ModEvents.PlayerDisconnected.RegisterHandler (PlayerDisconnected);
+                        ModEvents.PlayerSpawnedInWorld.RegisterHandler (PlayerSpawned);
                         ModEvents.ChatMessage.RegisterHandler (ChatMessage);
                 }
 
                 public void GameAwake () {
-                        StateManager.Awake ();
+                        try {
+                                PersistentContainer.Load ();
+                        } catch (Exception e) {
+                                Log.Out ("Error in StateManager.Awake: " + e);
+                        }
                 }
 
                 public void GameShutdown () {
-                        StateManager.Shutdown ();
+                        try {
+                                Log.Out ("Server shutting down!");
+                                PersistentContainer.Instance.Save ();
+                        } catch (Exception e) {
+                                Log.Out ("Error in StateManager.Shutdown: " + e);
+                        }
                 }
 
                 public void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
-                        PlayerDataStuff.GM_SavePlayerData (_cInfo, _playerDataFile);
+                        try {
+                                PersistentContainer.Instance.Players [_cInfo.playerId, true].Update (_playerDataFile);
+                        } catch (Exception e) {
+                                Log.Out ("Error in GM_SavePlayerData: " + e);
+                        }
                 }
 
                 public void PlayerSpawning (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) {
-                        AllocsLogFunctions.RequestToSpawnPlayer (_cInfo, _chunkViewDim, _playerProfile);
+                        try {
+                                Log.Out ("Player connected" +
+                                        ", entityid=" + _cInfo.entityId +
+                                        ", name=" + _cInfo.playerName +
+                                        ", steamid=" + _cInfo.playerId +
+                                        ", steamOwner=" + _cInfo.ownerId +
+                                        ", ip=" + _cInfo.ip
+                                );
+                        } catch (Exception e) {
+                                Log.Out ("Error in AllocsLogFunctions.RequestToSpawnPlayer: " + e);
+                        }
                 }
 
                 public void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) {
-                        AllocsLogFunctions.PlayerDisconnected (_cInfo, _bShutdown);
+                        try {
+                                Player p = PersistentContainer.Instance.Players [_cInfo.playerId, false];
+                                if (p != null) {
+                                        p.SetOffline ();
+                                } else {
+                                        Log.Out ("Disconnected player not found in client list...");
+                                }
+
+                                PersistentContainer.Instance.Save ();
+                        } catch (Exception e) {
+                                Log.Out ("Error in AllocsLogFunctions.PlayerDisconnected: " + e);
+                        }
                 }
+
+                public void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
+                        try {
+                                PersistentContainer.Instance.Players [_cInfo.playerId, true].SetOnline (_cInfo);
+                                PersistentContainer.Instance.Save ();
+                        } catch (Exception e) {
+                                Log.Out ("Error in AllocsLogFunctions.PlayerSpawnedInWorld: " + e);
+                        }
+                }
+
+                private const string ANSWER =
+                        "     [ff0000]I[-] [ff7f00]W[-][ffff00]A[-][80ff00]S[-] [00ffff]H[-][0080ff]E[-][0000ff]R[-][8b00ff]E[-]";
 
                 public bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
                         bool _localizeMain, List<int> _recipientEntityIds) {
-                        return ChatHookExample.Hook (_cInfo, _type, _msg, _mainName);
+                        if (string.IsNullOrEmpty (_msg) || !_msg.EqualsCaseInsensitive ("/alloc")) {
+                                return true;
+                        }
+
+                        if (_cInfo != null) {
+                                Log.Out ("Sent chat hook reply to {0}", _cInfo.playerId);
+                                _cInfo.SendPackage (new NetPackageChat (EChatType.Whisper, -1, ANSWER, "", false, null));
+                        } else {
+                                Log.Error ("ChatHookExample: Argument _cInfo null on message: {0}", _msg);
+                        }
+
+                        return false;
                 }
         }