From 6b5f8e6bed3f6c112f3297f11c06283a15b2daf9 Mon Sep 17 00:00:00 2001 From: goat Date: Sat, 2 Nov 2019 14:35:48 +0900 Subject: [PATCH] Don't try to do italics on messages with SE opcodes --- Dalamud.Injector/Program.cs | 2 +- Dalamud/Game/ChatHandlers.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dalamud.Injector/Program.cs b/Dalamud.Injector/Program.cs index dfa91a07f..75c0a8a75 100644 --- a/Dalamud.Injector/Program.cs +++ b/Dalamud.Injector/Program.cs @@ -19,7 +19,7 @@ namespace Dalamud.Injector { Process.GetCurrentProcess().Kill(); }; - int pid = int.Parse(args[0]); + var pid = int.Parse(args[0]); Process process = null; diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs index 158527216..4005107a4 100644 --- a/Dalamud/Game/ChatHandlers.cs +++ b/Dalamud/Game/ChatHandlers.cs @@ -92,8 +92,8 @@ namespace Dalamud.Game { .GetResult()); - if (this.HandledChatTypeColors.ContainsKey(type) || type == XivChatType.Say || type == XivChatType.Shout || - type == XivChatType.Alliance || type == XivChatType.TellOutgoing || type == XivChatType.Yell) { + if ((this.HandledChatTypeColors.ContainsKey(type) || type == XivChatType.Say || type == XivChatType.Shout || + type == XivChatType.Alliance || type == XivChatType.TellOutgoing || type == XivChatType.Yell) && !message.Contains((char)0x02)) { var italicsStart = message.IndexOf("*"); var italicsEnd = message.IndexOf("*", italicsStart + 1);