From b9818c75a05051011f81dc8fdfbdace733c04867 Mon Sep 17 00:00:00 2001 From: goat <16760685+goaaats@users.noreply.github.com> Date: Sun, 26 Apr 2020 15:18:15 +0200 Subject: [PATCH] fix: restore ref IsHandled for the Chat hooks --- Dalamud/Game/ChatHandlers.cs | 2 +- Dalamud/Game/Internal/Gui/ChatGui.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dalamud/Game/ChatHandlers.cs b/Dalamud/Game/ChatHandlers.cs index 5a5d99c69..1aabc893a 100644 --- a/Dalamud/Game/ChatHandlers.cs +++ b/Dalamud/Game/ChatHandlers.cs @@ -122,7 +122,7 @@ namespace Dalamud.Game { public string LastLink { get; private set; } private void OnChatMessage(XivChatType type, uint senderId, ref StdString sender, - ref StdString message, bool isHandled) { + ref StdString message, ref bool isHandled) { if (type == XivChatType.Notice && !this.hasSeenLoadingMsg) { var assemblyVersion = Assembly.GetAssembly(typeof(ChatHandlers)).GetName().Version.ToString(); diff --git a/Dalamud/Game/Internal/Gui/ChatGui.cs b/Dalamud/Game/Internal/Gui/ChatGui.cs index 14e919251..d43bae8c8 100644 --- a/Dalamud/Game/Internal/Gui/ChatGui.cs +++ b/Dalamud/Game/Internal/Gui/ChatGui.cs @@ -15,8 +15,8 @@ namespace Dalamud.Game.Internal.Gui { #region Events - public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, bool isHandled); - public delegate void OnMessageRawDelegate(XivChatType type, uint senderId, ref StdString sender, ref StdString message, bool isHandled); + public delegate void OnMessageDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled); + public delegate void OnMessageRawDelegate(XivChatType type, uint senderId, ref StdString sender, ref StdString message, ref bool isHandled); public delegate void OnCheckMessageHandledDelegate(XivChatType type, uint senderId, ref SeString sender, ref SeString message, ref bool isHandled); /// @@ -130,8 +130,8 @@ 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, isHandled); - OnChatMessageRaw?.Invoke(chattype, senderid, ref sender, ref message, 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();