From da205c3cd35516114afc67237253e523e387873e Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Wed, 23 Dec 2020 02:56:30 +1300 Subject: [PATCH] Implement Client.MuteAll --- .../Horse Isle Server/Game/Chat/Chat.cs | 17 ++++++++++------- .../Horse Isle Server/Game/Messages.cs | 4 ++-- .../Horse Isle Server/Server/GameDataJson.cs | 2 +- .../Horse Isle Server/Server/GameServer.cs | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Horse Isle Server/Horse Isle Server/Game/Chat/Chat.cs b/Horse Isle Server/Horse Isle Server/Game/Chat/Chat.cs index e940ea3..a482112 100644 --- a/Horse Isle Server/Horse Isle Server/Game/Chat/Chat.cs +++ b/Horse Isle Server/Horse Isle Server/Game/Chat/Chat.cs @@ -152,7 +152,7 @@ namespace HISP.Game.Chat foreach (GameClient client in GameServer.ConnectedClients) { if (client.LoggedIn) - if (!client.LoggedinUser.MuteGlobal) + if (!client.LoggedinUser.MuteGlobal && !client.LoggedinUser.MuteAll) if (client.LoggedinUser.Id != user.Id) recipiants.Add(client); } @@ -165,7 +165,7 @@ namespace HISP.Game.Chat foreach (GameClient client in GameServer.ConnectedClients) { if (client.LoggedIn) - if (!client.LoggedinUser.MuteAds) + if (!client.LoggedinUser.MuteAds && !client.LoggedinUser.MuteAll) if (client.LoggedinUser.Id != user.Id) recipiants.Add(client); } @@ -178,7 +178,7 @@ namespace HISP.Game.Chat foreach (GameClient client in GameServer.ConnectedClients) { if (client.LoggedIn) - if (!client.LoggedinUser.MuteBuddy) + if (!client.LoggedinUser.MuteBuddy && !client.LoggedinUser.MuteAll) if (client.LoggedinUser.Id != user.Id) if (client.LoggedinUser.Friends.List.Contains(user.Id)) recipiants.Add(client); @@ -195,7 +195,8 @@ namespace HISP.Game.Chat foreach (User userInIsle in usersInSile) { if (user.Id != userInIsle.Id) - recipiants.Add(userInIsle.LoggedinClient); + if(!user.MuteAll) + recipiants.Add(userInIsle.LoggedinClient); } return recipiants.ToArray(); } @@ -213,7 +214,8 @@ namespace HISP.Game.Chat foreach (User userHere in usersHere) { if (user.Id != userHere.Id) - recipiants.Add(userHere.LoggedinClient); + if (!user.MuteAll) + recipiants.Add(userHere.LoggedinClient); } return recipiants.ToArray(); } @@ -225,7 +227,8 @@ namespace HISP.Game.Chat foreach (User nearbyUser in nearbyUsers) { if (user.Id != nearbyUser.Id) - recipiants.Add(nearbyUser.LoggedinClient); + if (!user.MuteAll) + recipiants.Add(nearbyUser.LoggedinClient); } return recipiants.ToArray(); } @@ -277,7 +280,7 @@ namespace HISP.Game.Chat foreach (GameClient client in GameServer.ConnectedClients) { if (client.LoggedIn) - if (!client.LoggedinUser.MutePrivateMessage) + if (!client.LoggedinUser.MutePrivateMessage && !client.LoggedinUser.MuteAll) if (client.LoggedinUser.Username == to) recipiants.Add(client); } diff --git a/Horse Isle Server/Horse Isle Server/Game/Messages.cs b/Horse Isle Server/Horse Isle Server/Game/Messages.cs index 263b1e5..a6f94f2 100644 --- a/Horse Isle Server/Horse Isle Server/Game/Messages.cs +++ b/Horse Isle Server/Horse Isle Server/Game/Messages.cs @@ -48,7 +48,7 @@ namespace HISP.Game public static string WelcomeFormat; public static string MotdFormat; public static string IdleWarningFormat; - public static string LoginMessageForamt; + public static string LoginMessageFormat; public static string LogoutMessageFormat; // Records @@ -519,7 +519,7 @@ namespace HISP.Game public static string FormatLoginMessage(string username) { - return LoginMessageForamt.Replace("%USERNAME%", username); + return LoginMessageFormat.Replace("%USERNAME%", username); } public static string FormatLogoutMessage(string username) diff --git a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs b/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs index 9de8646..4de13c0 100644 --- a/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs +++ b/Horse Isle Server/Horse Isle Server/Server/GameDataJson.cs @@ -389,7 +389,7 @@ namespace HISP.Server Messages.WelcomeFormat = gameData.messages.welcome_format; Messages.MotdFormat = gameData.messages.motd_format; Messages.ProfileSavedMessage = gameData.messages.profile_save; - Messages.LoginMessageForamt = gameData.messages.login_format; + Messages.LoginMessageFormat = gameData.messages.login_format; Messages.LogoutMessageFormat = gameData.messages.logout_format; // Stats diff --git a/Horse Isle Server/Horse Isle Server/Server/GameServer.cs b/Horse Isle Server/Horse Isle Server/Server/GameServer.cs index 756f083..5044d4b 100644 --- a/Horse Isle Server/Horse Isle Server/Server/GameServer.cs +++ b/Horse Isle Server/Horse Isle Server/Server/GameServer.cs @@ -1359,7 +1359,7 @@ namespace HISP.Server byte[] loginMessageBytes = PacketBuilder.CreateChat(Messages.FormatLoginMessage(sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_LEFT); foreach (GameClient client in ConnectedClients) if (client.LoggedIn) - if (!client.LoggedinUser.MuteLogins) + if (!client.LoggedinUser.MuteLogins || client.LoggedinUser.MuteAll) if (client.LoggedinUser.Id != userId) client.SendPacket(loginMessageBytes);