ReusableAnimations sanity checks.

2021-12-11 15:29:16 +01:00
parent 5a72d0977f
commit 0f7dc8ec76
2 changed files with 5 additions and 1 deletions
--- a/Content.Client/Animations/ReusableAnimations.cs
+++ b/Content.Client/Animations/ReusableAnimations.cs
@@ -15,6 +15,10 @@ namespace Content.Client.Animations
        public static void AnimateEntityPickup(EntityUid entity, EntityCoordinates initialPosition, Vector2 finalPosition, IEntityManager? entMan = null)
        {
            IoCManager.Resolve(ref entMan);
+
+            if (entMan.Deleted(entity) || !initialPosition.IsValid(entMan))
+                return;
+
            var animatableClone = entMan.SpawnEntity("clientsideclone", initialPosition);
            string val = entMan.GetComponent<MetaDataComponent>(entity).EntityName;
            entMan.GetComponent<MetaDataComponent>(animatableClone).EntityName = val;