diff --git a/ReallifeGamemode.Client/Player/keys.ts b/ReallifeGamemode.Client/Player/keys.ts index 596f2b8f..9c344a16 100644 --- a/ReallifeGamemode.Client/Player/keys.ts +++ b/ReallifeGamemode.Client/Player/keys.ts @@ -141,17 +141,8 @@ export default function keys(globalData: IGlobalData) { mp.gui.takeScreenshot(new Date().toLocaleDateString(), 1, 100, 80); }); - KeyBinder.bind("alt+h", () => { - mp.events.call("keyPress:ControllH"); //hup - return; - }); - KeyBinder.bind("ctrl+h", () => { - mp.events.call("keyPress:ControllH"); //hup - return; - }); - KeyBinder.bind("h", () => { - mp.events.call("keyPress:ControllH"); //hup + mp.events.callRemote("keyPress:ControllH"); //hup return; }); diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts index 6c435435..53abce1f 100644 --- a/ReallifeGamemode.Client/util/animationSync.ts +++ b/ReallifeGamemode.Client/util/animationSync.ts @@ -79,6 +79,8 @@ mp.events.addDataHandler("AnimationData", (entity: PlayerMp, string) => { entity.clearTasksImmediately(); if (string == null) { + blockInput = false; + return; } diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs index b206f518..47807d69 100644 --- a/ReallifeGamemode.Server/Events/Key.cs +++ b/ReallifeGamemode.Server/Events/Key.cs @@ -969,10 +969,12 @@ namespace ReallifeGamemode.Server.Events [RemoteEvent("keyPress:ControllH")] public void KeyPressControllH(Player player) { - if (player.HasAnimation("hup")) { player.ClearAnimation(); return; } + if (player.HasAnimation("hup")) { player.ClearAnimation(); player.AddAttachment("handcuffs", true); return; } if (player.HasAnimation()) return; + player.AddAttachment("handcuffs", false); + player.SyncAnimation("hup"); ChatService.SendInRange(player.Position, 20, $"~m~{player.Name} stellt sich..."); }