From 78726f3f6a3897bbba61212b67febb8936b97d57 Mon Sep 17 00:00:00 2001 From: VegaZ Date: Wed, 26 Dec 2018 23:32:57 +0100 Subject: [PATCH] Small fix in Interaction --- Client/Interaction/interaction.js | 8 +++----- Client/Player/keys.js | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Client/Interaction/interaction.js b/Client/Interaction/interaction.js index 731aefb3..5fbc7f82 100644 --- a/Client/Interaction/interaction.js +++ b/Client/Interaction/interaction.js @@ -42,7 +42,7 @@ const Color = NativeUI.Color; mp.events.add("showPlayerInteraction", (nearPlayerArr) => { mp.gui.chat.activate(false); nearbyPlayers = JSON.parse(nearPlayerArr); - + playerInteractionMenu.Visible = true; let playerInteractionMenu = new Menu("Spielerinteraktion", "", new Point(0, screenRes.y / 2)); let playerSelect = new UIMenuListItem("Mit", "~y~W\u00e4hle den Spieler aus.", new ItemsCollection(nearbyPlayers)); playerInteractionMenu.AddItem(playerSelect); @@ -52,16 +52,14 @@ mp.events.add("showPlayerInteraction", (nearPlayerArr) => { cancelItem.BackColor = new Color(213, 0, 0); cancelItem.HighlightedBackColor = new Color(229, 57, 53); playerInteractionMenu.AddItem(cancelItem); - - playerInteractionMenu.Visible = true; - + playerInteractionMenu.ItemSelect.on((item) => { if (item.Text === "Handeln") { mp.events.callRemote("openTradeInventory", playerSelect.SelectedValue); playerInteractionMenu.Visible = false; mp.gui.chat.activate(true); globalData.PlayerInteraction = false; - } else if (item.Text === "Abbrechen") { + } else if (item.Text === "Schlie\u00dfen") { globalData.PlayerInteraction = false; playerInteractionMenu.Visible = false; mp.gui.chat.activate(true); diff --git a/Client/Player/keys.js b/Client/Player/keys.js index 61b94641..361f29e4 100644 --- a/Client/Player/keys.js +++ b/Client/Player/keys.js @@ -24,8 +24,7 @@ mp.keys.bind(0x0D, false, function () { //LEFT ARROW (Interaktion mit anderen Spielern) mp.keys.bind(0x25, false, function () { if (!chat && !showInv && !globalData.PlayerInteraction) { - mp.events.callRemote("keyPress:LEFT_ARROW"); - globalData.PlayerInteraction = true; + mp.events.callRemote("keyPress:LEFT_ARROW"); } });