From bc2975b49029f766092892fb1910d4d89e6d40a7 Mon Sep 17 00:00:00 2001
From: hydrant <log@hydrant.pw>
Date: Sat, 24 Apr 2021 02:43:14 +0200
Subject: [PATCH] BusDriver: Fix tp hack

---
 ReallifeGamemode.Client/Jobs/BusRouteSelect.ts | 15 +++++++++++----
 ReallifeGamemode.Client/admin/anticheat.ts     |  6 +++---
 ReallifeGamemode.Client/global.d.ts            |  1 -
 ReallifeGamemode.Client/index.ts               | 13 -------------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts b/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts
index db3ebbe9..c5c33244 100644
--- a/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts
+++ b/ReallifeGamemode.Client/Jobs/BusRouteSelect.ts
@@ -19,18 +19,27 @@ let cancelItem = new UIMenuItem("Abbrechen", "");
 cancelItem.BackColor = new Color(213, 0, 0);
 cancelItem.HighlightedBackColor = new Color(229, 57, 53);
 
+var routeMenu: NativeUI.Menu;
+var busRouteSelectColShape = mp.colshapes.newCircle(-535, -2144, 2.5);
+
 export default function busRouteList(globalData: IGlobalData) {
-    var routeMenu: NativeUI.Menu;
     var skillSelect;
     var routeSelect;
     var skill = 0;
     var routeSelected = false;
 
+    mp.events.add(RageEnums.EventKey.PLAYER_EXIT_COLSHAPE, (colshape) => {
+        if (colshape == busRouteSelectColShape) {
+            if (routeMenu && routeMenu.Visible) {
+                routeMenu.Close();
+            }
+        }
+    });
+
     mp.events.add('SERVER:StartBusJob', (jobskill) => {
         skill = jobskill;
         if (!globalData.InMenu) {
             globalData.InMenu = true;
-            globalData.BlockMovement = true;
 
             skillSelect = ["Anfänger", "Fortgeschrittener", "Profi"];
 
@@ -69,7 +78,6 @@ export default function busRouteList(globalData: IGlobalData) {
 
                    
                 } else if (item.Text === "Abbrechen") {
-                    mp.events.callRemote("CLIENT:Job_StopJob");
                     routeMenu.Close();
                 }
             });
@@ -80,7 +88,6 @@ export default function busRouteList(globalData: IGlobalData) {
                 }
                 routeSelected = false;
 
-                globalData.BlockMovement = false;
                 globalData.InMenu = false;
             });
         }
diff --git a/ReallifeGamemode.Client/admin/anticheat.ts b/ReallifeGamemode.Client/admin/anticheat.ts
index aa299629..b7d0a03f 100644
--- a/ReallifeGamemode.Client/admin/anticheat.ts
+++ b/ReallifeGamemode.Client/admin/anticheat.ts
@@ -49,9 +49,9 @@
         }, 500);
     })
 
-    setInterval(() => {
-        mp.events.call("client:checkInvincible")
-    }, 30000);
+    //setInterval(() => {
+    //    mp.events.call("client:checkInvincible")
+    //}, 30000);
 
     mp.events.add('SERVER:AntiCheat:weaponSwap', () => {
         Behaviour.resetWeapon()
diff --git a/ReallifeGamemode.Client/global.d.ts b/ReallifeGamemode.Client/global.d.ts
index 482cae5c..dfd560c5 100644
--- a/ReallifeGamemode.Client/global.d.ts
+++ b/ReallifeGamemode.Client/global.d.ts
@@ -5,7 +5,6 @@
     InChat: boolean,
     LoggedIn: boolean,
     IsAfk: boolean,
-    BlockMovement: boolean;
 }
 
 declare type AccountData = {
diff --git a/ReallifeGamemode.Client/index.ts b/ReallifeGamemode.Client/index.ts
index 91a6c584..0ec8ef2d 100644
--- a/ReallifeGamemode.Client/index.ts
+++ b/ReallifeGamemode.Client/index.ts
@@ -15,7 +15,6 @@ let globalData: IGlobalData = {
     InChat: false,
     LoggedIn: false,
     IsAfk: false,
-    BlockMovement: false,
 
     get InMenu(): boolean {
         return inMenu;
@@ -27,18 +26,6 @@ let globalData: IGlobalData = {
     }
 };
 
-mp.events.add(RageEnums.EventKey.RENDER, (nametags) => {
-    if (globalData.BlockMovement) {
-        mp.game.controls.disableControlAction(32, 23, true);
-        mp.game.controls.disableControlAction(32, 75, true);
-
-        mp.game.controls.disableControlAction(32, 32, true);
-        mp.game.controls.disableControlAction(32, 33, true);
-        mp.game.controls.disableControlAction(32, 34, true);
-        mp.game.controls.disableControlAction(32, 35, true);
-    }
-});
-
 const game: IGame = new RageGame();
 export default game;
 export {