diff --git a/Torch/Managers/ChatManager/ChatManagerServer.cs b/Torch/Managers/ChatManager/ChatManagerServer.cs index e58a840..a045095 100644 --- a/Torch/Managers/ChatManager/ChatManagerServer.cs +++ b/Torch/Managers/ChatManager/ChatManagerServer.cs @@ -25,7 +25,7 @@ namespace Torch.Managers.ChatManager internal static class ChatInterceptPatch { private static ChatManagerServer _chatManager; - private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.Managers.GetManager()); + private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.CurrentSession.Managers.GetManager()); internal static void Patch(PatchContext context) { @@ -37,7 +37,7 @@ namespace Torch.Managers.ChatManager private static bool PrefixMessageProcessing(ref ChatMsg msg) { var consumed = false; - ChatManager?.RaiseMessageRecieved(msg, ref consumed); + ChatManager.RaiseMessageRecieved(msg, ref consumed); return !consumed; } } @@ -115,22 +115,6 @@ namespace Torch.Managers.ChatManager MyMultiplayerBase.SendScriptedChatMessage(ref scripted); } - - /// - public override void Attach() - { - base.Attach(); - - if (MyMultiplayer.Static != null) - { - MyMultiplayer.Static.ChatMessageReceived += MpStaticChatMessageReceived; - } - else - { - _log.Debug("Using offline message processor"); - } - } - /// protected override bool OfflineMessageProcessor(TorchChatMessage msg) { @@ -141,24 +125,6 @@ namespace Torch.Managers.ChatManager return consumed; } - private void MpStaticChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName) - { - var tmp = false; - RaiseMessageRecieved(new ChatMsg - { - Author = steamUserId, - Text = messageText - }, ref tmp); - } - - /// - public override void Detach() - { - if (MyMultiplayer.Static != null) - MyMultiplayer.Static.ChatMessageReceived -= MpStaticChatMessageReceived; - base.Detach(); - } - internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed) { var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId);