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

Timestamp:

Nov 9, 2021, 6:28:33 PM (3 years ago)

Author:

alloc

Message:

Preparations for A20 release
Changes usage of "SteamID" to "UserID" in console commands
Also changes a bunch of the WebAPI stuff to show / use UserIDs

File:

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

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

@@ -1 +1 @@
 using System.Collections.Generic;
 using AllocsFixes.PersistentData;
-using System;
+using Platform.Steam;
 
 namespace AllocsFixes {
         public class API : IModApi {
-                public void InitMod () {
+                public void InitMod (Mod _modInstance) {
                         ModEvents.GameStartDone.RegisterHandler (GameAwake);
                         ModEvents.GameShutdown.RegisterHandler (GameShutdown);
@@ -16 +16 @@
 
                 public void GameAwake () {
-                        try {
-                                PersistentContainer.Load ();
-                        } catch (Exception e) {
-                                Log.Out ("Error in StateManager.Awake: " + e);
-                        }
+                        PersistentContainer.Load ();
                 }
 
                 public void GameShutdown () {
-                        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) {
-                        try {
-                                PersistentContainer.Instance.Players [_cInfo.playerId, true].Update (_playerDataFile);
-                        } catch (Exception e) {
-                                Log.Out ("Error in GM_SavePlayerData: " + e);
-                        }
+                        PersistentContainer.Instance.Players [_cInfo.PlatformId, true].Update (_playerDataFile);
                 }
 
                 public void PlayerSpawning (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _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);
+                        string owner = null;
+                        if (_cInfo.PlatformId is UserIdentifierSteam identifierSteam) {
+                                owner = identifierSteam.OwnerId.ToString ();
                         }
+
+                        Log.Out ("Player connected" +
+                                 ", entityid=" + _cInfo.entityId +
+                                 ", name=" + _cInfo.playerName +
+                                 ", pltfmid=" + (_cInfo.PlatformId?.CombinedString ?? "<unknown>") +
+                                 ", crossid=" + (_cInfo.CrossplatformId?.CombinedString ?? "<unknown/none>") +
+                                 ", steamOwner=" + (owner ?? "<unknown/none>") +
+                                 ", ip=" + _cInfo.ip
+                        );
                 }
 
                 public void PlayerDisconnected (ClientInfo _cInfo, bool _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...");
-                                }
+                        Player p = PersistentContainer.Instance.Players [_cInfo.PlatformId, 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);
-                        }
+                        PersistentContainer.Instance.Save ();
                 }
 
                 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);
-                        }
+                        PersistentContainer.Instance.Players [_cInfo.PlatformId, true].SetOnline (_cInfo);
+                        PersistentContainer.Instance.Save ();
                 }
 
@@ -88 +68 @@
 
                         if (_cInfo != null) {
-                                Log.Out ("Sent chat hook reply to {0}", _cInfo.playerId);
+                                Log.Out ("Sent chat hook reply to {0}", _cInfo.InternalId);
                                 _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, ANSWER, "", false, null));
                         } else {