Changeset 403

Timestamp:

Feb 16, 2023, 3:46:14 PM (3 years ago)

Author:

alloc

Message:

Made server-fixes no longer throw errors when running the mod on a listen server

File:

• binary-improvements2/7dtd-server-fixes/src/ModApi.cs (modified) (4 diffs)

binary-improvements2/7dtd-server-fixes/src/ModApi.cs

@@ -21 +21 @@
 
                 private void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
+                        if (_cInfo == null) {
+                                return;
+                        }
+
                         PersistentContainer.Instance.Players [_cInfo.InternalId, true].Update (_playerDataFile);
                 }
 
                 private void PlayerSpawning (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) {
+                        if (_cInfo == null) {
+                                return;
+                        }
+
                         string owner = null;
                         if (_cInfo.PlatformId is UserIdentifierSteam identifierSteam) {
@@ -36 +44 @@
 
                 private void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) {
+                        if (_cInfo == null) {
+                                return;
+                        }
+
                         Player p = PersistentContainer.Instance.Players [_cInfo.InternalId, false];
                         if (p != null) {
@@ -47 +59 @@
 
                 private void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
+                        if (_cInfo == null) {
+                                return;
+                        }
+
                         PersistentContainer.Instance.Players [_cInfo.InternalId, true].SetOnline (_cInfo);
                         PersistentContainer.Instance.Save ();
@@ -56 +72 @@
                 private bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
                         bool _localizeMain, List<int> _recipientEntityIds) {
+                        if (_cInfo == null) {
+                                return true;
+                        }
+
                         if (string.IsNullOrEmpty (_msg) || !_msg.EqualsCaseInsensitive ("/alloc")) {
                                 return true;
                         }
 
-                        if (_cInfo != null) {
-                                Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
-                                _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, testChatAnswer, "", false, null));
-                        } else {
-                                Log.Error ($"ChatHookExample: Argument _cInfo null on message: {_msg}");
-                        }
+                        Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
+                        _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, testChatAnswer, "", false, null));
 
                         return false;