From f6872c0cbcd001718c8ec76be5311242f29a15ea Mon Sep 17 00:00:00 2001 From: kookroach Date: Wed, 7 Apr 2021 22:20:38 +0200 Subject: [PATCH] open #16 --- ReallifeGamemode.Client/util/animationSync.ts | 11 ++++++----- ReallifeGamemode.Server/Util/AnimationSync.cs | 3 --- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Client/util/animationSync.ts b/ReallifeGamemode.Client/util/animationSync.ts index 22b39721..169a070b 100644 --- a/ReallifeGamemode.Client/util/animationSync.ts +++ b/ReallifeGamemode.Client/util/animationSync.ts @@ -106,16 +106,17 @@ export default function animationSync() { loadAnimDict(animDict, function () { mp.players.exists(entity) && 0 !== entity.handle && entity.taskPlayAnim(animDict, animName, 1, 0, duration, parseInt(flag), 0, !1, !1, !1) }); - if (!endless) { - animationBreakTimer = setInterval(() => breakAnimation(name), 120000); - } if (mp.players.local == entity) { + if (!endless) { + animationBreakTimer = setInterval(() => breakAnimation(name), 120000); + } + if (!loop) { let a = setInterval(function () { - mp.events.callRemote("CLIENT:ClearAnimationData", true); - clearInterval(a); + mp.game.wait(500); + mp.events.callRemote("CLIENT:ClearAnimationData", true); }, duration); } } diff --git a/ReallifeGamemode.Server/Util/AnimationSync.cs b/ReallifeGamemode.Server/Util/AnimationSync.cs index 6d10d672..827c83aa 100644 --- a/ReallifeGamemode.Server/Util/AnimationSync.cs +++ b/ReallifeGamemode.Server/Util/AnimationSync.cs @@ -64,8 +64,6 @@ namespace ReallifeGamemode.Server.Util /// Name of requested animation public static bool HasAnimation(this Player player, dynamic animationName) { - string data = player.GetData("Animation"); - bool x = player.GetData("Animation") == animationName; return player.HasData("Animation") && (player.GetData("Animation") == animationName); } @@ -74,7 +72,6 @@ namespace ReallifeGamemode.Server.Util if (!player.HasData("Animation")) return; - player.ClearAttachments(); player.ResetData("Animation"); player.ResetSharedData("AnimationData"); }