From 14c296505e2a8ce4a94b542cdb93cb735fc3668d Mon Sep 17 00:00:00 2001
From: kookroach <62265045+kookroach@users.noreply.github.com>
Date: Sat, 3 Apr 2021 21:06:53 +0200
Subject: [PATCH] globalData InMenu bugfix

---
 .../Interaction/factioninteraction.ts         |  4 ----
 .../Interaction/interactionmenu.ts            |  1 -
 ReallifeGamemode.Client/Player/keys.ts        | 23 +++++++------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/ReallifeGamemode.Client/Interaction/factioninteraction.ts b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
index 3d35c9ea..dfa95f1c 100644
--- a/ReallifeGamemode.Client/Interaction/factioninteraction.ts
+++ b/ReallifeGamemode.Client/Interaction/factioninteraction.ts
@@ -87,8 +87,6 @@ export default function factionInteraction(globalData: IGlobalData) {
                             factionInteractionMenu.Visible = false;
                             mp.gui.chat.activate(true);
                             mp.gui.cursor.show(true, true);
-                            globalData.InMenu = false;
-                            globalData.InMenu = true;
                             var input = new InputHelper("Welchem Spieler möchtest du ein Ticket geben (Name / ID)?", globalData);
                             input.show();
                             input.getValue(name => {
@@ -101,8 +99,6 @@ export default function factionInteraction(globalData: IGlobalData) {
                             factionInteractionMenu.Visible = false;
                             mp.gui.chat.activate(true);
                             mp.gui.cursor.show(true, true);
-                            globalData.InMenu = false;
-                            globalData.InMenu = true;
                             var input = new InputHelper("Welchem Spieler möchtest du Strafpunkte geben (Name / ID)?", globalData);
                             input.show();
                             input.getValue(name => {
diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts
index e55b8356..1946fc78 100644
--- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts
+++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts
@@ -169,7 +169,6 @@ export default function (globalData: IGlobalData) {
             } else if (item === payItem) {
                 mp.gui.chat.activate(true);
                 mp.gui.cursor.show(true, true);
-                globalData.InMenu = false;
                 globalData.InMenu = true;
                 var input = new InputHelper("Welchem Spieler möchtest du Geld geben (Name / ID)?", globalData);
                 input.show();
diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts
index a652e254..1cfb6fa2 100644
--- a/ReallifeGamemode.Client/Player/keys.ts
+++ b/ReallifeGamemode.Client/Player/keys.ts
@@ -11,9 +11,7 @@ const player = mp.players.local;
 
 export default function keys(globalData: IGlobalData) {
 
-    var showInventory = false;
     var showGui = true;
-    var showInv = false;
 
     //ENTER
     mp.keys.bind(0x0D, false, function () {
@@ -24,21 +22,21 @@ export default function keys(globalData: IGlobalData) {
 
     //LEFT ARROW (Interaktion mit anderen Spielern)
     mp.keys.bind(0x25, false, function () {
-        if (!globalData.InChat && !showInv && !globalData.InMenu) {
+        if (!globalData.InChat) {
             mp.events.callRemote("keyPress:LEFT_ARROW");
         }
     });
 
     //UP ARROW (Interaktion mit Spielwelt)
     mp.keys.bind(0x26, false, function () {
-        if (!globalData.InChat && !showInv && !globalData.InMenu) {
+        if (!globalData.InChat) {
             mp.events.callRemote("keyPress:UP_ARROW");
         }
     });
 
     //RIGHT ARROW (Fraktionsinteraktion)
     mp.keys.bind(0x27, false, function () {
-        if (!globalData.InChat && !showInv && !globalData.InMenu) {
+        if (!globalData.InChat) {
             mp.events.callRemote("keyPress:RIGHT_ARROW");
         }
     });
@@ -70,7 +68,7 @@ export default function keys(globalData: IGlobalData) {
 
     //E
     mp.keys.bind(0x45, false, function () {
-        if (!globalData.InChat && !globalData.InMenu) {
+        if (!globalData.InChat) {
             mp.events.callRemote("keyPress:E");
         }
     });
@@ -78,19 +76,14 @@ export default function keys(globalData: IGlobalData) {
 
     //I //Inventar
     mp.keys.bind(0x49, false, function () {
-        if (!globalData.InChat && !globalData.InTuning && !globalData.InMenu) {
-            if (showInv === false) {
-                showInv = true;
-            } else {
-                showInv = false;
-            }
+        if (!globalData.InChat && !globalData.InTuning) {
             mp.events.callRemote("keyPress:I");
         }
     });
 
     //O //Spielerliste
     mp.keys.bind(0x4F, true, function () {
-        if (!globalData.InChat && !globalData.InMenu && !globalData.InTuning && !showInv) {
+        if (!globalData.InChat &&  !globalData.InTuning ) {
             mp.events.callRemote("keyPress:O");
             //mp.events.call("showPlayerlist"); 
         }
@@ -112,7 +105,7 @@ export default function keys(globalData: IGlobalData) {
 
     //M (Interaktionsmenü)
     mp.keys.bind(0x4D, false, function () {
-        if (!globalData.InChat && !showInv && !globalData.InMenu && !globalData.InMenu && !globalData.InTuning) {
+        if (!globalData.InChat && !globalData.InTuning) {
             mp.events.callRemote("keyPress:M");
         }
     });
@@ -142,7 +135,7 @@ export default function keys(globalData: IGlobalData) {
 
     //J // Job Starten
     mp.keys.bind(0x4A, false, () => {
-        if (!globalData.InChat && !globalData.InMenu && !globalData.InMenu && globalData.LoggedIn) {
+        if (!globalData.InChat && globalData.LoggedIn) {
             mp.events.callRemote("CLIENT:JobManager_ShowJobMenu");
         }
     });