From b636d87afa37dbe1400455caa33844448535194f Mon Sep 17 00:00:00 2001 From: hydrant Date: Tue, 4 Aug 2020 21:07:42 +0200 Subject: [PATCH] evtl fix character --- ReallifeGamemode.Server/Extensions/ClientExtension.cs | 4 ++-- ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 6d2a7456..7dd2338e 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -47,12 +47,12 @@ namespace ReallifeGamemode.Server.Extensions { using (context = new DatabaseContext()) { - return context.Characters.FirstOrDefault(u => u.UserId == user.Id); + return context.Characters.FirstOrDefault(u => u.Id == user.CharacterId); } } else { - return context.Characters.FirstOrDefault(u => u.UserId == user.Id); + return context.Characters.FirstOrDefault(u => u.Id == user.CharacterId); } } diff --git a/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs b/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs index 09b7ace0..6eead2d1 100644 --- a/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs +++ b/ReallifeGamemode.Server/Shop/Clothing/ClotheShop.cs @@ -32,7 +32,14 @@ namespace ReallifeGamemode.Server.Shop.Clothing public void LoadShopNUI(Player client) { - bool gender = client.GetUser().GetCharacter().Gender; + User u = client.GetUser(); + + if (u == null) + { + return; + } + + bool gender = u.GetCharacter().Gender; List tops = clotheList.ToList().FindAll(c => c.Gender == gender && c.ComponentId == 11); List legs = clotheList.ToList().FindAll(c => c.Gender == gender && c.ComponentId == 4); List shoes = clotheList.ToList().FindAll(c => c.Gender == gender && c.ComponentId == 6);