Merge confligt resolve

Server/Commands/Admin.cs

@@ -25,6 +25,49 @@ namespace reallife_gamemode.Server.Commands
 {
     public class Admin : Script
     {
+        [Command("vmod", "~m~Benutzung: ~s~/vmod [Slot] [Mod ID]")]
+        public void CmdAdminVmod(Client player, int slot, int mod)
+        {
+            if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
+            {
+                ChatService.NotAuthorized(player);
+                return;
+            }
+
+            if (!player.IsInVehicle)
+            {
+                player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
+                return;
+            }
+
+            if (mod == -1) player.Vehicle.RemoveMod(slot);
+            else player.Vehicle.SetMod(slot, mod);
+        }
+
+        [Command("clothes", "~m~Benutzung: ~s~/clothes [Slot] [Component ID] (Textur)")]
+        public void CmdAdminClothes(Client player, int slot, int component, int texture = 0)
+        {
+            if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
+            {
+                ChatService.NotAuthorized(player);
+                return;
+            }
+
+            player.SetClothes(slot, component, texture);
+        }
+
+        [Command("props", "~m~Benutzung: ~s~/props [Slot] [Component ID] (Textur)")]
+        public void CmdAdminProps(Client player, int slot, int component, int texture = 0)
+        {
+            if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true)
+            {
+                ChatService.NotAuthorized(player);
+                return;
+            }
+
+            player.SetAccessories(slot, component, texture);
+        }
+
         [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]
         public void CmdAdminO(Client player, string message)
         {
@@ -325,7 +368,7 @@ namespace reallife_gamemode.Server.Commands
             player.SendChatMessage("Farb-ID1 " + color1 + ", Farb-ID2 " + color2 + "");
         }
 
-        [Command("aw", "~m~Benutzung: ~s~/aw [Spieler] [Nachricht]")]
+        [Command("aw", "~m~Benutzung: ~s~/aw [Spieler] [Nachricht]", GreedyArg = true)]
         public void CmdAdminMsg(Client player, string name, string msg)
         {
             if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -599,13 +642,9 @@ namespace reallife_gamemode.Server.Commands
                     if (player.IsInVehicle)
                     {
                         Vehicle vehicle = player.Vehicle;
-<<<<<<< HEAD
                         SaveManager.SaveVehicleData((VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
                             Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, vehicle.EngineStatus, Convert.ToByte(vehicle.Dimension));
-=======
+
-                        SaveData.SaveVehicleData((VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate,
-                            Convert.ToByte(vehicle.PrimaryColor), Convert.ToByte(vehicle.SecondaryColor), vehicle.Locked, Convert.ToByte(vehicle.Dimension));
->>>>>>> feature/client-player-keys
                     }
                     else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
                     break;
@@ -777,7 +816,7 @@ namespace reallife_gamemode.Server.Commands
             else player.SendChatMessage("~m~Du sitzt in keinem Fahrzeug!");
         }
 
-        [Command("a", "~m~Benutzung: ~s~/a [Nachricht]")]
+        [Command("a", "~m~Benutzung: ~s~/a [Nachricht]", GreedyArg = true)]
         public void CmdAdminA(Client player, string message)
         {
             if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
@@ -1095,6 +1134,25 @@ namespace reallife_gamemode.Server.Commands
         }
 
         //TODO TEST COMMAND
+        [Command("aspeed", "~m~Benutzung: ~s~/aspeed [Modifier]")]
+        public void CmdAdminAspeed(Client player, float modifier)
+        {
+            if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
+            {
+                ChatService.NotAuthorized(player);
+                return;
+            }
+
+            if (!player.IsInVehicle)
+            {
+                player.SendChatMessage("~r~[FEHLER]~s~ Du sitzt momentan nicht in einem Fahrzeug.");
+                return;
+            }
+
+            player.Vehicle.EnginePowerMultiplier = modifier;
+        }
+
+        //TEST COMMAND
         [Command("myvehicles")]
         public void CmdAdminMyVehicles(Client player)
         {