From 59b055b58f3fac200072691ec1f3dd7f6b19573a Mon Sep 17 00:00:00 2001
From: D1GQ <yourboylax@gmail.com>
Date: Sun, 22 Sep 2024 19:40:34 -0500
Subject: [PATCH] Modded lobby auto kick fix

---
 Modules/RPC.cs            | 21 +++++++++++----------
 Resources/Lang/en_US.json |  1 +
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Modules/RPC.cs b/Modules/RPC.cs
index 4fa3b8d..23cf613 100644
--- a/Modules/RPC.cs
+++ b/Modules/RPC.cs
@@ -151,7 +151,7 @@ internal static class RPC
 
     public static void HandleCustomRPC(PlayerControl player, byte callId, MessageReader oldReader)
     {
-        if (player == null || player.IsLocalPlayer() || player.Data == null) return;
+        if (player == null || player.IsLocalPlayer() || player.Data == null || Enum.IsDefined(typeof(RpcCalls), callId)) return;
 
         if (Enum.IsDefined(typeof(CustomRPC), (int)unchecked(callId)))
         {
@@ -206,21 +206,22 @@ internal static class RPC
                     */
             }
         }
-
-        try
+        else if (!Enum.IsDefined(typeof(CustomRPC), (int)unchecked(callId)))
         {
-            if (!GameStates.IsTOHEHostLobby && callId is not unchecked((byte)CustomRPC.Sicko) or unchecked((byte)CustomRPC.AUM) or (byte)CustomRPC.AUMChat)
+            try
             {
-                var flag = Enum.IsDefined(typeof(CustomRPC), (int)callId) || Enum.IsDefined(typeof(RpcCalls), callId);
-
-                if (!flag && player.IsHost())
+                if (!GameStates.IsHost && !GameStates.IsTOHEHostLobby)
                 {
-                    var BAU = "<color=#278720>♻</color><color=#0ed400><b>BetterAmongUs</b></color><color=#278720>♻</color>";
-                    Utils.DisconnectSelf($"{BAU} does not support\n<b>Modded Lobbies</b>!");
+                    if (player.IsHost())
+                    {
+                        var Icon = Translator.GetString("BAUMark");
+                        var BAU = $"<color=#278720>{Icon}</color><color=#0ed400><b>{Translator.GetString("BAU")}</b></color><color=#278720>{Icon}</color>";
+                        Utils.DisconnectSelf(string.Format(Translator.GetString("ModdedLobbyMsg"), BAU));
+                    }
                 }
             }
+            catch { }
         }
-        catch { }
     }
 
     public static void HandleRPC(PlayerControl player, byte callId, MessageReader oldReader)
diff --git a/Resources/Lang/en_US.json b/Resources/Lang/en_US.json
index b78ac37..10085c5 100644
--- a/Resources/Lang/en_US.json
+++ b/Resources/Lang/en_US.json
@@ -15,6 +15,7 @@
   "Timer": "Timer",
   "SystemMessage": "System Message",
   "SystemNotification": "System Notification",
+  "ModdedLobbyMsg": "{0} does not support\n<b>Modded Lobbies</b>",
 
   "Player.Loading": "Loading",
   "Player.NoFriendCode": "No Friend Code",