From b8242010ad6fd7286a6d3341f8c23272e3bd05fb Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Sat, 27 Mar 2021 22:17:45 +1300 Subject: [PATCH] Fix bug where socials are always muted --- .../HorseIsleServer/Game/Events/RealTimeRiddle.cs | 5 +---- Horse Isle Server/HorseIsleServer/Server/GameServer.cs | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs b/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs index 4231549..6bb64bf 100644 --- a/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Events/RealTimeRiddle.cs @@ -1,11 +1,7 @@ using HISP.Player; using HISP.Server; -using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; -using System.Threading.Tasks; namespace HISP.Game.Events { @@ -62,6 +58,7 @@ namespace HISP.Game.Events if (Database.HasPlayerCompletedRealTimeRiddle(RiddleId, winner.Id)) return; + Database.CompleteRealTimeRiddle(RiddleId, winner.Id); winner.TrackedItems.GetTrackedItem(Tracking.TrackableItem.RiddleWin).Count++; diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs index 7c1ee53..76fbd83 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs @@ -582,7 +582,7 @@ namespace HISP.Server if (sender.LoggedinUser.SocializingWith != null) { - if (!sender.LoggedinUser.SocializingWith.MuteAll && !sender.LoggedinUser.SocializingWith.MuteSocials) + if (sender.LoggedinUser.SocializingWith.MuteAll || sender.LoggedinUser.SocializingWith.MuteSocials) { byte[] cantSocialize = PacketBuilder.CreateChat(Messages.PlayerIgnoringAllSocials, PacketBuilder.CHAT_BOTTOM_RIGHT); sender.SendPacket(cantSocialize);