From 5de5864c0ffcf72f19cf6e0c90bd3e12c06383b0 Mon Sep 17 00:00:00 2001
From: Mac_Slash <maxped1337@gmail.com>
Date: Tue, 28 Apr 2020 20:07:06 +0200
Subject: [PATCH] Fehler Busfahrer

---
 .../Managers/JobManager.cs                    | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/ReallifeGamemode.Server/Managers/JobManager.cs b/ReallifeGamemode.Server/Managers/JobManager.cs
index 8405ae8a..371dabb0 100644
--- a/ReallifeGamemode.Server/Managers/JobManager.cs
+++ b/ReallifeGamemode.Server/Managers/JobManager.cs
@@ -217,37 +217,65 @@ namespace ReallifeGamemode.Server.Managers
       }
       if (player.GetUser().JobId == 3)//Pilot
       {
-        if (LastVehicle != null)
+        if (player.IsInVehicle)
         {
-          if ((VehicleHash)LastVehicle.Model == VehicleHash.Cuban800)
+          if ((VehicleHash)player.Vehicle.Model == VehicleHash.Cuban800)
           {
             player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406);
             player.Heading = (-154.65234375f);
-            ChatService.SendMessage(player, $"~y~[JOB]~s~ Debug 5");
           }
-          if ((VehicleHash)LastVehicle.Model == VehicleHash.Velum || (VehicleHash)LastVehicle.Model == VehicleHash.Velum2)
+          if ((VehicleHash)player.Vehicle.Model == VehicleHash.Velum || (VehicleHash)player.Vehicle.Model == VehicleHash.Velum2)
           {
             player.Position = new Vector3(-1615.156982421875, -3140.54833984375, 13.991917610168457);
             player.Heading = (60.65372848510742f);
-            ChatService.SendMessage(player, $"~y~[JOB]~s~ Debug 6");
+          }
+        }
+        else
+        {
+          if (LastVehicle != null)
+          {
+            if ((VehicleHash)LastVehicle.Model == VehicleHash.Cuban800)
+            {
+              player.Position = new Vector3(1707.2711181640625, 3276.216064453125, 41.155494689941406);
+              player.Heading = (-154.65234375f);
+            }
+            if ((VehicleHash)LastVehicle.Model == VehicleHash.Velum || (VehicleHash)LastVehicle.Model == VehicleHash.Velum2)
+            {
+              player.Position = new Vector3(-1615.156982421875, -3140.54833984375, 13.991917610168457);
+              player.Heading = (60.65372848510742f);
+            }
           }
         }
       }
       if (player.GetUser().JobId == 4)//Busfahrer
       {
-        if (LastVehicle != null)
+        if (player.IsInVehicle)
         {
-          if ((VehicleHash)LastVehicle.Model == VehicleHash.Bus || (VehicleHash)LastVehicle.Model == VehicleHash.Coach)
+          if ((VehicleHash)player.Vehicle.Model == VehicleHash.Bus || (VehicleHash)player.Vehicle.Model == VehicleHash.Coach)
           {
             player.Position = new Vector3(-604.0092163085938, -2229.08447265625, 6.004401683807373);
             player.Heading = (17.64179039001465f);
-            ChatService.SendMessage(player, $"~y~[JOB]~s~ Debug 7");
           }
-          if ((VehicleHash)LastVehicle.Model == VehicleHash.Tourbus)
+          if ((VehicleHash)player.Vehicle.Model == VehicleHash.Tourbus)
           {
             player.Position = new Vector3(458.98468017578125, -657.942138671875, 27.58537483215332);
             player.Heading = (-8.147048950195312f);
-            ChatService.SendMessage(player, $"~y~[JOB]~s~ Debug 8");
+          }
+        }
+        else
+        {
+          if (LastVehicle != null)
+          {
+            if ((VehicleHash)LastVehicle.Model == VehicleHash.Bus || (VehicleHash)LastVehicle.Model == VehicleHash.Coach)
+            {
+              player.Position = new Vector3(-604.0092163085938, -2229.08447265625, 6.004401683807373);
+              player.Heading = (17.64179039001465f);
+            }
+            if ((VehicleHash)LastVehicle.Model == VehicleHash.Tourbus)
+            {
+              player.Position = new Vector3(458.98468017578125, -657.942138671875, 27.58537483215332);
+              player.Heading = (-8.147048950195312f);
+            }
           }
         }
       }