Refactor Set method to combine team and role base registration

Author: MedveMarci

UncomplicatedCustomRoles/API/Features/DisguiseTeam.cs

@@ -28,23 +28,20 @@ public class DisguiseTeam
         public static readonly ConcurrentDictionary<int, PlayerRoleBase> RoleBaseList = new();
 
         /// <summary>
-        /// Registers a faked <see cref="Team"/> for the given player and makes sure the team patches are active.
+        /// Registers a faked <see cref="Team"/> together with the overridden <see cref="PlayerRoleBase"/> that is
+        /// exposed as the player's current role. The role base is always set alongside its team, so there is no
+        /// separate "role base only" entry point.
         /// </summary>
         /// <param name="playerId">The player id.</param>
         /// <param name="team">The team to fake.</param>
-        public static void Set(int playerId, Team team)
+        /// <param name="roleBase">The role base to expose as the player's current role.</param>
+        public static void Set(int playerId, Team team, PlayerRoleBase roleBase)
         {
             List[playerId] = team;
+            RoleBaseList[playerId] = roleBase;
             TeamPatchManager.EnsurePatched();
         }
 
-        /// <summary>
-        /// Registers the overridden <see cref="PlayerRoleBase"/> for the given player.
-        /// </summary>
-        /// <param name="playerId">The player id.</param>
-        /// <param name="roleBase">The role base to expose as the player's current role.</param>
-        public static void SetRoleBase(int playerId, PlayerRoleBase roleBase) => RoleBaseList[playerId] = roleBase;
-
         /// <summary>
         /// Removes every disguise data for the given player and, if no disguise is left, removes the team patches.
         /// </summary>
@@ -68,4 +65,4 @@ public static void Clear()
             TeamPatchManager.EnsureUnpatched();
         }
     }
-}
+}

UncomplicatedCustomRoles/API/Features/SummonedCustomRole.cs

@@ -167,7 +167,6 @@ internal SummonedCustomRole(Player player, ICustomRole role, Triplet<string, str
 
             if (Role.Team is not null && Role.Team != Role.Role.GetTeam())
             {
-                DisguiseTeam.Set(Player.PlayerId, (Team)Role.Team);
                 EvaluateRoleBase();
                 LogManager.Debug($"EVALUATED ROLEBASE {_roleBase?.GetType().FullName} with team {_roleBase?.Team}");
             }
@@ -190,6 +189,9 @@ internal SummonedCustomRole(Player player, ICustomRole role, Triplet<string, str
             {
                 Timing.CallDelayed(0.75f, () =>
                 {
+                    if (!_internalValid || Player is null || !Player.IsAlive)
+                        return;
+
                     LogManager.Debug($"Changing the appearance of the role {Role.Id} [{Role.Name}] to {Role.RoleAppearance}");
 
                     if (LabApiExtensions.IsAvailable)
@@ -203,7 +205,7 @@ internal SummonedCustomRole(Player player, ICustomRole role, Triplet<string, str
         }
 
         /// <summary>
-        /// Try to set <see cref="_roleBase"/> in order to override the current Player.Role.Base to trick the server into thinking that the player is / is not an Human
+        /// Try to set <see cref="RoleBase"/> in order to override the current Player.Role.Base to trick the server into thinking that the player is / is not an Human
         /// </summary>
         private void EvaluateRoleBase()
         {
@@ -257,15 +259,15 @@ private void EvaluateRoleBase()
                         SpectatorModule = originalRole.SpectatorModule
                     };
 
-                DisguiseTeam.SetRoleBase(Player.PlayerId, _roleBase);
+                DisguiseTeam.Set(Player.PlayerId, Role.Team ?? Role.Role.GetTeam(), _roleBase);
 
                 Timing.CallDelayed(3.25f, delegate
                 {
                     if (!_internalValid || _roleBase is null)
                         return;
 
                     _roleBase.Pooled = false;
-                    DisguiseTeam.SetRoleBase(Player.PlayerId, _roleBase);
+                    DisguiseTeam.Set(Player.PlayerId, Role.Team ?? Role.Role.GetTeam(), _roleBase);
                 });
             }
             catch (Exception e)
@@ -648,7 +650,7 @@ public static bool TryCheckForCustomTeam(ReferenceHub player, Team teamCheck, ou
         /// <param name="player"></param>
         /// <param name="def"></param>
         /// <returns></returns>
-        public static Team TryGetCusomTeam(ReferenceHub player, Team? def = null)
+        public static Team TryGetCustomTeam(ReferenceHub player, Team? def = null)
         {
             if (TryGet(player, out SummonedCustomRole customRole) && customRole.Role.Team is not null && customRole.Role.Team != customRole.Role.Role.GetTeam())
                 return (Team)customRole.Role.Team;