From 5ba29aa7ef8f75f842ff1ca581f0925a502b2db5 Mon Sep 17 00:00:00 2001
From: goat <16760685+goaaats@users.noreply.github.com>
Date: Tue, 8 Dec 2020 17:38:57 +0100
Subject: [PATCH] fix: don't actually call OnChatMessage when isHandled from
 OnCheckMessageHandled

---
 Dalamud/Game/Internal/Gui/ChatGui.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dalamud/Game/Internal/Gui/ChatGui.cs b/Dalamud/Game/Internal/Gui/ChatGui.cs
index 2a933b232..b55c4a040 100644
--- a/Dalamud/Game/Internal/Gui/ChatGui.cs
+++ b/Dalamud/Game/Internal/Gui/ChatGui.cs
@@ -129,8 +129,10 @@ namespace Dalamud.Game.Internal.Gui {
                 var isHandled = false;
                 OnCheckMessageHandled?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
 
-                OnChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
-                OnChatMessageRaw?.Invoke(chattype, senderid, ref sender, ref message, ref isHandled);
+                if (!isHandled) {
+                    OnChatMessage?.Invoke(chattype, senderid, ref parsedSender, ref parsedMessage, ref isHandled);
+                    OnChatMessageRaw?.Invoke(chattype, senderid, ref sender, ref message, ref isHandled);
+                }
 
                 var newEdited = parsedMessage.Encode();