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

Server/Commands/Admin.cs

@@ -90,13 +90,10 @@ namespace reallife_gamemode.Server.Commands
 
             player.SendChatMessage("Online Teammitglieder:");
 
-            List<Client> playerlist = NAPI.Pools.GetAllPlayers();
+            List<Client> playerlist = NAPI.Pools.GetAllPlayers().FindAll(c => c.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? false).OrderByDescending(c => c.GetUser().AdminLevel).ToList();
             foreach (Client currentPlayer in playerlist)
             {
-                if (currentPlayer.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? false)
-                {
-                    player.SendChatMessage(currentPlayer.Name);
-                }
+                player.SendChatMessage(currentPlayer.GetUser().AdminLevel.GetName() + " | " + currentPlayer.Name);
             }
         }
 
@@ -842,7 +839,8 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            uint uHash = NAPI.Util.GetHashKey(hash);
+            if(!uint.TryParse(hash, out uint uHash))
+                uHash = NAPI.Util.GetHashKey(hash);
 
             if(!VehicleManager.IsValidHash(uHash))
             {
@@ -873,8 +871,8 @@ namespace reallife_gamemode.Server.Commands
             player.Vehicle.Repair();
         }
 
-        [Command("vdestroy")]
-        public void CmdAdminVdestroy(Client player)
+        [Command("vdestroy", "~m~Benutzung: ~s~/vdestroy (ID)")]
+        public void CmdAdminVdestroy(Client player, int vid = -1)
         {
             if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN3) ?? true)
             {
@@ -882,22 +880,35 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
-            if (!player.IsInVehicle)
+            Vehicle targetVeh;
+
+            if (vid == -1)
             {
-                player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
-                return;
+                if (!player.IsInVehicle)
+                {
+                    player.SendChatMessage("~m~Benutzung: ~s~/vdestroy (ID)");
+                    return;
+                }
+                targetVeh = player.Vehicle;
+            }
+            else
+            {
+                targetVeh = VehicleManager.GetVehicleFromId(vid);
+                if(targetVeh == null)
+                {
+                    player.SendChatMessage("~r~[FEHLER]~s~ Dieses Fahrzeug existiert nicht.");
+                    return;
+                }
             }
 
-            Vehicle playerVeh = player.Vehicle;
-
-            ServerVehicle veh = VehicleManager.GetServerVehicleFromVehicle(playerVeh);
+            ServerVehicle veh = VehicleManager.GetServerVehicleFromVehicle(targetVeh);
             if(veh != null)
             {
                 player.SendChatMessage("~r~[FEHLER]~s~ Dieses Fahrzeug wird von einem Server-System benutzt: ~m~" + veh.GetType().Name);
                 return;
             }
 
-            VehicleManager.DeleteVehicle(playerVeh);
+            VehicleManager.DeleteVehicle(targetVeh);
         }
 
         [Command("vlivery", "~m~Benutzung: ~s~/vlivery [Livery]")]
@@ -1297,7 +1308,7 @@ namespace reallife_gamemode.Server.Commands
         }
 
         [Command("time", "~m~Benutzung: ~s~/time [Stunde] (Minuten) (Sekunden)")]
-        public void CmdAdminSetTime(Client player, int hour, int min = 0, int sec = 0)
+        public void CmdAdminTime(Client player, int hour, int min = 0, int sec = 0)
         {
             if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
             {
@@ -1305,8 +1316,22 @@ namespace reallife_gamemode.Server.Commands
                 return;
             }
 
+            if(hour > 23 || min > 59 || sec > 59)
+            {
+                player.SendChatMessage("~r~[FEHLER]~s~ Es wurde eine ungültige Zeit eingegeben.");
+                return;
+            }
+
+            if(hour == -1)
+            {
+                player.SendChatMessage("Es wird nun wieder die Echtzeit genutzt.");
+                TimeManager.StartTimeManager();
+                return;
+            }
+
             string broadcastMsg = $"Serverzeit wurde auf {hour:D2}:{min:D2}:{sec:D2} gesetzt!";
             NAPI.Notification.SendNotificationToAll(broadcastMsg);
+            TimeManager.PauseTimeManager();
             NAPI.World.SetTime(hour, min, sec);
             return;
 
@@ -2034,6 +2059,18 @@ namespace reallife_gamemode.Server.Commands
             BankManager.SetMoney(player, business, amount, "Admin");
         }
 
+        [Command("showtuningmenu", "~m~Benutzung: ~s~/showtuningmenu")]
+        public void CmdAdminShowtuningmenu(Client player)
+        {
+            if (!player.GetUser()?.IsAdmin(AdminLevel.HEADADMIN) ?? true)
+            {
+                ChatService.NotAuthorized(player);
+                return;
+            }
+
+            player.TriggerEvent("showTuningMenu");
+        }
+
         #endregion
 
         #region ALevel1338