From c4f6b71eb7d6fc4b65ec9c77feded6b333ecf2a4 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Fri, 22 Oct 2021 13:44:37 +0200
Subject: [PATCH] Fixes ShowHandItemOverlay freezing the game when the item in
 question has no sprite component.

---
 Content.Client/Hands/ShowHandItemOverlay.cs | 3 ++-
 Resources/Changelog/Parts/overlay.yml       | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Changelog/Parts/overlay.yml

diff --git a/Content.Client/Hands/ShowHandItemOverlay.cs b/Content.Client/Hands/ShowHandItemOverlay.cs
index 2b6aab2fc1..8515ed9ffe 100644
--- a/Content.Client/Hands/ShowHandItemOverlay.cs
+++ b/Content.Client/Hands/ShowHandItemOverlay.cs
@@ -1,4 +1,5 @@
 using Content.Shared.CCVar;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -45,7 +46,7 @@ namespace Content.Client.Hands
             var sys = EntitySystem.Get<HandsSystem>();
             var handEntity = sys.GetActiveHandEntity();
 
-            if (handEntity == null || !_cfg.GetCVar(CCVars.HudHeldItemShow))
+            if (handEntity == null || !_cfg.GetCVar(CCVars.HudHeldItemShow) || !handEntity.HasComponent<ISpriteComponent>())
                 return;
 
             var screen = args.ScreenHandle;
diff --git a/Resources/Changelog/Parts/overlay.yml b/Resources/Changelog/Parts/overlay.yml
new file mode 100644
index 0000000000..d73c411c2b
--- /dev/null
+++ b/Resources/Changelog/Parts/overlay.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix # One of the following: Add, Remove, Tweak, Fix
+    message: Fixes pulling items with hand item cursor overlay freezing the game.