aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tuning weg bei /respawnvehicle

Browse Source
This commit is contained in:
hydrant
2020-08-02 21:16:35 +02:00
parent d7e679a81c
commit 746998a9d5
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ReallifeGamemode.Server/Commands/AdminCommands.cs
View File

@@ -1171,8 +1171,8 @@ namespace ReallifeGamemode.Server.Commands
} }
} }
[Command("respawnvehicle")] [Command("respawnvehicle", "~m~Benutzung: ~s~/respawnvehicle (Db ID)", Alias = "rveh")]
public void CmdAdminRespawnVehicle(Player player, int? id = null) public void CmdAdminRespawnVehicle(Player player, int id = -1)
{ {
if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true) if (!player.GetUser()?.IsAdmin(AdminLevel.ADMIN) ?? true)
{ {
@@ -1182,14 +1182,14 @@ namespace ReallifeGamemode.Server.Commands
Vehicle veh = null; Vehicle veh = null;
if (id == null) if (id == -1)
{ {
var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault(); var nearestVeh = NAPI.Pools.GetAllVehicles().Where(v => v.Position.DistanceTo(player.Position) <= 5).FirstOrDefault();
veh = nearestVeh; veh = nearestVeh;
} }
else else
{ {
veh = VehicleManager.GetVehicleFromId(id.Value); veh = VehicleManager.GetVehicleFromId(id);
} }
if (veh == null) if (veh == null)

4
ReallifeGamemode.Server/Extensions/ServerVehicleExtensions.cs
View File

@@ -1,4 +1,4 @@
using GTANetworkAPI; using GTANetworkAPI;
using ReallifeGamemode.Database.Entities; using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Server.Job; using ReallifeGamemode.Server.Job;
using ReallifeGamemode.Server.Managers; using ReallifeGamemode.Server.Managers;
@@ -74,6 +74,8 @@ namespace ReallifeGamemode.Server.Extensions
NAPI.Vehicle.SetVehicleNumberPlate(newVeh, numberplate); NAPI.Vehicle.SetVehicleNumberPlate(newVeh, numberplate);
veh.NumberPlate = numberplate; veh.NumberPlate = numberplate;
TuningManager.ApplyTuningToServerVehicle(veh);
return newVeh; return newVeh;
} }
} }

5
ReallifeGamemode.Server/Managers/VehicleManager.cs
View File

@@ -832,6 +832,11 @@ namespace ReallifeGamemode.Server.Managers
public static Vehicle GetVehicleFromServerVehicle(ServerVehicle serverVehicle) public static Vehicle GetVehicleFromServerVehicle(ServerVehicle serverVehicle)
{ {
if (serverVehicle == null)
{
return null;
}
if (!_serverVehicles.ContainsKey(serverVehicle.Id)) if (!_serverVehicles.ContainsKey(serverVehicle.Id))
{ {
return null; return null;