Fix

Author: BatmenzDW

Modules/AntiBlackout.cs

@@ -428,4 +428,10 @@ public static bool TP(this CustomRpcSender sender, PlayerControl pc, Vector2 loc
         // if (sender.sendOption == SendOption.Reliable) Utils.NumSnapToCallsThisRound++;
         return true;
     }
+
+    public static bool RpcExileV2(this CustomRpcSender sender, PlayerControl player)
+    {
+        sender.RpcSetRole(player, player.GetGhostRoleBasis());
+        return true;
+    }
 }

Modules/CustomRpcSender.cs

@@ -14,6 +14,7 @@
 using TOHE.Roles.AddOns.Common;
 using TOHE.Roles.AddOns.Impostor;
 using TOHE.Roles.Core;
+using TOHE.Roles.Core.AssignManager;
 using TOHE.Roles.Coven;
 using TOHE.Roles.Crewmate;
 using TOHE.Roles.Impostor;
@@ -1041,6 +1042,47 @@ public static CountTypes GetCountTypes(this PlayerControl player)
         return Main.PlayerStates.TryGetValue(player.PlayerId, out var State) ? State.countTypes : CountTypes.None;
     }
 
+    // If you use vanilla RpcSetRole, it will block further SetRole calls until the next game starts.
+    public static void RpcSetRoleGlobal(this PlayerControl player, RoleTypes roleTypes, bool setRoleMap = false)
+    {
+        if (!AmongUsClient.Instance.AmHost) return;
+        if (AmongUsClient.Instance.AmClient) try { player.StartCoroutine(player.CoSetRole(roleTypes, true)); } catch { }
+        MessageWriter writer = AmongUsClient.Instance.StartRpcImmediately(player.NetId, (byte)RpcCalls.SetRole, SendOption.Reliable);
+        writer.Write((ushort)roleTypes);
+        writer.Write(true);
+        AmongUsClient.Instance.FinishRpcImmediately(writer);
+        Logger.Info($" {player.GetNameWithRole()} => {roleTypes}", "RpcSetRoleGlobal");
+
+        // if (setRoleMap)
+        // {
+        //     foreach ((byte seerID, byte targetID) in StartGameHostPatch.RpcSetRoleReplacer.RoleMap.Keys.ToArray())
+        //     {
+        //         if (targetID == player.PlayerId)
+        //         {
+        //             var value = StartGameHostPatch.RpcSetRoleReplacer.RoleMap[(seerID, targetID)];
+        //             value.RoleType = roleTypes;
+        //             StartGameHostPatch.RpcSetRoleReplacer.RoleMap[(seerID, targetID)] = value;
+        //         }
+        //     }
+        // }
+    }
+
+    public static RoleTypes GetGhostRoleBasis(this PlayerControl __instance)
+    {
+        RoleTypes roleType;
+        
+        if (GhostRoleAssign.AssignedGhostRole.TryGetValue(__instance.PlayerId, out var ghostRole))
+            roleType = ghostRole.GetRoleTypes();
+        // else if (GhostRolesManager.ShouldHaveGhostRole(__instance))
+        //     roleType = RoleTypes.GuardianAngel;
+        else if (!(__instance.Is(RoleTypes.Impostor) && Options.DeadImpCantSabotage.GetBool()) && __instance.GetRoleClass().CanUseSabotage(__instance))
+            roleType = RoleTypes.ImpostorGhost;
+        else
+            roleType = RoleTypes.CrewmateGhost;
+
+        return roleType;
+    }
+
     public static DeadBody GetDeadBody(this NetworkedPlayerInfo playerData)
     {
         return UnityEngine.Object.FindObjectsOfType<DeadBody>().FirstOrDefault(bead => bead.ParentId == playerData.PlayerId);

Modules/ExtendedPlayerControl.cs

@@ -3325,8 +3325,6 @@ public static void AfterMeetingTasks()
         if (Diseased.IsEnable) Diseased.AfterMeetingTasks();
         if (Antidote.IsEnable) Antidote.AfterMeetingTasks();
 
-        AntiBlackout.AfterMeetingTasks();
-
         try
         {
             CovenManager.CheckNecroVotes();

Modules/Utils.cs

@@ -1,13 +1,16 @@
 using AmongUs.Data;
 using AmongUs.GameOptions;
+using Hazel;
 using System;
+using System.Diagnostics;
 using TOHE.Roles.Core;
 using TOHE.Roles.Neutral;
 
 namespace TOHE;
 
 class ExileControllerWrapUpPatch
 {
+    public static Stopwatch Stopwatch;
     public static NetworkedPlayerInfo AntiBlackout_LastExiled;
     [HarmonyPatch(typeof(ExileController), nameof(ExileController.Begin))]
     class ExileControllerBeginPatch
@@ -89,8 +92,6 @@ private static void CheckAndDoRandomSpawn()
     }
     private static void WrapUpPostfix(NetworkedPlayerInfo exiled)
     {
-        if (AntiBlackout.BlackOutIsActive) exiled = AntiBlackout_LastExiled;
-
         // Still not springing up in Airship
         if (!GameStates.AirshipIsActive)
         {
@@ -102,7 +103,6 @@ private static void WrapUpPostfix(NetworkedPlayerInfo exiled)
 
         bool DecidedWinner = false;
         if (!AmongUsClient.Instance.AmHost) return;
-        AntiBlackout.RestoreIsDead(doSend: false);
 
         List<Collector> collectorCL = Utils.GetRoleBasesByType<Collector>()?.ToList();
 
@@ -152,100 +152,95 @@ private static void WrapUpFinalizer(NetworkedPlayerInfo exiled)
         // Even if an exception occurs in WrapUpPostfix, this is the only part that will be executed reliably
         if (AmongUsClient.Instance.AmHost)
         {
-            _ = new LateTask(() =>
+            Stopwatch = Stopwatch.StartNew();
+
+            LateTask.New(() =>
             {
                 if (GameStates.IsEnded) return;
+                AntiBlackout.RevertToActualRoleTypes();
+            }, 2f, "Revert AntiBlackout Measures");
+        }
 
-                exiled = AntiBlackout_LastExiled;
-                AntiBlackout.SendGameData();
-                AntiBlackout.SetRealPlayerRoles();
+        //This should happen shortly after the Exile Controller wrap up finished for clients
+        //For Certain Laggy clients 0.8f delay is still not enough. The finish time can differ
+        //If the delay is too long, it will influence other normal players' view
 
-                if (AntiBlackout.BlackOutIsActive && // State in which the expulsion target is overwritten (need not be executed if the expulsion target is not overwritten)
-                    exiled && // Exiled is not null
-                    exiled.Object) //exiled.Object is not null
-                {
-                    exiled.Object.RpcExileV2();
-                }
-            }, Options.CurrentGameMode is CustomGameMode.Standard ? 0.5f : 1.4f, "Restore IsDead Task");
+        GameStates.AlreadyDied |= !Utils.IsAllAlive;
+        RemoveDisableDevicesPatch.UpdateDisableDevices();
+        SoundManager.Instance.ChangeAmbienceVolume(DataManager.Settings.Audio.AmbienceVolume);
 
-            _ = new LateTask(AntiBlackout.ResetAfterMeeting, 0.6f, "ResetAfterMeeting");
+        _ = new LateTask(() =>
+        {
+            if (!AmongUsClient.Instance.IsGameOver)
+                DestroyableSingleton<HudManager>.Instance.SetHudActive(true);
+        }, 0.8f, "Set Hud Active");
 
-            _ = new LateTask(() =>
-            {
-                if (GameStates.IsEnded) return;
 
-                Main.AfterMeetingDeathPlayers.Do(x =>
-                {
-                    var player = x.Key.GetPlayer();
-                    var state = Main.PlayerStates[x.Key];
 
-                    Logger.Info($"{player?.GetNameWithRole().RemoveHtmlTags()} died with {x.Value}", "AfterMeetingDeath");
+        Logger.Info("Start of Task Phase", "Phase");
+    }
 
-                    if (x.Value == PlayerState.DeathReason.Suicide)
-                        player?.SetRealKiller(player, true);
+    public static void AfterMeetingTasks()
+    {
+        if (CustomWinnerHolder.WinnerTeam != CustomWinner.Default || GameStates.IsEnded){ 
+            Stopwatch.Reset();
+            return;
+        }
 
-                    state.deathReason = x.Value;
-                    state.SetDead();
-                    player?.RpcExileV2();
+        bool hasValue = false;
+        CustomRpcSender sender = CustomRpcSender.Create("Exile AfterMeetingDeathPlayers", SendOption.Reliable);
+        Main.AfterMeetingDeathPlayers.Keys.ToValidPlayers().Do(x => hasValue |= sender.RpcExileV2(x));
+        sender.SendMessage(dispose: !hasValue);
 
-                    // Just to be sure
-                    _ = new LateTask(() => player?.RpcExile(), 0.5f, "Extra Exile to be Sure");
+        foreach ((byte id, PlayerState.DeathReason deathReason) in Main.AfterMeetingDeathPlayers)
+        {
+            var player = id.GetPlayer();
+            var state = Main.PlayerStates[id];
 
-                    MurderPlayerPatch.AfterPlayerDeathTasks(player, player, true);
-                });
+            Logger.Info($"{player?.GetNameWithRole().RemoveHtmlTags()} died with {deathReason}", "AfterMeetingDeath");
 
-                Main.AfterMeetingDeathPlayers.Clear();
+            if (deathReason == PlayerState.DeathReason.Suicide)
+                player?.SetRealKiller(player, true);
 
-                Utils.AfterMeetingTasks();
-                Utils.SyncAllSettings();
-                Utils.CheckAndSetVentInteractions();
+            state.deathReason = deathReason;
+            state.SetDead();
 
-                if (Main.CurrentServerIsVanilla && Options.BypassRateLimitAC.GetBool())
-                {
-                    Main.Instance.StartCoroutine(Utils.NotifyEveryoneAsync(speed: 5));
-                }
-                else
-                {
-                    Utils.NotifyRoles();
-                }
+            if (!player) continue;
 
-                _ = new LateTask(() =>
-                {
-                    foreach (var player in Main.EnumerateAlivePlayerControls())
-                    {
-                        if (player.GetRoleClass() is not DefaultSetup)
-                        {
-                            if (player.GetRoleClass().ThisRoleBase.GetRoleTypesDirect() is RoleTypes.Impostor or RoleTypes.Phantom or RoleTypes.Shapeshifter or RoleTypes.Viper)
-                            {
-                                player.ResetKillCooldown();
-                                if (Main.AllPlayerKillCooldown.TryGetValue(player.PlayerId, out var killTimer) && (killTimer - 2f) > 0f)
-                                {
-                                    player.SetKillCooldown(killTimer - 2f);
-                                }
-                            }
-                        }
-                    }
-                }, 1f, $"Fix Kill Cooldown Task after meeting");
+            if (deathReason == PlayerState.DeathReason.Suicide)
+                player.SetRealKiller(player, true);
 
-                Main.LastMeetingEnded = Utils.TimeStamp;
-            }, 1f, "AfterMeetingDeathPlayers Task");
+            MurderPlayerPatch.AfterPlayerDeathTasks(player, player, true);
         }
 
-        //This should happen shortly after the Exile Controller wrap up finished for clients
-        //For Certain Laggy clients 0.8f delay is still not enough. The finish time can differ
-        //If the delay is too long, it will influence other normal players' view
+        Main.AfterMeetingDeathPlayers.Clear();
 
-        GameStates.AlreadyDied |= !Utils.IsAllAlive;
-        RemoveDisableDevicesPatch.UpdateDisableDevices();
-        SoundManager.Instance.ChangeAmbienceVolume(DataManager.Settings.Audio.AmbienceVolume);
+        Utils.AfterMeetingTasks();
+        Utils.SyncAllSettings();
+        Utils.CheckAndSetVentInteractions();
+
+        Main.Instance.StartCoroutine(Utils.NotifyEveryoneAsync());
 
         _ = new LateTask(() =>
         {
-            if (!AmongUsClient.Instance.IsGameOver)
-                DestroyableSingleton<HudManager>.Instance.SetHudActive(true);
-        }, 0.8f, "Set Hud Active");
+            foreach (var player in Main.EnumerateAlivePlayerControls())
+            {
+                if (player.GetRoleClass() is not DefaultSetup)
+                {
+                    if (player.GetRoleClass().ThisRoleBase.GetRoleTypesDirect() is RoleTypes.Impostor or RoleTypes.Phantom or RoleTypes.Shapeshifter or RoleTypes.Viper)
+                    {
+                        player.ResetKillCooldown();
+                        if (Main.AllPlayerKillCooldown.TryGetValue(player.PlayerId, out var killTimer) && (killTimer - 2f) > 0f)
+                        {
+                            player.SetKillCooldown(killTimer - 2f);
+                        }
+                    }
+                }
+            }
+        }, 1f, $"Fix Kill Cooldown Task after meeting");
 
-        Logger.Info("Start of Task Phase", "Phase");
+        Main.LastMeetingEnded = Utils.TimeStamp;
+        Stopwatch.Reset();
     }
 
     [HarmonyPatch(typeof(PbExileController), nameof(PbExileController.PlayerSpin))]

Patches/ExilePatch.cs

@@ -1025,7 +1025,7 @@ public static void Postfix()
 
             foreach (var player in Main.EnumeratePlayerControls())
             {
-                if (player.Is(CustomRoles.GM) && !AntiBlackout.IsCached)
+                if (player.Is(CustomRoles.GM))
                 {
                     player.RpcExile();
                     Main.PlayerStates[player.PlayerId].SetDead();