From 3e4dd821945c7842a43d0958802838c782e97add Mon Sep 17 00:00:00 2001 From: hydrant Date: Sun, 9 May 2021 20:21:05 +0200 Subject: [PATCH] /save fvehicle fac1,fac2 preis --- ReallifeGamemode.Server/Commands/AdminCommands.cs | 11 ++++++++--- ReallifeGamemode.Server/Managers/SaveManager.cs | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 67064bf7..2708ce9f 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -2828,10 +2828,15 @@ namespace ReallifeGamemode.Server.Commands case "fvehicle": if (player.IsInVehicle) { - string fIdStr = (option1 + " " + option2).Trim(); int[] fIds = null; - string[] fIdStrs = fIdStr.Split(" "); + string[] fIdStrs = option1.Split(","); + + if (!int.TryParse(option2, out int buyPrice) || buyPrice < 0) + { + ChatService.ErrorMessage(player, "Der Kaufpreis ist ungültig oder negativ"); + return; + } try { @@ -2857,7 +2862,7 @@ namespace ReallifeGamemode.Server.Commands Vehicle vehicle = player.Vehicle; int playerSeat = player.VehicleSeat; vehicle = SaveManager.SaveFactionVehicleData(vehicle, (VehicleHash)vehicle.Model, vehicle.Position, vehicle.Heading, vehicle.NumberPlate, - vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, fIds, vehicle.Livery); + vehicle.PrimaryColor, vehicle.SecondaryColor, vehicle.Locked, vehicle.EngineStatus, fIds, vehicle.Livery, buyPrice); player.SendNotification("Fraktionsfahrzeug ~g~" + vehicle.DisplayName + "~s~ gespeichert.", true); player.SetIntoVehicle(vehicle, playerSeat); } diff --git a/ReallifeGamemode.Server/Managers/SaveManager.cs b/ReallifeGamemode.Server/Managers/SaveManager.cs index 7dc79981..87f397b7 100644 --- a/ReallifeGamemode.Server/Managers/SaveManager.cs +++ b/ReallifeGamemode.Server/Managers/SaveManager.cs @@ -158,7 +158,7 @@ namespace ReallifeGamemode.Server.Managers public static Vehicle SaveFactionVehicleData(Vehicle veh, VehicleHash vehicleModel, Vector3 vehiclePosition, float vehicleHeading, - string vehicleNumberPlate, int vehiclePrimaryColor, int vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, int[] factionId, int livery) + string vehicleNumberPlate, int vehiclePrimaryColor, int vehicleSecondaryColor, bool vehicleLocked, bool vehicleEngine, int[] factionId, int livery, int buyPrice) { using (var saveData = new DatabaseContext()) { @@ -175,7 +175,8 @@ namespace ReallifeGamemode.Server.Managers SecondaryColor = vehicleSecondaryColor, Locked = vehicleLocked, Active = true, - Livery = livery + Livery = livery, + BuyPrice = buyPrice }; saveData.FactionVehicles.Add(dataSet); saveData.SaveChanges();