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

Timestamp:

Jun 21, 2024, 2:58:18 PM (5 months ago)

Author:

alloc

Message:

27_32_48

• V1.0 compatibility

Location:

binary-improvements/7dtd-server-fixes

Files:

• ModInfo.xml (modified) (1 diff)
• src/API.cs (modified) (3 diffs)
• src/LandClaimList.cs (modified) (1 diff)

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

@@ -5 +5 @@
         <Description value="Common functions" />
         <Author value="Christian 'Alloc' Illy" />
-        <Version value="31" />
+        <Version value="32" />
         <Website value="https://7dtd.illy.bz" />
 </xml>

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

@@ -47 +47 @@
 
                 private static void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
+                        if (_cInfo == null) {
+                                return;
+                        }
+                        
                         PersistentContainer.Instance.Players.GetOrCreate (_cInfo.InternalId, _cInfo.PlatformId, _cInfo.CrossplatformId).SetOnline (_cInfo);
                         PersistentContainer.Instance.Save ();
@@ -54 +58 @@
 
                 private static bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
-                        bool _localizeMain, List<int> _recipientEntityIds) {
+                        List<int> _recipientEntityIds) {
                         if (string.IsNullOrEmpty (_msg) || !_msg.EqualsCaseInsensitive ("/alloc")) {
                                 return true;
@@ -61 +65 @@
                         if (_cInfo != null) {
                                 Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
-                                _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, ANSWER, "", false, null));
+                                _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, ANSWER, "",  null));
                         } else {
                                 Log.Error ($"ChatHookExample: Argument _cInfo null on message: {_msg}");

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

@@ -41 +41 @@
 
                         foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-                                Player p = PersistentContainer.Instance.Players.GetByInternalId (kvp.Key.UserIdentifier);
+                                Player p = PersistentContainer.Instance.Players.GetByInternalId (kvp.Key.PrimaryId);
                                 if (p == null) {
-                                        PlatformUserIdentifierAbs platformId = kvp.Key.PlatformUserIdentifier;
-                                        PlatformUserIdentifierAbs internalId = kvp.Key.UserIdentifier;
+                                        PlatformUserIdentifierAbs platformId = kvp.Key.NativeId;
+                                        PlatformUserIdentifierAbs internalId = kvp.Key.PrimaryId;
                                         PlatformUserIdentifierAbs crossPlatformId = platformId == null || platformId.Equals (internalId) ? null : internalId;
                                         p = new Player (internalId, platformId, crossPlatformId);