IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-07 21:55:42 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix server crash on wink

Browse source
This commit is contained in:
Bluzume 2021-11-06 03:03:39 -04:00
parent f7930fd4d3
commit 4d85001657
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
HorseIsleServer/HorseIsleServer/Server/GameServer.cs
View file

@ -605,7 +605,8 @@ namespace HISP.Server
sender.SendPacket(cantSocialize); sender.SendPacket(cantSocialize);
break; break;
} }
else if (sender.LoggedinUser.SocializingWith.MutePlayer.IsUserMuted(sender.LoggedinUser))
if (sender.LoggedinUser.SocializingWith.MutePlayer.IsUserMuted(sender.LoggedinUser))
{ {
byte[] cantSocialize = PacketBuilder.CreateChat(Messages.PlayerIgnoringYourSocials, PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] cantSocialize = PacketBuilder.CreateChat(Messages.PlayerIgnoringYourSocials, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(cantSocialize); sender.SendPacket(cantSocialize);
@ -621,23 +622,26 @@ namespace HISP.Server
} }
foreach (User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true)) if(social.ForEveryone != null)
{ {
if (social.BaseSocialType.Type != "GROUP") foreach (User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true))
if (user.Id == sender.LoggedinUser.SocializingWith.Id) {
if (social.BaseSocialType.Type != "GROUP")
if (user.Id == sender.LoggedinUser.SocializingWith.Id)
continue;
if (user.Id == sender.LoggedinUser.Id)
continue; continue;
if (user.Id == sender.LoggedinUser.Id) if (user.MuteAll || user.MuteSocials)
continue; continue;
string socialTarget = "";
if(sender.LoggedinUser.SocializingWith != null)
socialTarget = sender.LoggedinUser.SocializingWith.Username;
byte[] msgEveryone = PacketBuilder.CreateChat(Messages.FormatSocialMessage(social.ForEveryone, socialTarget, sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
user.LoggedinClient.SendPacket(msgEveryone);
}
if (user.MuteAll || user.MuteSocials)
continue;
string socialTarget = "";
if(sender.LoggedinUser.SocializingWith != null)
socialTarget = sender.LoggedinUser.SocializingWith.Username;
byte[] msgEveryone = PacketBuilder.CreateChat(Messages.FormatSocialMessage(social.ForEveryone, socialTarget, sender.LoggedinUser.Username), PacketBuilder.CHAT_BOTTOM_RIGHT);
user.LoggedinClient.SendPacket(msgEveryone);
} }
if(social.ForTarget != null) if(social.ForTarget != null)
{ {
@ -662,10 +666,11 @@ namespace HISP.Server
} }
foreach(User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true)) if (social.SoundEffect != null)
{ {
if (social.SoundEffect != null) foreach (User user in GetUsersAt(sender.LoggedinUser.X, sender.LoggedinUser.Y, true, true))
{ {
if (user.MuteAll || user.MuteSocials) if (user.MuteAll || user.MuteSocials)
continue; continue;