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

Timestamp:

Jun 12, 2023, 3:21:34 PM (18 months ago)

Author:

alloc

Message:

24_27_41

Location:

binary-improvements/7dtd-server-fixes

Files:

• ModInfo.xml (modified) (1 diff)
• src/API.cs (modified) (3 diffs)
• src/LandClaimList.cs (modified) (2 diffs)
• src/PersistentData/Player.cs (modified) (7 diffs)
• src/PersistentData/Players.cs (modified) (3 diffs)

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

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

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

@@ -23 +23 @@
 
                 public void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
-                        PersistentContainer.Instance.Players [_cInfo.InternalId, true].Update (_cInfo, _playerDataFile);
+                        PersistentContainer.Instance.Players.GetOrCreate (_cInfo.InternalId, _cInfo.PlatformId, _cInfo.CrossplatformId).Update (_cInfo, _playerDataFile);
                 }
 
@@ -43 +43 @@
 
                 public void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) {
-                        Player p = PersistentContainer.Instance.Players [_cInfo.InternalId, false];
+                        Player p = PersistentContainer.Instance.Players.GetByInternalId (_cInfo.InternalId);
                         if (p != null) {
                                 p.SetOffline ();
@@ -54 +54 @@
 
                 public void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
-                        PersistentContainer.Instance.Players [_cInfo.InternalId, true].SetOnline (_cInfo);
+                        PersistentContainer.Instance.Players.GetOrCreate (_cInfo.InternalId, _cInfo.PlatformId, _cInfo.CrossplatformId).SetOnline (_cInfo);
                         PersistentContainer.Instance.Save ();
                 }

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

@@ -41 +41 @@
 
                         foreach (KeyValuePair<PersistentPlayerData, List<Vector3i>> kvp in owners) {
-                                Player p = PersistentContainer.Instance.Players [kvp.Key.UserIdentifier, false];
+                                Player p = PersistentContainer.Instance.Players.GetByInternalId (kvp.Key.UserIdentifier);
                                 if (p == null) {
-                                        p = new Player (kvp.Key.UserIdentifier);
+                                        PlatformUserIdentifierAbs platformId = kvp.Key.PlatformUserIdentifier;
+                                        PlatformUserIdentifierAbs internalId = kvp.Key.UserIdentifier;
+                                        PlatformUserIdentifierAbs crossPlatformId = platformId.Equals (internalId) ? null : internalId;
+                                        p = new Player (internalId, platformId, crossPlatformId);
                                 }
 
@@ -68 +71 @@
 
                 public static OwnerFilter UserIdFilter (PlatformUserIdentifierAbs _userId) {
-                        return _p => _p.PlatformId.Equals (_userId);
+                        return _p => _p.InternalId.Equals (_userId);
                 }
 

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

@@ -5 +5 @@
         [Serializable]
         public class Player {
-                private readonly PlatformUserIdentifierAbs platformId;
                 private int entityId;
                 private string name;
@@ -26 +25 @@
                 [NonSerialized] private ClientInfo clientInfo;
 
-                public PlatformUserIdentifierAbs PlatformId => platformId;
+                public PlatformUserIdentifierAbs InternalId { get; }
+                public PlatformUserIdentifierAbs PlatformId { get; }
+                public PlatformUserIdentifierAbs CrossPlatformId { get; }
 
                 public int EntityID => entityId;
@@ -34 +35 @@
                 public string IP => ip ?? string.Empty;
 
-                public Inventory Inventory => inventory ?? (inventory = new Inventory ());
+                public Inventory Inventory => inventory ??= new Inventory ();
 
                 public bool IsOnline => clientInfo != null;
@@ -58 +59 @@
                 public bool LandProtectionActive =>
                         GameManager.Instance.World.IsLandProtectionValidForPlayer (GameManager.Instance
-                                .GetPersistentPlayerList ().GetPlayerData (PlatformId));
+                                .GetPersistentPlayerList ().GetPlayerData (InternalId));
 
                 public float LandProtectionMultiplier =>
                         GameManager.Instance.World.GetLandProtectionHardnessModifierForPlayer (GameManager.Instance
-                                .GetPersistentPlayerList ().GetPlayerData (PlatformId));
+                                .GetPersistentPlayerList ().GetPlayerData (InternalId));
 
                 public float Level {
@@ -107 +108 @@
                 }
 
-                public Player (PlatformUserIdentifierAbs _platformId) {
-                        platformId = _platformId;
+                public Player (PlatformUserIdentifierAbs _internalId, PlatformUserIdentifierAbs _platformId, PlatformUserIdentifierAbs _crossPlatformId) {
+                        InternalId = _internalId;
+                        PlatformId = _platformId;
+                        CrossPlatformId = _crossPlatformId;
                         inventory = new Inventory ();
                 }
@@ -117 +120 @@
                         }
 
-                        Log.Out ("Player set to offline: " + platformId);
+                        Log.Out ("Player set to offline: " + InternalId);
                         lastOnline = DateTime.Now;
                         try {
@@ -133 +136 @@
 
                 public void SetOnline (ClientInfo _ci) {
-                        Log.Out ("Player set to online: " + platformId);
+                        Log.Out ("Player set to online: " + InternalId);
                         clientInfo = _ci;
             entityId = _ci.entityId;

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

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using Platform.Steam;
 
 namespace AllocsFixes.PersistentData {
@@ -9 +8 @@
                 public readonly Dictionary<PlatformUserIdentifierAbs, Player> Dict = new Dictionary<PlatformUserIdentifierAbs, Player> ();
 
-                public Player this [PlatformUserIdentifierAbs _platformId, bool _create] {
-                        get {
-                                if (_platformId == null) {
-                                        return null;
-                                }
+                public int Count => Dict.Count;
 
-                                if (Dict.TryGetValue (_platformId, out Player pOld)) {
-                                        return pOld;
-                                }
+                public Player GetOrCreate (PlatformUserIdentifierAbs _internalId, PlatformUserIdentifierAbs _platformId, PlatformUserIdentifierAbs _crossPlatformId) {
+                        if (_internalId == null) {
+                                return null;
+                        }
 
-                                if (!_create) {
-                                        return null;
-                                }
+                        if (Dict.TryGetValue (_internalId, out Player pOld)) {
+                                return pOld;
+                        }
 
-                                Log.Out ("Created new player entry for ID: " + _platformId);
-                                Player p = new Player (_platformId);
-                                Dict.Add (_platformId, p);
-                                return p;
-                        }
+                        Log.Out ("Created new player entry for ID: " + _internalId);
+                        Player p = new Player (_internalId, _platformId, _crossPlatformId);
+                        Dict.Add (_internalId, p);
+                        return p;
                 }
 
-                public int Count => Dict.Count;
+                public Player GetByInternalId (PlatformUserIdentifierAbs _internalId) {
+                        if (_internalId == null) {
+                                return null;
+                        }
 
-                public PlatformUserIdentifierAbs GetSteamID (string _nameOrId, bool _ignoreColorCodes) {
+                        return Dict.TryGetValue (_internalId, out Player pOld) ? pOld : null;
+                }
+
+                public Player GetByUserId (PlatformUserIdentifierAbs _userId) {
+                        foreach ((_, Player p) in Dict) {
+                                if (p.PlatformId.Equals (_userId) || p.CrossPlatformId.Equals (_userId)) {
+                                        return p;
+                                }
+                        }
+
+                        return null;
+                }
+
+                public Player GetByString (string _nameOrId, bool _ignoreColorCodes) {
                         if (string.IsNullOrEmpty (_nameOrId)) {
                                 return null;
@@ -38 +49 @@
 
                         if (PlatformUserIdentifierAbs.TryFromCombinedString (_nameOrId, out PlatformUserIdentifierAbs userId)) {
-                                return userId;
+                                return GetByUserId (userId);
                         }
 
                         if (int.TryParse (_nameOrId, out int entityId)) {
-                                foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in Dict) {
-                                        if (kvp.Value.IsOnline && kvp.Value.EntityID == entityId) {
-                                                return kvp.Key;
+                                foreach ((_, Player p) in Dict) {
+                                        if (p.IsOnline && p.EntityID == entityId) {
+                                                return p;
                                         }
                                 }
                         }
 
-                        foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in Dict) {
-                                string name = kvp.Value.Name;
+                        foreach ((_, Player p) in Dict) {
+                                string name = p.Name;
                                 if (_ignoreColorCodes) {
                                         name = Regex.Replace (name, "\\[[0-9a-fA-F]{6}\\]", "");
                                 }
 
-                                if (kvp.Value.IsOnline && name.EqualsCaseInsensitive (_nameOrId)) {
-                                        return kvp.Key;
+                                if (p.IsOnline && name.EqualsCaseInsensitive (_nameOrId)) {
+                                        return p;
                                 }
                         }