diff --git a/ReallifeGamemode.Server/Events/Death.cs b/ReallifeGamemode.Server/Events/Death.cs index c41bbb90..baeede9d 100644 --- a/ReallifeGamemode.Server/Events/Death.cs +++ b/ReallifeGamemode.Server/Events/Death.cs @@ -71,11 +71,6 @@ namespace ReallifeGamemode.Server.Events if (killerUser != null) { NAPI.Util.ConsoleOutput($"OnPlayerDeath - Player {player.Name} died - Killer GetUser is not null"); - killerId = killerUser.Id; - killerPosX = killer.Position.X; - killerPosY = killer.Position.Y; - killerPosZ = killer.Position.Z; - killerHeading = killer.Heading; var playerInGangwar = player.HasData("inGangWar"); var killerInGangwar = killer.HasData("inGangWar"); diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs index 007228ac..30a623df 100644 --- a/ReallifeGamemode.Server/Managers/JobManager.cs +++ b/ReallifeGamemode.Server/Managers/JobManager.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Reflection; @@ -204,7 +204,7 @@ namespace ReallifeGamemode.Server.Managers if (job != null && job.GetUsersInJob().Contains(player)) { - if(job.CheckVehicle(player, veh) && seat == 0) + if (job.CheckVehicle(player, veh) && seat == 0) { if (!playerTimersJobVehicleRespawn.ContainsKey(player)) return; @@ -212,7 +212,7 @@ namespace ReallifeGamemode.Server.Managers playerTimersJobVehicleRespawn[player].Stop(); playerTimersJobVehicleRespawn.Remove(player); } - else + else if (job != GetJob()) { player.StopAnimation(); player.WarpOutOfVehicle();