Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop

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;

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)
@@ -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;
+    }
   }
 }

ReallifeGamemode.Server/Services/ChatService.cs

@@ -65,10 +65,10 @@ namespace ReallifeGamemode.Server.Services
             ChatService.SendMessage(c, message);
           }
         }
-        /*else if(user.IsAdmin(AdminLevel.ADMIN) && toAdmins)
+        else if (user.IsAdmin(AdminLevel.ADMIN) && toAdmins)
         {
           ChatService.SendMessage(c, message);
-        }*/
+        }
       }
     }