From 1cb158f7b0b7e58aede1cdc35e9bd80e4df78853 Mon Sep 17 00:00:00 2001 From: Bluzume <39113159+KuromeSan@users.noreply.github.com> Date: Sat, 6 Nov 2021 22:01:21 -0400 Subject: [PATCH] Fix ability to DM every user --- HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs | 10 +++++++++- HorseIsleServer/HorseIsleServer/Server/GameServer.cs | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs b/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs index 37a5003..b161eed 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Chat/Chat.cs @@ -439,15 +439,23 @@ namespace HISP.Game.Chat if(channel == ChatChannel.Dm) { - if (to != null) + if (to != null && to != "") { List recipiants = new List(); foreach (GameClient client in GameClient.ConnectedClients) { if (client.LoggedIn) + { if (!client.LoggedinUser.MutePrivateMessage && !client.LoggedinUser.MuteAll) + { if (client.LoggedinUser.Username.ToLower().StartsWith(to.ToLower())) + { recipiants.Add(client); + break; + } + + } + } } return recipiants.ToArray(); } diff --git a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs index a452665..34fdc30 100644 --- a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs +++ b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs @@ -7553,11 +7553,13 @@ namespace HISP.Server List usersNearby = new List(); foreach (GameClient client in GameClient.ConnectedClients) + { if (client.LoggedIn) { if (startX <= client.LoggedinUser.X && endX >= client.LoggedinUser.X && startY <= client.LoggedinUser.Y && endY >= client.LoggedinUser.Y) usersNearby.Add(client.LoggedinUser); } + } return usersNearby.ToArray(); } @@ -7602,6 +7604,7 @@ namespace HISP.Server List usersNearby = new List(); foreach (GameClient client in GameClient.ConnectedClients) + { if (client.LoggedIn) { if (!includeStealth && client.LoggedinUser.Stealth) @@ -7611,6 +7614,7 @@ namespace HISP.Server if (startX <= client.LoggedinUser.X && endX >= client.LoggedinUser.X && startY <= client.LoggedinUser.Y && endY >= client.LoggedinUser.Y) usersNearby.Add(client.LoggedinUser); } + } return usersNearby.ToArray(); }