Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ReusableAnimations sanity checks.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-11 15:29:16 +01:00
parent 5a72d0977f
commit 0f7dc8ec76
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Animations/ReusableAnimations.cs
View File

@@ -15,6 +15,10 @@ namespace Content.Client.Animations
public static void AnimateEntityPickup(EntityUid entity, EntityCoordinates initialPosition, Vector2 finalPosition, IEntityManager? entMan = null) public static void AnimateEntityPickup(EntityUid entity, EntityCoordinates initialPosition, Vector2 finalPosition, IEntityManager? entMan = null)
{ {
IoCManager.Resolve(ref entMan); IoCManager.Resolve(ref entMan);
if (entMan.Deleted(entity) || !initialPosition.IsValid(entMan))
return;
var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition); var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition);
string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName; string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName;
entMan.GetComponent<MetaDataComponent>(animatableClone).EntityName = val; entMan.GetComponent<MetaDataComponent>(animatableClone).EntityName = val;

2
Content.Client/Hands/Systems/HandsSystem.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Client.Hands
private void HandlePickupAnimation(PickupAnimationMessage msg) private void HandlePickupAnimation(PickupAnimationMessage msg)
{ {
if (!msg.EntityUid.IsValid()) if (!EntityManager.EntityExists(msg.EntityUid))
return; return;
if (!_gameTiming.IsFirstTimePredicted) if (!_gameTiming.IsFirstTimePredicted)