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

fix jobcar respawn

Browse Source
This commit is contained in:
hydrant
2021-04-11 14:52:23 +02:00
parent a13b405748
commit 62d7e848dc
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReallifeGamemode.Server/Job/BusDriverJob.cs
View File

@@ -421,9 +421,12 @@ namespace ReallifeGamemode.Server.Job
_CHANGING_VEHICLE.Add(player); _CHANGING_VEHICLE.Add(player);
if (playerVehiclePair.ContainsKey(player)) if (playerVehiclePair.ContainsKey(player))
{ {
Vehicle previousVehicle = null;
if (playerVehiclePair[player] != null) if (playerVehiclePair[player] != null)
playerVehiclePair[player].Delete(); previousVehicle = playerVehiclePair[player];
playerVehiclePair.Remove(player); playerVehiclePair.Remove(player);
previousVehicle?.Delete();
} }
playerVehiclePair.Add(player, vehicle); playerVehiclePair.Add(player, vehicle);
@@ -556,7 +559,7 @@ namespace ReallifeGamemode.Server.Job
public override void StartJobEndTimer(Player player) public override void StartJobEndTimer(Player player)
{ {
if (!playerVehiclePair.ContainsKey(player) || _CHANGING_VEHICLE.Contains(player)) if (!playerVehiclePair.ContainsKey(player) && _CHANGING_VEHICLE.Contains(player))
{ {
_CHANGING_VEHICLE.Remove(player); _CHANGING_VEHICLE.Remove(player);
return; return;

10
ReallifeGamemode.Server/Job/PilotJob.cs
View File

@@ -233,13 +233,15 @@ namespace ReallifeGamemode.Server.Job
_CHANGING_VEHICLE.Add(player); _CHANGING_VEHICLE.Add(player);
if (playerVehiclePair.ContainsKey(player)) if (playerVehiclePair.ContainsKey(player))
{ {
Vehicle previousVehicle = null;
if (playerVehiclePair[player] != null) if (playerVehiclePair[player] != null)
playerVehiclePair[player].Delete(); previousVehicle = playerVehiclePair[player];
playerVehiclePair.Remove(player); playerVehiclePair.Remove(player);
previousVehicle?.Delete();
} }
playerVehiclePair.Add(player, vehicle); playerVehiclePair.Add(player, vehicle);
player.SetIntoVehicle(vehicle.Handle, 0); player.SetIntoVehicle(vehicle.Handle, 0);
_CHANGING_VEHICLE.Remove(player);
CheckPointHandle.StartCheckPointRoute(player, selectedRoute, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "PILOT:InCheckpoint"); //6, 23, 25, 26, 27, 28 CheckPointHandle.StartCheckPointRoute(player, selectedRoute, 0, CHECKPOINT_MARKER_ID, 40, 10, true, "PILOT:InCheckpoint"); //6, 23, 25, 26, 27, 28
} }
@@ -286,7 +288,11 @@ namespace ReallifeGamemode.Server.Job
public override void StartJobEndTimer(Player player) public override void StartJobEndTimer(Player player)
{ {
if (!playerVehiclePair.ContainsKey(player) && _CHANGING_VEHICLE.Contains(player)) if (!playerVehiclePair.ContainsKey(player) && _CHANGING_VEHICLE.Contains(player))
{
_CHANGING_VEHICLE.Remove(player);
return; return;
}
if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player)) if (JobManager.playerTimersJobVehicleRespawn.ContainsKey(player))
{ {