From ec25d1c476495e54f50c2fbd7071ac62b6c3397f Mon Sep 17 00:00:00 2001
From: Mac_Slash <maxped1337@gmail.com>
Date: Thu, 30 Apr 2020 13:15:33 +0200
Subject: [PATCH] =?UTF-8?q?CheckpointZeit=20angepasst,=20T=C3=BCrfehler=20?=
 =?UTF-8?q?angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReallifeGamemode.Client/index.ts              |  5 ++--
 ReallifeGamemode.Client/util/checkpoint.ts    |  4 ++-
 ReallifeGamemode.Server/Events/Key.cs         | 26 +++++++++++++++++++
 .../Util/CheckPointHandle.cs                  |  3 +++
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts
index 76f3092d..cfcc0ab2 100644
--- a/ReallifeGamemode.Client/index.ts
+++ b/ReallifeGamemode.Client/index.ts
@@ -164,14 +164,15 @@ waypointUtil();
 
 require('./vehiclesync/vehiclesync');
 
-require('./vehiclesync/door');
-
 import smoothThrottle from './vehiclesync/smoothtrottle';
 smoothThrottle();
 
 import vehicleIndicators from './vehiclesync/vehicleindicators';
 vehicleIndicators();
 
+import vehicleDoor from './vehiclesync/door';
+vehicleDoor();
+
 import reportList from './Player/reportmenu';
 reportList(globalData);
 
diff --git a/ReallifeGamemode.Client/util/checkpoint.ts b/ReallifeGamemode.Client/util/checkpoint.ts
index c7e9b540..6925eef6 100644
--- a/ReallifeGamemode.Client/util/checkpoint.ts
+++ b/ReallifeGamemode.Client/util/checkpoint.ts
@@ -77,6 +77,7 @@ export default function checkpointHandle(globalData: IGlobalData) {
                 }
                 mp.game.audio.playSoundFrontend(1, "Beep_Red", "DLC_HEIST_HACKING_SNAKE_SOUNDS", true);
                 mp.events.callRemote("playerWaitsInCheckpoint");
+                mp.players.local.freezePosition(true);
             }
             inCheckpoint = true;
 
@@ -87,6 +88,7 @@ export default function checkpointHandle(globalData: IGlobalData) {
                 activeCheckpoint = null;
                 clearInterval(myVar);
                 mp.events.callRemote("playerInCheckpoint");
+                mp.players.local.freezePosition(false);
                 if (event != "") {
                     while (checkPointsDone > 10000) {
 
@@ -94,7 +96,7 @@ export default function checkpointHandle(globalData: IGlobalData) {
                     mp.events.callRemote(event, checkPointsDone);
                 }
             } else {
-                delayCounter += 100;
+                delayCounter += 50;
             }
         } else if (dist > 2) {
             inCheckpoint = false;
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 5b50fdca..298fdedf 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -571,6 +571,32 @@ namespace ReallifeGamemode.Server.Events
               player.SendNotification("~y~[JOB] ~w~Du musst den Job vorher starten!");
               return;
             }
+            else
+            {
+              if ((VehicleHash)jV.Model == VehicleHash.Bus)
+              {
+                player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
+                player.TriggerEvent("CLIENT:SetDoorOpen", 1, false, false);
+                player.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
+                player.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 0, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 1, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 2, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 3, false);
+              }
+              if ((VehicleHash)jV.Model == VehicleHash.Coach)
+              {
+                player.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 0, false);
+              }
+              if ((VehicleHash)jV.Model == VehicleHash.Tourbus)
+              {
+                player.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
+                player.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 2, false);
+                player.TriggerEvent("CLIENT:SetDoorShut", 3, false);
+              }
+            }
           }
           else
           {
diff --git a/ReallifeGamemode.Server/Util/CheckPointHandle.cs b/ReallifeGamemode.Server/Util/CheckPointHandle.cs
index c1d27065..d2597f08 100644
--- a/ReallifeGamemode.Server/Util/CheckPointHandle.cs
+++ b/ReallifeGamemode.Server/Util/CheckPointHandle.cs
@@ -59,6 +59,7 @@ namespace ReallifeGamemode.Server.Util
           user.TriggerEvent("CLIENT:SetDoorOpen", 1, false, false);
           user.TriggerEvent("CLIENT:SetDoorOpen", 2, false, false);
           user.TriggerEvent("CLIENT:SetDoorOpen", 3, false, false);
+          user.TriggerEvent("CLIENT:SetDoorOpen", 0, false, false);
         }
         if ((VehicleHash)veh.Model == VehicleHash.Coach)
         {
@@ -87,6 +88,7 @@ namespace ReallifeGamemode.Server.Util
         user.TriggerEvent("CLIENT:SetDoorShutDelayed", 1, false, 1850);
         user.TriggerEvent("CLIENT:SetDoorShutDelayed", 2, false, 1850);
         user.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 1850);
+        user.TriggerEvent("CLIENT:SetDoorShutDelayed", 0, false, 1850);
       }
       if ((VehicleHash)veh.Model == VehicleHash.Coach)
       {
@@ -96,6 +98,7 @@ namespace ReallifeGamemode.Server.Util
       if ((VehicleHash)veh.Model == VehicleHash.Tourbus)
       {
         user.TriggerEvent("CLIENT:PlaySound", "jobs/busfahrer/AbfahrtHaltestelleTourbus", "wav", 25);
+        user.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 2100);
         user.TriggerEvent("CLIENT:SetDoorShutDelayed", 2, false, 2100);
         user.TriggerEvent("CLIENT:SetDoorShutDelayed", 3, false, 2100);
       }