diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 4e4e9b7f..1440c805 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -618,6 +618,11 @@ namespace ReallifeGamemode.Server.Events { if (!player.IsLoggedIn()) return; var user = player.GetUser(); + if (user == null) + { + return; + } + if (user?.FactionId != null) { DutyPoint nearest = PositionManager.DutyPoints.Find(d => d.Position.DistanceTo(player.Position) <= 1.5); @@ -631,7 +636,8 @@ namespace ReallifeGamemode.Server.Events using (var context = new DatabaseContext()) { - List clothes = context.DutyClothes.ToList().FindAll(c => c.FactionId == user.FactionId && c.Gender == user.GetCharacter().Gender); + var gender = user.GetCharacter().Gender; + List clothes = context.DutyClothes.Where(c => c.FactionId == user.FactionId && c.Gender == gender).ToList(); foreach (var cloth in clothes) { if (cloth.SlotType == 1)