From d6b5b59759e90c87014b5971c4378de7500296a1 Mon Sep 17 00:00:00 2001
From: hydrant <lennart@kampshoff.xyz>
Date: Sun, 15 Sep 2019 20:16:47 +0200
Subject: [PATCH] fix bugs

---
 ReallifeGamemode.Server/Events/Login.cs      |  5 +--
 ReallifeGamemode.Server/Util/GlobalHelper.cs | 35 --------------------
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index 837525a9..b395aca4 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -1,6 +1,7 @@
 using System.Linq;
 using GTANetworkAPI;
 using Microsoft.EntityFrameworkCore;
+using ReallifeGamemode.Server.Extensions;
 using ReallifeGamemode.Server.Managers;
 using ReallifeGamemode.Server.Models;
 using ReallifeGamemode.Server.Services;
@@ -70,10 +71,10 @@ namespace ReallifeGamemode.Server.Events
 
             if (GlobalHelper.CustomJoinMessages.ContainsKey(player.SocialClubName))
             {
-              ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " (" + GlobalHelper.AdminLevelToString(user.AdminLevel) + ") [ID: " + player.Handle.Value + "]", AdminLevel.TEAM);
+              ChatService.BroadcastAdmin("!{#FFFF00}*** " + GlobalHelper.CustomJoinMessages[player.SocialClubName] + " (" + user.AdminLevel.GetName() + ") [ID: " + player.Handle.Value + "]", AdminLevel.TEAM);
             } else if (user.IsAdmin(AdminLevel.TEAM))
             {
-              ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name +"(ID: " + player.Handle.Value + ")" + " hat sich als " + GlobalHelper.AdminLevelToString(user.AdminLevel) + " eingeloggt!", AdminLevel.TEAM);
+              ChatService.BroadcastAdmin("!{#FFFF00}*** " + user.Name +"(ID: " + player.Handle.Value + ")" + " hat sich als " + user.AdminLevel.GetName() + " eingeloggt!", AdminLevel.TEAM);
             }
 
             var userItems = dbContext.UserItems.Where(u => u.UserId == user.Id).ToList();
diff --git a/ReallifeGamemode.Server/Util/GlobalHelper.cs b/ReallifeGamemode.Server/Util/GlobalHelper.cs
index 5e6c7efd..d4ef0c91 100644
--- a/ReallifeGamemode.Server/Util/GlobalHelper.cs
+++ b/ReallifeGamemode.Server/Util/GlobalHelper.cs
@@ -18,40 +18,5 @@ namespace ReallifeGamemode.Server.Util
         { "Roachkook", "Niemand, nicht einmal deine Mutter möchte so etwas sehen. (Siga)" },
         { "Paaqo1337", "Picasso is back!" }
       };
-
-    public static string AdminLevelToString(AdminLevel lvl)
-    {
-      string ret = "";
-
-      if (lvl == AdminLevel.TEAM)
-      {
-        ret = "Teammitglied";
-      }
-      else if (lvl == AdminLevel.SUPPORTER)
-      {
-        ret = "Supporter";
-      }
-      else if (lvl == AdminLevel.ADMIN)
-      {
-        ret = "Admin 1";
-      }
-      else if (lvl == AdminLevel.ADMIN2)
-      {
-        ret = "Admin 2";
-      }
-      else if (lvl == AdminLevel.ADMIN3)
-      {
-        ret = "Admin 3";
-      }
-      else if (lvl == AdminLevel.HEADADMIN)
-      {
-        ret = "Admin 1337";
-      }
-      else if (lvl == AdminLevel.PROJEKTLEITUNG)
-      {
-        ret = "Admin 1338";
-      }
-      return ret;
-    }
   }
 }