From 41808730812fc845648722d807585b9556f13c1b Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Sun, 10 Mar 2019 13:01:34 +0100
Subject: [PATCH] Faction is not null on Client.GetUser() anymore

---
 .../Extensions/ClientExtension.cs                   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index 4d9e9409..75dfc84b 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -1,4 +1,5 @@
 using GTANetworkAPI;
+using Microsoft.EntityFrameworkCore;
 using ReallifeGamemode.Server.Entities;
 using ReallifeGamemode.Server.Models;
 using System;
@@ -28,12 +29,20 @@ namespace ReallifeGamemode.Server.Extensions
             {
                 using (context = new DatabaseContext())
                 {
-                    return context.Users.FirstOrDefault(u => u.Name == client.Name);
+                    return context
+                        .Users
+                        .Include(u => u.Faction)
+                        .Include(u => u.FactionRank)
+                        .FirstOrDefault(u => u.Name == client.Name);
                 }
             }
             else
             {
-                return context.Users.FirstOrDefault(u => u.Name == client.Name);
+                return context
+                    .Users
+                    .Include(u => u.Faction)
+                    .Include(u => u.FactionRank)
+                    .FirstOrDefault(u => u.Name == client.Name);
             }
         }