diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts index 50aaad52..96930636 100644 --- a/ReallifeGamemode.Client/Player/keys.ts +++ b/ReallifeGamemode.Client/Player/keys.ts @@ -6,7 +6,8 @@ //https://docs.microsoft.com/de-de/windows/desktop/inputdev/virtual-key-codes -const player = mp.players.local; +import { Key } from '../game'; +import BetterBindings from 'ragemp-better-bindings'; export default function keys(globalData: IGlobalData) { var showGui = true; @@ -140,12 +141,10 @@ export default function keys(globalData: IGlobalData) { mp.gui.takeScreenshot(new Date().toLocaleDateString(), 1, 100, 80); }); - setInterval(() => { - if (mp.keys.isDown(17) && mp.keys.isDown(72)) { //CTRL + H - mp.events.call("keyPress:ControllH"); //hup - return; - } - }, 100); + BetterBindings.bind('ctrl + g', () => { + mp.events.call("keyPress:ControllH"); //hup + return; + }); //F2 //Noclip mp.keys.bind(0x71, false, () => { diff --git a/ReallifeGamemode.Client/package-lock.json b/ReallifeGamemode.Client/package-lock.json index e523848f..fae2ae51 100644 --- a/ReallifeGamemode.Client/package-lock.json +++ b/ReallifeGamemode.Client/package-lock.json @@ -2879,6 +2879,11 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, + "ragemp-better-bindings": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/ragemp-better-bindings/-/ragemp-better-bindings-1.0.4.tgz", + "integrity": "sha512-mev0UT74EmBen1rdg8FP9bKFsxUtDH56X2SM2JQQsWWzCzVvRP0HIt1Wqn1DuomszgSt/uzxZaufwCFbeOU+/Q==" + }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", diff --git a/ReallifeGamemode.Client/package.json b/ReallifeGamemode.Client/package.json index 0c0b26ac..501e5304 100644 --- a/ReallifeGamemode.Client/package.json +++ b/ReallifeGamemode.Client/package.json @@ -22,5 +22,8 @@ "ProjectOpened": [ "watch" ] + }, + "dependencies": { + "ragemp-better-bindings": "^1.0.4" } } diff --git a/ReallifeGamemode.Server/Commands/UserCommands.cs b/ReallifeGamemode.Server/Commands/UserCommands.cs index e677e0c5..227e80ab 100644 --- a/ReallifeGamemode.Server/Commands/UserCommands.cs +++ b/ReallifeGamemode.Server/Commands/UserCommands.cs @@ -106,7 +106,7 @@ namespace ReallifeGamemode.Server.Commands [Command("hup")] public void CmdAnim(Player player) { - if (player.HasAnimation("hup")) { player.ClearAnimation(); } + if (player.HasAnimation("hup")) { player.ClearAnimation(); return; } if (player.HasAnimation()) return; diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index 3d833357..b206f518 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -969,7 +969,7 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:ControllH")] public void KeyPressControllH(Player player) { - if (player.HasAnimation("hup")) { player.ClearAnimation(); } + if (player.HasAnimation("hup")) { player.ClearAnimation(); return; } if (player.HasAnimation()) return;