Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-23 04:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

move all logic from ChatSync to ChatManager

Browse source
This commit is contained in:
in0finite 2021-02-28 23:38:34 +01:00
parent e29bacf3d2
commit 26b51b99c9
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Assets/Scripts/Chat/ChatManager.cs
View file

@ -65,6 +65,10 @@ namespace SanAndreasUnity.Chat
internal void OnChatMessageReceivedOnServer(Player player, string msg) internal void OnChatMessageReceivedOnServer(Player player, string msg)
{ {
msg = ChatManager.ProcessChatMessage(msg, false);
if (string.IsNullOrEmpty(msg))
return;
if (!FilterWithPreprocessors(player, ref msg)) if (!FilterWithPreprocessors(player, ref msg))
return; return;
@ -73,6 +77,10 @@ namespace SanAndreasUnity.Chat
internal void OnChatMessageReceivedOnLocalPlayer(ChatMessage chatMsg) internal void OnChatMessageReceivedOnLocalPlayer(ChatMessage chatMsg)
{ {
chatMsg.msg = ChatManager.ProcessChatMessage(chatMsg.msg, true);
if (string.IsNullOrEmpty(chatMsg.msg))
return;
F.InvokeEventExceptionSafe(onChatMessage, chatMsg); F.InvokeEventExceptionSafe(onChatMessage, chatMsg);
} }

26
Assets/Scripts/Chat/ChatSync.cs
View file

@ -8,7 +8,6 @@ namespace SanAndreasUnity.Chat
public class ChatSync : NetworkBehaviour public class ChatSync : NetworkBehaviour
{ {
Player m_player; Player m_player;
@ -18,16 +17,9 @@ namespace SanAndreasUnity.Chat
} }
[Command] [Command]
void CmdChatMsg( string msg ) { void CmdChatMsg( string msg )
{
Player p = m_player; F.RunExceptionSafe(() => ChatManager.singleton.OnChatMessageReceivedOnServer(m_player, msg));
msg = ChatManager.ProcessChatMessage(msg, false);
if (string.IsNullOrEmpty(msg))
return;
F.RunExceptionSafe(() => ChatManager.singleton.OnChatMessageReceivedOnServer(p, msg));
} }
internal void SendChatMsgToServer( string msg ) internal void SendChatMsgToServer( string msg )
@ -36,18 +28,12 @@ namespace SanAndreasUnity.Chat
} }
[TargetRpc] [TargetRpc]
void TargetChatMsg( NetworkConnection conn, string msg, string sender ) { void TargetChatMsg( NetworkConnection conn, string msg, string sender )
{
if (!this.isLocalPlayer) { if (!this.isLocalPlayer)
return;
}
msg = ChatManager.ProcessChatMessage(msg, true);
if (string.IsNullOrEmpty(msg))
return; return;
F.RunExceptionSafe(() => ChatManager.singleton.OnChatMessageReceivedOnLocalPlayer(new ChatMessage (msg, sender))); F.RunExceptionSafe(() => ChatManager.singleton.OnChatMessageReceivedOnLocalPlayer(new ChatMessage (msg, sender)));
} }
internal void SendChatMsgToClient( NetworkConnection conn, string msg, string sender ) internal void SendChatMsgToClient( NetworkConnection conn, string msg, string sender )