PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge remote-tracking branch 'origin/master' into Patron

Browse Source
This commit is contained in:
Brant Martin
2019-03-03 13:01:46 -05:00
parent 0a5a70f583 f16e825b57
commit deb0b202bf
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Torch/Managers/ChatManager/ChatManagerServer.cs
View File

@@ -25,7 +25,7 @@ namespace Torch.Managers.ChatManager
internal static class ChatInterceptPatch internal static class ChatInterceptPatch
{ {
private static ChatManagerServer _chatManager; private static ChatManagerServer _chatManager;
private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.Managers.GetManager<ChatManagerServer>()); private static ChatManagerServer ChatManager => _chatManager ?? (_chatManager = TorchBase.Instance.CurrentSession.Managers.GetManager<ChatManagerServer>());
internal static void Patch(PatchContext context) internal static void Patch(PatchContext context)
{ {
@@ -37,7 +37,7 @@ namespace Torch.Managers.ChatManager
private static bool PrefixMessageProcessing(ref ChatMsg msg) private static bool PrefixMessageProcessing(ref ChatMsg msg)
{ {
var consumed = false; var consumed = false;
ChatManager?.RaiseMessageRecieved(msg, ref consumed); ChatManager.RaiseMessageRecieved(msg, ref consumed);
return !consumed; return !consumed;
} }
} }
@@ -115,22 +115,6 @@ namespace Torch.Managers.ChatManager
MyMultiplayerBase.SendScriptedChatMessage(ref scripted); MyMultiplayerBase.SendScriptedChatMessage(ref scripted);
} }
/// <inheritdoc/>
public override void Attach()
{
base.Attach();
if (MyMultiplayer.Static != null)
{
MyMultiplayer.Static.ChatMessageReceived += MpStaticChatMessageReceived;
}
else
{
_log.Debug("Using offline message processor");
}
}
/// <inheritdoc /> /// <inheritdoc />
protected override bool OfflineMessageProcessor(TorchChatMessage msg) protected override bool OfflineMessageProcessor(TorchChatMessage msg)
{ {
@@ -141,24 +125,6 @@ namespace Torch.Managers.ChatManager
return consumed; 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);
}
/// <inheritdoc/>
public override void Detach()
{
if (MyMultiplayer.Static != null)
MyMultiplayer.Static.ChatMessageReceived -= MpStaticChatMessageReceived;
base.Detach();
}
internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed) internal void RaiseMessageRecieved(ChatMsg message, ref bool consumed)
{ {
var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId); var torchMsg = new TorchChatMessage(GetMemberName(message.Author), message.Author, message.Text, (ChatChannel)message.Channel, message.TargetId);