From 2cebda5e1a5bf960d4ab67f6338918f49988e0d2 Mon Sep 17 00:00:00 2001 From: Fabian Fabian Date: Mon, 16 Sep 2019 22:59:18 +0200 Subject: [PATCH] fixed conflicts in jobroutes --- ReallifeGamemode.Client/util/checkpoint.ts | 4 +++- ReallifeGamemode.Server/Events/Disconnect.cs | 2 ++ ReallifeGamemode.Server/Job/BusDriverJob.cs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ReallifeGamemode.Client/util/checkpoint.ts b/ReallifeGamemode.Client/util/checkpoint.ts index d53bf352..3e78f965 100644 --- a/ReallifeGamemode.Client/util/checkpoint.ts +++ b/ReallifeGamemode.Client/util/checkpoint.ts @@ -36,7 +36,9 @@ export default function checkpointHandle(globalData: GlobalData) { if (dist <= 2) { if (!inCheckpoint) { - mp.gui.chat.push("Warte nun " + delay / 1000 + " Sekunden"); + if (delay != 0) { + mp.gui.chat.push("Warte nun " + delay / 1000 + " Sekunden"); + } mp.game.audio.playSoundFrontend(1, "Beep_Red", "DLC_HEIST_HACKING_SNAKE_SOUNDS", true); } inCheckpoint = true; diff --git a/ReallifeGamemode.Server/Events/Disconnect.cs b/ReallifeGamemode.Server/Events/Disconnect.cs index 7759945e..5c56a396 100644 --- a/ReallifeGamemode.Server/Events/Disconnect.cs +++ b/ReallifeGamemode.Server/Events/Disconnect.cs @@ -48,6 +48,8 @@ namespace ReallifeGamemode.Server.Events ChatService.BroadcastAdmin("!{#FFFF00}*** " + player.Name + " hat den Server verlassen", AdminLevel.TEAM); } + CheckPointHandle.RemovePlayerHandlerFromList(player); + JobBase job = JobManager.GetJob(player.GetUser().JobId ?? -1); if (job != null) job.StopJob(player, true); diff --git a/ReallifeGamemode.Server/Job/BusDriverJob.cs b/ReallifeGamemode.Server/Job/BusDriverJob.cs index b882f14e..e5cfbfa9 100644 --- a/ReallifeGamemode.Server/Job/BusDriverJob.cs +++ b/ReallifeGamemode.Server/Job/BusDriverJob.cs @@ -49,7 +49,7 @@ namespace ReallifeGamemode.Server.Job new Vector3(459.6921,116.3203,98.18157), new Vector3(173.9451,220.1987,105.4178), new Vector3(-327.3175,261.2248,85.86708), - new Vector3(-764.2745,294.4415,8500808), + new Vector3(-764.2745,294.4415,85.00808), new Vector3(-1031.586,107.9002,52.30307), new Vector3(-489.973,-195.4356,36.59651), new Vector3(-224.4042,-528.0254,34.08064),