Code clean up

Helpers/Debugger.cs

@@ -1,5 +1,6 @@
 
 using BepInEx;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 
 namespace BetterAmongUs;

Helpers/PlayerControlHelper.cs

@@ -218,7 +218,7 @@ static class PlayerControlHelper
         return string.Empty;
     }
     // Check if player is Shapeshifting
-    public static bool IsInShapeshift(this PlayerControl player) => player != null && (player.shapeshiftTargetPlayerId > -1 || player.shapeshifting);
+    public static bool IsInShapeshift(this PlayerControl player) => player != null && (player.shapeshiftTargetPlayerId > -1 || player.shapeshifting) && !player.waitingForShapeshiftResponse;
     // Check if player is in vanish as Phantom
     public static bool IsInVanish(this PlayerControl player)
     {

Items/OptionItems/BetterOptionCheckboxItem.cs

@@ -1,4 +1,4 @@
-using BetterAmongUs.Modules;
+using BetterAmongUs.Managers;
 using UnityEngine;
 
 namespace BetterAmongUs.Items.OptionItems;

Items/OptionItems/BetterOptionFloatItem.cs

@@ -1,4 +1,4 @@
-using BetterAmongUs.Modules;
+using BetterAmongUs.Managers;
 using UnityEngine;
 
 namespace BetterAmongUs.Items.OptionItems;

Items/OptionItems/BetterOptionIntItem.cs

@@ -1,4 +1,4 @@
-using BetterAmongUs.Modules;
+using BetterAmongUs.Managers;
 using UnityEngine;
 
 namespace BetterAmongUs.Items.OptionItems;

Items/OptionItems/BetterOptionStringItem.cs

@@ -1,4 +1,4 @@
-using BetterAmongUs.Modules;
+using BetterAmongUs.Managers;
 using UnityEngine;
 
 namespace BetterAmongUs.Items.OptionItems;

Managers/BetterDataManager.cs

@@ -1,6 +1,7 @@
-using System.Text.Json;
+using BetterAmongUs.Modules;
+using System.Text.Json;
 
-namespace BetterAmongUs.Modules;
+namespace BetterAmongUs.Managers;
 
 class BetterDataManager
 {

Managers/BetterHostManager.cs

@@ -1,312 +1,313 @@
-using AmongUs.GameOptions;
-using BetterAmongUs.Helpers;
-using Hazel;
-using InnerNet;
-using System.Text;
-using UnityEngine;
-
-namespace BetterAmongUs.Modules;
-
-class BetterHostManager
-{
-    private static readonly List<PlayerControl> VentStuck = [];
-
-    public static void PlayerUpdate(PlayerControl player)
-    {
-        // Lock up player vent button if it's invalid vent
-        if (!VentStuck.Contains(player) && player.inVent && !player.Is(RoleTypes.Engineer) && !player.IsImpostorTeam())
-        {
-            player.MyPhysics.RpcEnterVent(player.GetPlayerVentId());
-            player.MyPhysics.RpcBootFromVent(player.GetPlayerVentId());
-            VentStuck.Add(player);
-        }
-    }
-
-    public static bool CheckRange(Vector2 pos1, Vector2 pos2, float range) => Vector2.Distance(pos1, pos2) <= range;
-
-    public static bool CheckRPCAsHost(PlayerControl player, byte callId, MessageReader reader, ref bool canceled)
-    {
-        if (player == null || !GameState.IsHost) return true;
-
-        bool shouldReturn = false;
-
-        switch (callId)
-        {
-            case (byte)RpcCalls.CheckProtect:
-                {
-                    PlayerControl target = reader.ReadNetObject<PlayerControl>();
-                    if (target != null)
-                    {
-                        if (player.Is(RoleTypes.GuardianAngel)
-                            && !player.IsAlive()
-                            && !player.IsImpostorTeam()
-                            && CheckRange(player.GetCustomPosition(), target.GetCustomPosition(), 3f))
-                        {
-                            if (target.IsAlive())
-                            {
-                                player.RpcProtectPlayer(target, player.Data.DefaultOutfit.ColorId);
-                                break;
-                            }
-                        }
-                    }
-
-                    canceled = true;
-                }
-                break;
-
-            case (byte)RpcCalls.CheckMurder:
-                {
-                    PlayerControl target = reader.ReadNetObject<PlayerControl>();
-
-                    if (target != null)
-                    {
-                        if (player.IsAlive()
-                            && player.IsImpostorTeam()
-                            && !player.inMovingPlat
-                            && !player.IsInVent()
-                            && !player.IsInVanish()
-                            && !player.shapeshifting
-                            && !player.onLadder
-                            && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation()
-                            && CheckRange(player.GetCustomPosition(), target.GetCustomPosition(), 3f))
-                        {
-                            if (target.IsAlive()
-                                && !target.IsImpostorTeam()
-                                && !target.inMovingPlat
-                                && !target.IsInVent()
-                                && !target.onLadder
-                                && !target.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
-                            {
-                                player.RpcMurderPlayer(target, true);
-                                break;
-                            }
-                        }
-                    }
-
-                    canceled = true;
-                }
-                break;
-
-            case (byte)RpcCalls.CheckShapeshift:
-                {
-                    PlayerControl target = reader.ReadNetObject<PlayerControl>();
-                    bool flag = reader.ReadBoolean();
-
-                    if (target != null)
-                    {
-                        if (player.Is(RoleTypes.Shapeshifter)
-                            && player.IsAlive()
-                            && player.IsImpostorTeam()
-                            && !player.inMovingPlat
-                            && !player.shapeshifting
-                            && !player.onLadder
-                            && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
-                        {
-                            if (!target.IsInVent() && !GameState.IsMeeting && !GameState.IsExilling && flag == false)
-                            {
-                                break;
-                            }
-
-                            player.RpcShapeshift(target, !target.IsInVent() && !GameState.IsMeeting && !GameState.IsExilling);
-                            break;
-                        }
-                    }
-
-                    canceled = true;
-                }
-                break;
-
-            case (byte)RpcCalls.CheckVanish:
-                {
-                    if (player.Is(RoleTypes.Phantom)
-                        && player.IsAlive()
-                        && player.IsImpostorTeam()
-                        && !player.IsInVent()
-                        && !player.inMovingPlat
-                        && !player.onLadder
-                        && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
-                    {
-
-                        if (AmongUsClient.Instance.AmClient)
-                        {
-                            player.SetRoleInvisibility(true, true, true);
-                        }
-                        player.RpcVanish();
-
-                        break;
-                    }
-
-                    canceled = true;
-                }
-                break;
-
-            case (byte)RpcCalls.CheckAppear:
-                {
-                    bool flag = reader.ReadBoolean();
-
-                    if (player.Is(RoleTypes.Phantom)
-                        && player.IsAlive() && player.IsImpostorTeam()
-                        && !player.inMovingPlat
-                        && !player.onLadder
-                        && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
-                    {
-                        if (!player.IsInVent() && flag == false)
-                        {
-                            break;
-                        }
-
-                        if (AmongUsClient.Instance.AmClient)
-                        {
-                            player.SetRoleInvisibility(false, !player.IsInVent(), true);
-                        }
-                        player.RpcAppear(!player.IsInVent());
-
-                        break;
-                    }
-
-                    canceled = true;
-                }
-                break;
-
-            case (byte)RpcCalls.CompleteTask:
-                {
-                    _ = new LateTask(() =>
-                    {
-                        RPC.SyncAllNames(force: true);
-                    }, 1f, shoudLog: false);
-
-                    shouldReturn = true;
-                }
-                break;
-
-            default:
-                shouldReturn = true;
-                break;
-        }
-
-
-        return shouldReturn;
-    }
-
-    // Set player names for better host
-    public static void SetPlayersInfoAsHost(PlayerControl player, bool forMeeting = false, bool force = false, bool IsBetterHost = true)
-    {
-        if (player == null) return;
-
-        if (!Main.BetterHost.Value || forMeeting)
-        {
-            if (player.Data.PlayerName != player.CurrentOutfit.PlayerName && !player.IsInShapeshift() || force)
-            {
-                player.RpcSetName(player.Data.PlayerName);
-                Logger.LogPrivate($"Reset {player.Data.PlayerName} name", "RPC");
-            }
-            return;
-        }
-
-        if (!IsBetterHost && !force) return;
-
-        foreach (PlayerControl target in Main.AllPlayerControls)
-        {
-            if (target == null || target.IsLocalPlayer()) continue;
-
-            string NewName = !player.IsInShapeshift() ? player.Data.PlayerName : GameData.Instance.AllPlayers.ToArray().First(data => data.PlayerId == player.shapeshiftTargetPlayerId).PlayerName;
-
-            StringBuilder sbTopTag = new StringBuilder();
-
-            if (!player.BetterData().IsBetterUser)
-            {
-                if (GameState.IsLobby)
-                {
-                    NewName = player.Data.PlayerName;
-
-                    if (player.IsHost())
-                        NewName = player.GetPlayerNameAndColor();
-
-                    if (player.IsDev())
-                        sbTopTag.Append("<color=#6e6e6e>(<color=#0088ff>Dev</color>)</color>+++");
-
-                    if (player.IsLocalPlayer())
-                        sbTopTag.Append($"<color=#0dff00>Better Host</color>+++");
-                    else if (player.BetterData().IsBetterUser)
-                        sbTopTag.Append("<color=#0dff00>Better User</color>+++");
-                }
-                else if (GameState.IsInGamePlay && !GameState.IsHideNSeek)
-                {
-                    string Role = $"<color={player.GetTeamHexColor()}>{player.GetRoleName()}</color>";
-                    if (!player.IsImpostorTeam() && player.myTasks.Count > 0)
-                    {
-                        Role += $" <color=#cbcbcb>({player.Data.Tasks.ToArray().Where(task => task.Complete).Count()}/{player.Data.Tasks.Count})</color>";
-                    }
-                    if (player.IsImpostorTeam() is false || target.IsImpostorTeam() is false)
-                    {
-                        if (target.IsAlive() && player != target)
-                        {
-                            Role = "";
-                        }
-                    }
-
-                    sbTopTag.Append($"{Role}+++");
-                }
-                else if (GameState.IsInGamePlay)
-                {
-                    if (player == target)
-                    {
-                        if (player.IsImpostorTeam())
-                        {
-                            sbTopTag.Append($"<color={Utils.GetTeamHexColor(RoleTeamTypes.Impostor)}>Seeker</color>+++");
-                        }
-                        else
-                        {
-                            sbTopTag.Append($"<color={Utils.GetTeamHexColor(RoleTeamTypes.Crewmate)}>Hider</color>+++");
-                        }
-                    }
-                }
-
-                // Put +++ at the end of each tag
-                static StringBuilder FormatInfo(StringBuilder source)
-                {
-                    var sb = new StringBuilder();
-                    if (source.Length > 0)
-                    {
-                        string text = source.ToString();
-                        string[] parts = text.Split("+++");
-                        for (int i = 0; i < parts.Length; i++)
-                        {
-                            if (!string.IsNullOrEmpty(Utils.RemoveHtmlText(parts[i])))
-                            {
-                                sb.Append(parts[i]);
-                                if (i != parts.Length - 2)
-                                {
-                                    sb.Append(" - ");
-                                }
-                            }
-                        }
-                    }
-
-                    return sb;
-                }
-
-                sbTopTag = FormatInfo(sbTopTag);
-
-                if (sbTopTag.Length > 0)
-                    NewName = $"<size=65%>{sbTopTag}</size>\n{NewName}";
-                else
-                    NewName = $"{NewName}";
-
-                // Don't send rpc if name is the same!
-                if (player.BetterData().LastNameSetFor.TryGetValue(target.PlayerId, out var lastName))
-                {
-                    if (lastName == NewName || !force)
-                    {
-                        return;
-                    }
-                }
-
-                player.BetterData().LastNameSetFor[target.PlayerId] = NewName;
-            }
-
-            player.RpcSetNamePrivate(NewName, target);
-            Logger.LogPrivate($"Set {player.Data.PlayerName} name to {NewName.Replace("\n", "-")} for {target.Data.PlayerName}", "RPC");
-        }
-    }
-}
+using AmongUs.GameOptions;
+using BetterAmongUs.Helpers;
+using BetterAmongUs.Modules;
+using Hazel;
+using InnerNet;
+using System.Text;
+using UnityEngine;
+
+namespace BetterAmongUs.Managers;
+
+class BetterHostManager
+{
+    private static readonly List<PlayerControl> VentStuck = [];
+
+    public static void PlayerUpdate(PlayerControl player)
+    {
+        // Lock up player vent button if it's invalid vent
+        if (!VentStuck.Contains(player) && player.inVent && !player.Is(RoleTypes.Engineer) && !player.IsImpostorTeam())
+        {
+            player.MyPhysics.RpcEnterVent(player.GetPlayerVentId());
+            player.MyPhysics.RpcBootFromVent(player.GetPlayerVentId());
+            VentStuck.Add(player);
+        }
+    }
+
+    public static bool CheckRange(Vector2 pos1, Vector2 pos2, float range) => Vector2.Distance(pos1, pos2) <= range;
+
+    public static bool CheckRPCAsHost(PlayerControl player, byte callId, MessageReader reader, ref bool canceled)
+    {
+        if (player == null || !GameState.IsHost) return true;
+
+        bool shouldReturn = false;
+
+        switch (callId)
+        {
+            case (byte)RpcCalls.CheckProtect:
+                {
+                    PlayerControl target = reader.ReadNetObject<PlayerControl>();
+                    if (target != null)
+                    {
+                        if (player.Is(RoleTypes.GuardianAngel)
+                            && !player.IsAlive()
+                            && !player.IsImpostorTeam()
+                            && CheckRange(player.GetCustomPosition(), target.GetCustomPosition(), 3f))
+                        {
+                            if (target.IsAlive())
+                            {
+                                player.RpcProtectPlayer(target, player.Data.DefaultOutfit.ColorId);
+                                break;
+                            }
+                        }
+                    }
+
+                    canceled = true;
+                }
+                break;
+
+            case (byte)RpcCalls.CheckMurder:
+                {
+                    PlayerControl target = reader.ReadNetObject<PlayerControl>();
+
+                    if (target != null)
+                    {
+                        if (player.IsAlive()
+                            && player.IsImpostorTeam()
+                            && !player.inMovingPlat
+                            && !player.IsInVent()
+                            && !player.IsInVanish()
+                            && !player.shapeshifting
+                            && !player.onLadder
+                            && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation()
+                            && CheckRange(player.GetCustomPosition(), target.GetCustomPosition(), 3f))
+                        {
+                            if (target.IsAlive()
+                                && !target.IsImpostorTeam()
+                                && !target.inMovingPlat
+                                && !target.IsInVent()
+                                && !target.onLadder
+                                && !target.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
+                            {
+                                player.RpcMurderPlayer(target, true);
+                                break;
+                            }
+                        }
+                    }
+
+                    canceled = true;
+                }
+                break;
+
+            case (byte)RpcCalls.CheckShapeshift:
+                {
+                    PlayerControl target = reader.ReadNetObject<PlayerControl>();
+                    bool flag = reader.ReadBoolean();
+
+                    if (target != null)
+                    {
+                        if (player.Is(RoleTypes.Shapeshifter)
+                            && player.IsAlive()
+                            && player.IsImpostorTeam()
+                            && !player.inMovingPlat
+                            && !player.shapeshifting
+                            && !player.onLadder
+                            && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
+                        {
+                            if (!target.IsInVent() && !GameState.IsMeeting && !GameState.IsExilling && flag == false)
+                            {
+                                break;
+                            }
+
+                            player.RpcShapeshift(target, !target.IsInVent() && !GameState.IsMeeting && !GameState.IsExilling);
+                            break;
+                        }
+                    }
+
+                    canceled = true;
+                }
+                break;
+
+            case (byte)RpcCalls.CheckVanish:
+                {
+                    if (player.Is(RoleTypes.Phantom)
+                        && player.IsAlive()
+                        && player.IsImpostorTeam()
+                        && !player.IsInVent()
+                        && !player.inMovingPlat
+                        && !player.onLadder
+                        && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
+                    {
+
+                        if (AmongUsClient.Instance.AmClient)
+                        {
+                            player.SetRoleInvisibility(true, true, true);
+                        }
+                        player.RpcVanish();
+
+                        break;
+                    }
+
+                    canceled = true;
+                }
+                break;
+
+            case (byte)RpcCalls.CheckAppear:
+                {
+                    bool flag = reader.ReadBoolean();
+
+                    if (player.Is(RoleTypes.Phantom)
+                        && player.IsAlive() && player.IsImpostorTeam()
+                        && !player.inMovingPlat
+                        && !player.onLadder
+                        && !player.MyPhysics.Animations.IsPlayingAnyLadderAnimation())
+                    {
+                        if (!player.IsInVent() && flag == false)
+                        {
+                            break;
+                        }
+
+                        if (AmongUsClient.Instance.AmClient)
+                        {
+                            player.SetRoleInvisibility(false, !player.IsInVent(), true);
+                        }
+                        player.RpcAppear(!player.IsInVent());
+
+                        break;
+                    }
+
+                    canceled = true;
+                }
+                break;
+
+            case (byte)RpcCalls.CompleteTask:
+                {
+                    _ = new LateTask(() =>
+                    {
+                        RPC.SyncAllNames(force: true);
+                    }, 1f, shoudLog: false);
+
+                    shouldReturn = true;
+                }
+                break;
+
+            default:
+                shouldReturn = true;
+                break;
+        }
+
+
+        return shouldReturn;
+    }
+
+    // Set player names for better host
+    public static void SetPlayersInfoAsHost(PlayerControl player, bool forMeeting = false, bool force = false, bool IsBetterHost = true)
+    {
+        if (player == null) return;
+
+        if (!Main.BetterHost.Value || forMeeting)
+        {
+            if (player.Data.PlayerName != player.CurrentOutfit.PlayerName && !player.IsInShapeshift() || force)
+            {
+                player.RpcSetName(player.Data.PlayerName);
+                Logger.LogPrivate($"Reset {player.Data.PlayerName} name", "RPC");
+            }
+            return;
+        }
+
+        if (!IsBetterHost && !force) return;
+
+        foreach (PlayerControl target in Main.AllPlayerControls)
+        {
+            if (target == null || target.IsLocalPlayer()) continue;
+
+            string NewName = !player.IsInShapeshift() ? player.Data.PlayerName : Utils.PlayerDataFromPlayerId(player.shapeshiftTargetPlayerId).PlayerName;
+
+            StringBuilder sbTopTag = new StringBuilder();
+
+            if (!player.BetterData().IsBetterUser)
+            {
+                if (GameState.IsLobby)
+                {
+                    NewName = player.Data.PlayerName;
+
+                    if (player.IsHost())
+                        NewName = player.GetPlayerNameAndColor();
+
+                    if (player.IsDev())
+                        sbTopTag.Append("<color=#6e6e6e>(<color=#0088ff>Dev</color>)</color>+++");
+
+                    if (player.IsLocalPlayer())
+                        sbTopTag.Append($"<color=#0dff00>Better Host</color>+++");
+                    else if (player.BetterData().IsBetterUser)
+                        sbTopTag.Append("<color=#0dff00>Better User</color>+++");
+                }
+                else if (GameState.IsInGamePlay && !GameState.IsHideNSeek)
+                {
+                    string Role = $"<color={player.GetTeamHexColor()}>{player.GetRoleName()}</color>";
+                    if (!player.IsImpostorTeam() && player.myTasks.Count > 0)
+                    {
+                        Role += $" <color=#cbcbcb>({player.Data.Tasks.ToArray().Where(task => task.Complete).Count()}/{player.Data.Tasks.Count})</color>";
+                    }
+                    if (player.IsImpostorTeam() is false || target.IsImpostorTeam() is false)
+                    {
+                        if (target.IsAlive() && player != target)
+                        {
+                            Role = "";
+                        }
+                    }
+
+                    sbTopTag.Append($"{Role}+++");
+                }
+                else if (GameState.IsInGamePlay)
+                {
+                    if (player == target)
+                    {
+                        if (player.IsImpostorTeam())
+                        {
+                            sbTopTag.Append($"<color={Utils.GetTeamHexColor(RoleTeamTypes.Impostor)}>Seeker</color>+++");
+                        }
+                        else
+                        {
+                            sbTopTag.Append($"<color={Utils.GetTeamHexColor(RoleTeamTypes.Crewmate)}>Hider</color>+++");
+                        }
+                    }
+                }
+
+                // Put +++ at the end of each tag
+                static StringBuilder FormatInfo(StringBuilder source)
+                {
+                    var sb = new StringBuilder();
+                    if (source.Length > 0)
+                    {
+                        string text = source.ToString();
+                        string[] parts = text.Split("+++");
+                        for (int i = 0; i < parts.Length; i++)
+                        {
+                            if (!string.IsNullOrEmpty(Utils.RemoveHtmlText(parts[i])))
+                            {
+                                sb.Append(parts[i]);
+                                if (i != parts.Length - 2)
+                                {
+                                    sb.Append(" - ");
+                                }
+                            }
+                        }
+                    }
+
+                    return sb;
+                }
+
+                sbTopTag = FormatInfo(sbTopTag);
+
+                if (sbTopTag.Length > 0)
+                    NewName = $"<size=65%>{sbTopTag}</size>\n{NewName}";
+                else
+                    NewName = $"{NewName}";
+
+                // Don't send rpc if name is the same!
+                if (player.BetterData().LastNameSetFor.TryGetValue(target.PlayerId, out var lastName))
+                {
+                    if (lastName == NewName || !force)
+                    {
+                        return;
+                    }
+                }
+
+                player.BetterData().LastNameSetFor[target.PlayerId] = NewName;
+            }
+
+            player.RpcSetNamePrivate(NewName, target);
+            Logger.LogPrivate($"Set {player.Data.PlayerName} name to {NewName.Replace("\n", "-")} for {target.Data.PlayerName}", "RPC");
+        }
+    }
+}

Managers/BetterNotificationManager.cs

@@ -1,10 +1,11 @@
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Modules;
 using BetterAmongUs.Patches;
 using Cpp2IL.Core.Extensions;
 using TMPro;
 using UnityEngine;
 
-namespace BetterAmongUs.Modules;
+namespace BetterAmongUs.Managers;
 
 class BetterNotificationManager
 {

Modules/AntiCheat.cs

@@ -1,5 +1,6 @@
 using AmongUs.GameOptions;
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Patches;
 using HarmonyLib;
 using Hazel;

Modules/DebugMenu.cs

@@ -1,4 +1,5 @@
-using BetterAmongUs.Resources;
+using BetterAmongUs.Managers;
+using BetterAmongUs.Resources;
 using Il2CppInterop.Runtime.Attributes;
 using UnityEngine;
 

Modules/RPC.cs

@@ -1,4 +1,5 @@
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Patches;
 using HarmonyLib;
 using Hazel;

Patches/ClientOptionsPatch.cs

@@ -1,5 +1,6 @@
 using BepInEx;
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using HarmonyLib;
 using UnityEngine;

Patches/ClientPatch.cs

@@ -1,4 +1,5 @@
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using HarmonyLib;
 using InnerNet;

Patches/CommandsPatch.cs

@@ -1,6 +1,7 @@
 using AmongUs.Data;
 using AmongUs.GameOptions;
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using HarmonyLib;
 using Hazel;

Patches/HudManagerPatch.cs

@@ -1,4 +1,5 @@
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using HarmonyLib;
 using TMPro;

Patches/ModManagerPatch.cs

@@ -1,4 +1,5 @@
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using HarmonyLib;
 using UnityEngine;

Patches/PlayerControlPatch.cs

@@ -1,6 +1,7 @@
 using AmongUs.Data;
 using AmongUs.GameOptions;
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using HarmonyLib;
 using Il2CppSystem.Linq;
@@ -133,7 +134,7 @@ class PlayerControlPatch
             {
                 player.RawSetName(newName);
             }
-            else if (!player.shapeshifting)
+            else
             {
                 var targetData = Utils.PlayerDataFromPlayerId(player.shapeshiftTargetPlayerId);
                 if (targetData != null) player.RawSetName(targetData.BetterData().RealName);
@@ -313,6 +314,11 @@ class PlayerControlPatch
     {
         if (target == null) return;
 
+        if (GameState.IsHost)
+        {
+            RPC.SyncAllNames();
+        }
+
         if (__instance != target)
             Logger.LogPrivate($"{__instance.Data.PlayerName} Has Shapeshifted into {target.Data.PlayerName}, did animate: {animate}", "EventLog");
         else

Patches/PlayerJoinAndLeftPatch.cs

@@ -1,4 +1,5 @@
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using BetterAmongUs.Patches;
 using HarmonyLib;

main.cs

@@ -3,6 +3,7 @@ using BepInEx.Configuration;
 using BepInEx.Logging;
 using BepInEx.Unity.IL2CPP;
 using BetterAmongUs.Helpers;
+using BetterAmongUs.Managers;
 using BetterAmongUs.Modules;
 using BetterAmongUs.Patches;
 using HarmonyLib;