Fix

Author: TianMengLucky

.github/workflows/build.yml

@@ -57,6 +57,9 @@ jobs:
       - name: Del Other Files
         run: rm -rf ./Release/BepInEx/plugins/TheOtherRoles.deps.json ./Release/BepInEx/plugins/TheOtherRoles.pdb ./Release/changelog.txt ./Release/BepInEx/config/BepInEx.cfg
 
+      - name: make
+        run: mkdir ./Release/BepInEx/config
+        
       - name: Move cfg
         run: mv BepInEx.cfg ./Release/BepInEx/config
 

TheOtherRoles/Helper/HandshakeHelper.cs

@@ -214,7 +214,7 @@ public void Send(HandshakeHelper.ShareMode mode)
     {
         Info($"again send mode:{mode} id:{playerId}");
 
-        if (AmongUsClient.Instance == null || CachedPlayer.LocalPlayer.PlayerControl == null) return;
+        if (AmongUsClient.Instance == null || CachedPlayer.LocalPlayer == null) return;
 
         var writer = FastRpcWriter.StartNewRpcWriter(CustomRPC.VersionHandshakeEx, SendOption.Reliable,
                 RPCSendMode.SendToPlayer, playerId)

TheOtherRoles/Modules/ChatCommands.cs

@@ -55,7 +55,7 @@ static bool Prefix(ChatController __instance) {
                             var writer = FastRpcWriter.StartNewRpcWriter(CustomRPC.ShareGamemode)
                                 .Write(gameMode);
                             writer.RPCSend();
-                            RPCProcedure.shareGameMode((byte)gameMode);
+                            RPCProcedure.shareGamemode((byte)gameMode);
                         } 
                         else 
                         {

TheOtherRoles/Patches/GameStartManagerPatch.cs

@@ -18,8 +18,18 @@ public class GameStartManagerPatch
 
     private static bool IsStart(GameStartManager __instance)
     {
-        return __instance.GameStartText.text.StartsWith(
-            FastDestroyableSingleton<TranslationController>.Instance.GetString(StringNames.GameStarting));
+        return __instance.GameStartText.text.Contains(
+            FastDestroyableSingleton<TranslationController>.Instance.GetString(StringNames.GameStarting, [Mathf.CeilToInt(__instance.countDownTimer)]));
+    }
+    
+    [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
+    public class AmongUsClientOnGameEndPatch
+    {
+        public static void Postfix(AmongUsClient __instance)
+        {
+            if (AmongUsClient.Instance.AmHost) 
+                HandshakeHelper.ShareGameMode();
+        }
     }
 
     [HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnPlayerJoined))]
@@ -51,15 +61,15 @@ public static void Postfix(GameStartManager __instance)
                     new Il2CppReferenceArray<Il2CppSystem.Object>(0)) + "\r\n" + code;
 
             // Send version as soon as CachedPlayer.LocalPlayer.PlayerControl exists
+            
+            if (AmongUsClient.Instance.AmHost) HandshakeHelper.ShareGameMode();
 
             if (CachedPlayer.LocalPlayer == null) return;
 
             HandshakeHelper.PlayerAgainInfo.Clear();
 
             HandshakeHelper.shareGameVersion();
             HandshakeHelper.shareGameGUID();
-
-            if (AmongUsClient.Instance.AmHost) HandshakeHelper.ShareGameMode();
         }
     }
 

TheOtherRoles/RPC.cs

@@ -286,15 +286,10 @@ public static void forceEnd()
                 }
             }
         }
-
-        public static void shareGameMode(byte mode)
-        {
-            gameMode = (CustomGamemodes)mode;
-        }
-
+        
         public static void shareGamemode(byte gm)
         {
-            TORMapOptions.gameMode = (CustomGamemodes)gm;
+            gameMode = (CustomGamemodes)gm;
         }
 
         public static void stopStart(byte playerId)