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

Fix try 3 Death/Disconnect

Browse Source
This commit is contained in:
Mac_Slash
2020-05-04 17:21:50 +02:00
parent d1fcb9c170
commit 504598fe7e
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReallifeGamemode.Server/Events/Death.cs
View File

@@ -117,11 +117,11 @@ namespace ReallifeGamemode.Server.Events
{ {
if (job.GetUsersInJob().Contains(player)) if (job.GetUsersInJob().Contains(player))
{ {
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (player.Vehicle != null)
{ {
/*if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true) /*if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
{*/ {*/
if (player.Vehicle != null) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
player.Vehicle.ResetData("timerJobVehicleRespawn"); player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = Managers.VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); ServerVehicle sVeh = Managers.VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
@@ -134,11 +134,14 @@ namespace ReallifeGamemode.Server.Events
{ {
jm.playerTimersJobVehicleRespawn[player].Stop(); jm.playerTimersJobVehicleRespawn[player].Stop();
} }
player.ResetData("HatRoute");
player.ResetData("PilotenBase"); player.ResetData("PilotenBase");
job.StopJob(player); job.StopJob(player);
ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player); if (player.GetData<bool>("HatRoute") == true)
{
CheckPointHandle.DeleteCheckpoints(player);
player.ResetData("HatRoute");
}
} }
} }

14
ReallifeGamemode.Server/Events/Disconnect.cs
View File

@@ -60,11 +60,11 @@ namespace ReallifeGamemode.Server.Events
{ {
if (job.GetUsersInJob().Contains(player)) if (job.GetUsersInJob().Contains(player))
{ {
if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ) if (player.Vehicle != null)
{ {
//if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true) //if (player.Vehicle.GetData<bool>("timerJobVehicleRespawn") == true)
//{ //{
if (player.Vehicle != null) if (player.Vehicle.GetServerVehicle() is JobVehicle vehJ)
{ {
player.Vehicle.ResetData("timerJobVehicleRespawn"); player.Vehicle.ResetData("timerJobVehicleRespawn");
ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle); ServerVehicle sVeh = VehicleManager.GetServerVehicleFromVehicle(player.Vehicle);
@@ -77,12 +77,14 @@ namespace ReallifeGamemode.Server.Events
{ {
jm.playerTimersJobVehicleRespawn[player].Stop(); jm.playerTimersJobVehicleRespawn[player].Stop();
} }
player.ResetData("HatRoute");
player.ResetData("PilotenBase"); player.ResetData("PilotenBase");
player.ResetData("JobVehicleFrei");
job.StopJob(player); job.StopJob(player);
//ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet."); ChatService.SendMessage(player, $"~y~[JOB]~s~ Du hast deinen Job ~o~{job.Name}~s~ beendet.");
CheckPointHandle.DeleteCheckpoints(player); if (player.GetData<bool>("HatRoute") == true)
{
CheckPointHandle.DeleteCheckpoints(player);
player.ResetData("HatRoute");
}
} }
} }