aviate/reallife-gamemode
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix animationSync on Cuff

Browse Source 
Closes #16
This commit is contained in:
Lukas Moungos
2021-04-07 21:07:22 +02:00
parent 3f502f8bf6
commit 347f3823a7
3 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ReallifeGamemode.Client/util/animationSync.ts
View File

@@ -73,7 +73,7 @@
let currentAnim = animationSyncData.animations[index];
let { id, name, animDict, animName, duration, loop, flag } = currentAnim;
if (loop && !player.isPlayingAnim(animDict, animName, 3)) {
if (loop == true && !player.isPlayingAnim(animDict, animName, 3)) {
loadAnimDict(animDict, function () {
mp.players.exists(player) && 0 !== player.handle && player.taskPlayAnim(animDict, animName, 1, 0, duration, parseInt(flag), 0, !1, !1, !1)
});
@@ -104,22 +104,21 @@
mp.players.exists(entity) && 0 !== entity.handle && entity.taskPlayAnim(animDict, animName, 1, 0, duration, parseInt(flag), 0, !1, !1, !1)
});
if (mp.players.local == entity && loop) {
animationBreakTimer = setInterval(() => breakAnimation(entity, id), 120000);
}
if (!loop) {
if (mp.players.local == entity) {
if (loop == true) {
animationBreakTimer = setInterval(() => breakAnimation(id), 120000);
} else {
let a = setInterval(function () {
mp.events.callRemote("CLIENT:ClearAnimationData", entity);
mp.events.callRemote("CLIENT:AnimPairTransition");
mp.events.callRemote("CLIENT:ClearAnimationData", true);
clearInterval(a);
}, duration);
}
}
});
function breakAnimation(entity, id) {
mp.events.callRemote("CLIENT:ClearAnimationData", entity);
function breakAnimation(id) {
mp.events.callRemote("CLIENT:ClearAnimationData", false);
let { animName, msg } = animationBreakMessage.find(c => mp.game.joaat(c.animName) == id)
if (msg)

2
ReallifeGamemode.Server/Extensions/ClientExtension.cs
View File

@@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using ReallifeGamemode.Database.Entities;
using ReallifeGamemode.Database.Models;
using ReallifeGamemode.Server.Managers;
using ReallifeGamemode.Server.Services;
using ReallifeGamemode.Server.Types;
using ReallifeGamemode.Server.Util;
@@ -340,6 +341,7 @@ namespace ReallifeGamemode.Server.Extensions
nearestCuffPlayer.AddAttachment("handcuffs", true);
player.SyncAnimation("doUncuff");
nearestCuffPlayer.SyncAnimation("getUncuff");
PositionManager.cuffPoints.Remove(nearestCuffPlayer);
}
}
}

20
ReallifeGamemode.Server/Util/AnimationSync.cs
View File

@@ -35,11 +35,17 @@ namespace ReallifeGamemode.Server.Util
List<string> nextAnimations = animations.Skip(1).ToList();
player.SyncAnimation(animationName);
if (nextAnimations.Count != 0)
if (nextAnimations.Count is 0)
{
player.TriggerEvent("SERVER:QueueAnimation", animationName);
animationPair.Add(player, nextAnimations);
animationPair.Remove(player);
return;
}
player.TriggerEvent("SERVER:QueueAnimation", animationName);
if (animationPair.ContainsKey(player))
animationPair[player] = nextAnimations;
else
animationPair.Add(player, nextAnimations);
}
/// <summary>Check if Player has any Animation playing.
@@ -55,6 +61,8 @@ namespace ReallifeGamemode.Server.Util
/// <param name="animationName">Name of requested animation</param>
public static bool HasAnimation(this Player player, dynamic animationName)
{
string data = player.GetData<string>("Animation");
bool x = player.GetData<string>("Animation") == animationName;
return player.HasData("Animation") && (player.GetData<string>("Animation") == animationName);
}
@@ -82,9 +90,11 @@ namespace ReallifeGamemode.Server.Util
}
[RemoteEvent("CLIENT:ClearAnimationData")]
public void ClearAnimationData(Player player, Player target)
public void ClearAnimationData(Player player, bool checkTransition)
{
target.ClearAnimation();
player.ClearAnimation();
if (checkTransition)
AnimPairTransition(player);
}
[ServerEvent(Event.PlayerWeaponSwitch)]