From 3e4d833b662fb00b199e54c77244521bad032a5f Mon Sep 17 00:00:00 2001
From: Ape <155788660+ApeMV@users.noreply.github.com>
Date: Sun, 12 Apr 2026 19:07:06 +0200
Subject: [PATCH] 1.7.1

---
 AmongUsRevamped.cs              | 2 +-
 Modules/CustomRoleManagement.cs | 7 ++++++-
 Patches/ChatPatches.cs          | 6 +++---
 Patches/OnGameStartedPatch.cs   | 4 ++++
 README.md                       | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/AmongUsRevamped.cs b/AmongUsRevamped.cs
index 79dd0ca..b7b61a4 100644
--- a/AmongUsRevamped.cs
+++ b/AmongUsRevamped.cs
@@ -42,7 +42,7 @@ public partial class Main : BasePlugin
 
     public static bool HasArgumentException;
     public static string CredentialsText;
-    public const string ModVersion = "v1.7.0";
+    public const string ModVersion = "v1.7.1";
 
     public static float GameTimer;
 
diff --git a/Modules/CustomRoleManagement.cs b/Modules/CustomRoleManagement.cs
index 575a0dd..329f651 100644
--- a/Modules/CustomRoleManagement.cs
+++ b/Modules/CustomRoleManagement.cs
@@ -116,7 +116,12 @@ public static class CustomRoleManagement
     private static int PendingRoleMessages = 0;
     public static void SendRoleMessages(Dictionary<string, string> roleMessages)
     {
-        if (PlayerRoles.Count == 0 || PlayerControl.LocalPlayer.Data.IsDead) return;
+        if (PlayerRoles.Count == 0 || PlayerControl.LocalPlayer.Data.IsDead)
+        {
+            HandlingRoleMessages = false;
+            PendingRoleMessages = 0;
+            return;
+        }
 
         HashSet<string> sentRoles = new HashSet<string>();
 
diff --git a/Patches/ChatPatches.cs b/Patches/ChatPatches.cs
index edc06aa..2eb6810 100644
--- a/Patches/ChatPatches.cs
+++ b/Patches/ChatPatches.cs
@@ -243,10 +243,10 @@ internal static class SendChatPatch
             if (!isKick && !isBan && !isColorKick && !isColorBan)
             {
                 
-                __instance.freeChatField.textArea.SetText(converted);
-                Utils.ChatCommand(__instance, $"{converted}", "", false);
+                //__instance.freeChatField.textArea.SetText(converted);
+                //Utils.ChatCommand(__instance, $"{converted}", "", false);
                 Logger.Info($" {PlayerControl.LocalPlayer.Data.PlayerName}: {msgtext}", "SendChat");
-                return false;
+                return true;
             }
 
             string arg = text.Substring(isKick ? 6 : isBan ? 5 : isColorKick ? 7 : isColorBan ? 6 : 0).Trim();
diff --git a/Patches/OnGameStartedPatch.cs b/Patches/OnGameStartedPatch.cs
index 7d0adbc..7a6a0e9 100644
--- a/Patches/OnGameStartedPatch.cs
+++ b/Patches/OnGameStartedPatch.cs
@@ -38,6 +38,8 @@ class PlayerControlSetRolePatch
     {
         if (!FirstAssign || !AmongUsClient.Instance.AmHost) return true;
 
+        var oldRole = roleType;
+
         canOverrideRole = false;
 
         if (Main.GM.Value && __instance == PlayerControl.LocalPlayer)
@@ -57,6 +59,7 @@ class PlayerControlSetRolePatch
             {
                 roleType = RoleTypes.Crewmate;
             }
+            Logger.Info($" {__instance.Data.PlayerName} | {oldRole} -> {roleType}", "ChangedRoleBase");
         }
         if (CustomRoleManagement.PlayerRoles.TryGetValue(__instance.PlayerId, out var r) && r == "Jester" && Options.Gamemode.GetValue() < 2)
         {
@@ -69,6 +72,7 @@ class PlayerControlSetRolePatch
             {
                 roleType = RoleTypes.Crewmate;
             }
+            Logger.Info($" {__instance.Data.PlayerName} | {oldRole} -> {roleType}", "ChangedRoleBase");
         }
 
         if (Utils.isHideNSeek && i == 0)
diff --git a/README.md b/README.md
index 8fbaf1c..2e74b4b 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
 <img src="https://github.com/astra1dev/AUnlocker/assets/90265231/14226f03-a003-4efc-b27b-6df53fb394d6" width=410 height=240>****
 ‎ 
 
-# 🎮 Features (v1.7.0):
+# 🎮 Features (v1.7.1):
 ## <b> 🌟 Custom Roles:</b>
 - Mayor (Crewmate)
 - The mayor has extra votes and can call meetings by venting, depending on settings.