From 9ac0e02574c33538609ad6553e4b90a10c3b4e1e Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Tue, 22 Oct 2019 00:00:17 +0200
Subject: [PATCH] Fixed client crashing when destroying certain entities.

---
 .../GameObjects/EntitySystems/MeleeWeaponSystem.cs   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
index 93871ede55..d31b9169e4 100644
--- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
@@ -79,9 +79,17 @@ namespace Content.Client.GameObjects.EntitySystems
             weaponArcAnimation.SetData(weaponArc, msg.Angle);
 
 
-            foreach (var hitEntity in msg.Hits.Select(u => EntityManager.GetEntity(u)))
+            foreach (var uid in msg.Hits)
             {
-                if (!hitEntity.TryGetComponent(out ISpriteComponent sprite)) continue;
+                if (!EntityManager.TryGetEntity(uid, out var hitEntity))
+                {
+                    continue;
+                }
+
+                if (!hitEntity.TryGetComponent(out ISpriteComponent sprite))
+                {
+                    continue;
+                }
 
                 var originalColor = sprite.Color;
                 var newColor = Color.Red * originalColor;