Resolve merge conflict

2018-12-26 23:00:53 +01:00
parent ec1cc4b237 92edb008cf
commit f0e24cf1ae
13 changed files with 501 additions and 132 deletions
--- a/Client/Player/keys.js
+++ b/Client/Player/keys.js
@@ -17,6 +17,7 @@ const player = mp.players.local;
 mp.keys.bind(0x0D, false, function () {
    if (chat === true) {
        chat = false;
+        globalData.InChat = false;
    }
 });

@@ -102,6 +103,7 @@ mp.keys.bind(0x4E, false, function () {
 mp.keys.bind(0x54, false, function () {
    if (chat === false && showInv === false) {
        chat = true;
+        globalData.InChat = true;
    }
 });