From 7ed6e28bc55895ace7674a332b026e0c9524c512 Mon Sep 17 00:00:00 2001
From: Jacob Tong <10494922+ShadowCommander@users.noreply.github.com>
Date: Tue, 17 May 2022 02:56:17 -0700
Subject: [PATCH] Fix cream pie crash due to client deletion (#8234)

---
 Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs       | 2 ++
 Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
index d1912dcc74..0b2cafb49b 100644
--- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -27,6 +27,8 @@ namespace Content.Server.Nutrition.EntitySystems
             {
                 _spillableSystem.SpillAt(creamPie.Owner, solution, "PuddleSmear", false);
             }
+
+            EntityManager.QueueDeleteEntity(uid);
         }
 
         protected override void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args)
diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
index 36e597d5f1..933d755d2e 100644
--- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs
@@ -28,8 +28,6 @@ namespace Content.Shared.Nutrition.EntitySystems
             creamPie.Splatted = true;
 
             SplattedCreamPie(uid, creamPie);
-
-            EntityManager.QueueDeleteEntity(uid);
         }
 
         protected virtual void SplattedCreamPie(EntityUid uid, CreamPieComponent creamPie) {}