diff --git a/HorseIsleServer/HorseIsleServer/Game/Events/RealTimeQuiz.cs b/HorseIsleServer/HorseIsleServer/Game/Events/RealTimeQuiz.cs index 6a1fb65..15cd3e4 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Events/RealTimeQuiz.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Events/RealTimeQuiz.cs @@ -209,7 +209,10 @@ namespace HISP.Game.Events { foreach(Participent participent in Participents) { - + + if (participent == null) + continue; + if (participent.Quit) continue; diff --git a/HorseIsleServer/HorseIsleServer/Game/Services/Trainer.cs b/HorseIsleServer/HorseIsleServer/Game/Services/Trainer.cs index c4aa7b8..18a67e6 100644 --- a/HorseIsleServer/HorseIsleServer/Game/Services/Trainer.cs +++ b/HorseIsleServer/HorseIsleServer/Game/Services/Trainer.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; - -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; namespace HISP.Game.Services { diff --git a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs index 6d6ed28..71f45e7 100644 --- a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs +++ b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs @@ -108,6 +108,7 @@ namespace HISP.Server kickTimer.Dispose(); // Call OnDisconnect + connectedClients.Remove(this); GameServer.OnDisconnect(this); LoggedIn = false; diff --git a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs index ca70644..de68a92 100644 --- a/HorseIsleServer/HorseIsleServer/Server/GameServer.cs +++ b/HorseIsleServer/HorseIsleServer/Server/GameServer.cs @@ -1424,7 +1424,7 @@ namespace HISP.Server break; } trainHorseInst.BasicStats.Experience += trainer.ExperienceGained; - if (sender.LoggedinUser.Subscribed) + if (!sender.LoggedinUser.Subscribed) trainHorseInst.TrainTimer = 1440; else trainHorseInst.TrainTimer = 720;