From 68302f4d6cf5d6a33ffd9ead37d3e2f2f80eec17 Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 4 Apr 2021 18:58:42 +0200 Subject: [PATCH] fix IsAdmin macht server kaputt --- ReallifeGamemode.Database/Entities/User.cs | 1 - .../Extensions/ClientExtension.cs | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ReallifeGamemode.Database/Entities/User.cs b/ReallifeGamemode.Database/Entities/User.cs index b64fa754..c4b76095 100644 --- a/ReallifeGamemode.Database/Entities/User.cs +++ b/ReallifeGamemode.Database/Entities/User.cs @@ -120,7 +120,6 @@ namespace ReallifeGamemode.Database.Entities public bool WeaponLicense { get; set; } = false; - public bool IsAdmin(AdminLevel level) => AdminLevel >= level; public int Points { get; set; } public int otheramount { get; set; } = 0; diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs index 6b04c579..97322445 100644 --- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs +++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs @@ -7,6 +7,7 @@ using Newtonsoft.Json; using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Models; using ReallifeGamemode.Server.Services; +using ReallifeGamemode.Server.Types; /** * @overview Life of German Reallife - Player Extension (PlayerExtension.cs) @@ -93,7 +94,7 @@ namespace ReallifeGamemode.Server.Extensions internal static T GetData(this User user, string key, T nullValue) { - if(user == null) + if (user == null) { return default; } @@ -107,7 +108,7 @@ namespace ReallifeGamemode.Server.Extensions internal static void SetData(this User user, string key, object value) { - if(user == null) + if (user == null) { return; } @@ -232,5 +233,14 @@ namespace ReallifeGamemode.Server.Extensions return dbContext.UserItems.Where(u => u.UserId == user.Id).ToList(); } } + + public static bool IsAdmin(this User user, AdminLevel adminLevel) + { + if(user == null) + { + return false; + } + return user.AdminLevel >= adminLevel; + } } }