From d5895d864db4e78808bc640c93990eba2d226ea2 Mon Sep 17 00:00:00 2001 From: Mac_Slash Date: Mon, 4 May 2020 23:29:28 +0200 Subject: [PATCH] VehicleDeath Debug --- ReallifeGamemode.Server/Events/Death.cs | 4 ++-- ReallifeGamemode.Server/Events/Key.cs | 4 ++-- ReallifeGamemode.Server/Managers/VehicleManager.cs | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index 6484511a..e079e2b0 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -126,8 +126,8 @@ namespace ReallifeGamemode.Server.Events {*/ if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) { - ChatService.SendMessage(player, "Debug4"); - player.Vehicle.ResetData("timerJobVehicleRespawn"); + ChatService.SendMessage(player, "Debug4"); + player.Vehicle.ResetData("timerJobVehicleRespawn"); ServerVehicle sVeh = Managers.VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); ServerVehicleExtensions.Spawn(sVeh, player.Vehicle); } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 89195185..7d1ab498 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -578,7 +578,7 @@ namespace ReallifeGamemode.Server.Events { player.SendChatMessage(""); }*/ - if (jV.JobId == 3 && player.GetUser().JobId == 3) + if (jV.JobId == 3 && player.GetUser().JobId == 3 && jV.GetJob().GetUsersInJob().Contains(player)) { Job.PilotJob c = new Job.PilotJob(); if ((VehicleHash)jV.Model == VehicleHash.Cuban800 && !state) @@ -606,7 +606,7 @@ namespace ReallifeGamemode.Server.Events } } } - if (jV.JobId == 4 && player.GetUser().JobId == 4) + if (jV.JobId == 4 && player.GetUser().JobId == 4 && jV.GetJob().GetUsersInJob().Contains(player)) { Job.BusDriverJob c = new Job.BusDriverJob(); if ((VehicleHash)jV.Model == VehicleHash.Bus && !state) diff --git a/ReallifeGamemode.Server/Managers/VehicleManager.cs b/ReallifeGamemode.Server/Managers/VehicleManager.cs index 3a1041d8..850eb9ca 100644 --- a/ReallifeGamemode.Server/Managers/VehicleManager.cs +++ b/ReallifeGamemode.Server/Managers/VehicleManager.cs @@ -868,16 +868,19 @@ namespace ReallifeGamemode.Server.Managers public static void VehicleManagerVehicleDeath(Vehicle vehicle) { ServerVehicle serverVehicle = GetServerVehicleFromVehicle(vehicle); - + vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 1"); if (serverVehicle == null) { + vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 2"); vehicle.Delete(); return; } + vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 3"); Vehicle newVeh = serverVehicle.Spawn(vehicle); newVeh.Repair(); newVeh.Rotation = new Vector3(0, 0, serverVehicle.Heading); + vehicle.GetDriver().SendChatMessage("VehicleDeath: Debug 4"); }