Merge pull request #93 from DrMeepso/dev

Fetch username with getter to update players usernames when changed

Author: DrMeepso

.gitignore

@@ -13,3 +13,4 @@ bin/
 WFServer/worlds/main_zone.tscn
 Cove/worlds/main_zone.tscn
 /.idea
+CoveServer.sln.DotSettings.user

Cove/Server/Actor/Player.cs

@@ -29,15 +29,26 @@ public class WFPlayer : WFActor
     {
         public CSteamID SteamId { get; set; }
         public string FisherID { get; set; }
-        public string Username { get; set; }
+
+        public string Username
+        {
+            get
+            {
+                if (overrideUsername != "")
+                    return overrideUsername;
+                return SteamFriends.GetFriendPersonaName(SteamId);
+            }
+            init => overrideUsername = value;
+        }
+
+        private string overrideUsername = ""; // for if we need to override a players username
         public List<CSteamID> blockedPlayers = new List<CSteamID>();
         public SteamNetworkingIdentity identity;
-        public WFPlayer(CSteamID id, string fisherName, SteamNetworkingIdentity identity) : base(0, "player", Vector3.zero)
+        public WFPlayer(CSteamID id, SteamNetworkingIdentity identity) : base(0, "player", Vector3.zero)
         {
             SteamId = id;
             string randomID = new string(Enumerable.Range(0, 3).Select(_ => "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[new Random().Next(36)]).ToArray());
             FisherID = randomID;
-            Username = fisherName;
 
             owner = id;
 

Cove/Server/Server.Commands.cs

@@ -152,7 +152,7 @@ public void RegisterDefaultCommands()
                 previousPlayer = PreviousPlayers.ToList().Find(p => $"#{p.FisherID}".Equals(playerIdent, StringComparison.OrdinalIgnoreCase));
                 if (previousPlayer != null)
                 {
-                    playerToBan = new WFPlayer(previousPlayer.SteamId, previousPlayer.Username, new SteamNetworkingIdentity())
+                    playerToBan = new WFPlayer(previousPlayer.SteamId, new SteamNetworkingIdentity())
                     {
                         FisherID = previousPlayer.FisherID,
                         Username = previousPlayer.Username,
@@ -216,7 +216,6 @@ public void RegisterDefaultCommands()
                         CSteamID steamId = new CSteamID(Convert.ToUInt64(forgivenPlayer));
                         var player = new WFPlayer(
                             steamId,
-                            Steamworks.SteamFriends.GetFriendPersonaName(steamId),
                             new SteamNetworkingIdentity()
                         );
                         if (isPlayerBanned(steamId))

Cove/Server/Server.Punish.cs

@@ -33,7 +33,7 @@ public partial class CoveServer
 
         public void banPlayer(CSteamID id, bool saveToFile = false, string banReason = "")
         {
-            var player = new WFPlayer(id, Steamworks.SteamFriends.GetFriendPersonaName(id), new SteamNetworkingIdentity());
+            var player = new WFPlayer(id, new SteamNetworkingIdentity());
 
             Dictionary<string, object> banPacket = new();
             banPacket["type"] = "client_was_banned";

Cove/Server/Server.cs

@@ -246,7 +246,7 @@ public async void Init()
                 return;
             }
 
-            serverPlayer = new WFPlayer(SteamUser.GetSteamID(), SteamFriends.GetPersonaName(), new SteamNetworkingIdentity());
+            serverPlayer = new WFPlayer(SteamUser.GetSteamID(), new SteamNetworkingIdentity()) { Username = SteamFriends.GetPersonaName() };
 
             // thread for running steamworks callbacks
             cbThread.IsBackground = true;
@@ -480,7 +480,7 @@ out chatEntryType
                         bool suc = SteamMatchmaking.SendLobbyChatMsg(new CSteamID(callback.m_ulSteamIDLobby), acceptData, acceptData.Count());
 
                         // make the player a wfplayer
-                        WFPlayer player = new WFPlayer(userId, SteamFriends.GetFriendPersonaName(userId), new SteamNetworkingIdentity());
+                        WFPlayer player = new WFPlayer(userId, new SteamNetworkingIdentity());
                         AllPlayers.Add(player);
 
                         // if there is already a player with the same FisherID, remove them from the previous players list to prevent duplicates