Fix cream pie crash due to client deletion (space-wizards#8234)

qqqZXzz123 · May 17, 2022 · 7ed6e28 · 7ed6e28
1 parent af926c5
commit 7ed6e28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs
@@ -27,6 +27,8 @@ protected override void SplattedCreamPie(EntityUid uid, CreamPieComponent creamP
             {
                 _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
@@ -28,8 +28,6 @@ public void SplatCreamPie(EntityUid uid, CreamPieComponent creamPie)
             creamPie.Splatted = true;
 
             SplattedCreamPie(uid, creamPie);
-
-            EntityManager.QueueDeleteEntity(uid);
         }
 
         protected virtual void SplattedCreamPie(EntityUid uid, CreamPieComponent creamPie) {}
-Original file line number
+Diff line change
@@ Expand Up @@
                 {
                     _spillableSystem.SpillAt(creamPie.Owner, solution, "PuddleSmear", false);
                 }
+                EntityManager.QueueDeleteEntity(uid);
             }
             protected override void CreamedEntity(EntityUid uid, CreamPiedComponent creamPied, ThrowHitByEvent args)
@@ Expand Down @@