Merge pull request #49 from D1GQ/dev

v1.3.0 hotfix 3

Helpers/Utils.cs

@@ -155,7 +155,6 @@ internal static class Utils
             }
 
             SoundManager.Instance.PlaySound(chat.messageSound, false, 1f, null).pitch = 0.5f + data.PlayerId / 15f;
-            ChatPatch.ChatControllerPatch.SetChatPoolTheme(pooledBubble);
         }
         catch
         {
@@ -370,7 +369,7 @@ internal static class Utils
     // Platform utilities
     internal static string GetPlatformName(PlayerControl player, bool useTag = false)
     {
-        if (player?.GetClient() == null) return string.Empty;
+        if (player?.GetClient()?.PlatformData == null) return string.Empty;
         return GetPlatformName(player.GetClient().PlatformData.Platform, useTag);
     }
 

ModInfo.cs

@@ -4,7 +4,7 @@ internal static class ModInfo
 {
     internal static readonly ReleaseTypes ReleaseBuildType = ReleaseTypes.Release;
     internal const string BetaNum = "0";
-    internal const string HotfixNum = "2";
+    internal const string HotfixNum = "3";
     internal const bool IsHotFix = true;
     internal const string PluginName = "BetterAmongUs";
     internal const string PluginGuid = "com.d1gq.betteramongus";

Mono/PlayerInfoDisplay.cs

@@ -183,7 +183,7 @@ internal class PlayerInfoDisplay : MonoBehaviour
         string newText = Utils.FormatInfo(sb);
         if (newText != lastValue)
         {
-            textMesh.SetText(newText);
+            textMesh?.SetText(newText);
             lastValue = newText;
         }
     }

Patches/Gameplay/UI/Chat/ChatPatch.cs

@@ -124,8 +124,10 @@ internal static class ChatPatch
 
         [HarmonyPatch(nameof(ChatController.SetChatBubbleName))]
         [HarmonyPostfix]
-        private static void SetChatBubbleName_Postfix(ChatController __instance, ChatBubble bubble, NetworkedPlayerInfo playerInfo)
+        private static void SetChatBubbleName_Postfix(ChatController __instance, ChatBubble bubble, NetworkedPlayerInfo playerInfo, bool isDead, bool didVote)
         {
+            if (didVote) return;
+
             StringBuilder sbTag = new();
             StringBuilder sbInfo = new();
 
@@ -196,21 +198,13 @@ internal static class ChatPatch
             }
 
             bubble.NameText.SetText(playerName);
-            SetChatPoolTheme(bubble);
         }
 
-        [HarmonyPatch(nameof(ChatController.AddChatNote))]
+        [HarmonyPatch(nameof(ChatController.GetPooledBubble))]
         [HarmonyPostfix]
-        private static void AddChatNote_Postfix(ChatController __instance)
+        private static void GetPooledBubble_Postfix(ChatController __instance, ChatBubble __result)
         {
-            SetChatPoolTheme();
-        }
-
-        [HarmonyPatch(nameof(ChatController.AddChatWarning))]
-        [HarmonyPostfix]
-        private static void AddChatWarning_Postfix(ChatController __instance)
-        {
-            SetChatPoolTheme();
+            SetChatPoolTheme(__result);
         }
 
         internal static void SetChatTheme()
@@ -245,9 +239,9 @@ internal static class ChatPatch
         }
 
         // Set chat theme
-        internal static ChatBubble SetChatPoolTheme(ChatBubble? asChatBubble = null)
+        internal static ChatBubble SetChatPoolTheme(ChatBubble asChatBubble)
         {
-            ChatBubble chatBubble = asChatBubble ?? HudManager.Instance.Chat.GetPooledBubble();
+            ChatBubble chatBubble = asChatBubble;
 
             if (BAUPlugin.ChatDarkMode.Value)
             {