From 6f3f04b61e9a50a4f5b0f1c1c2a0d3b0adc0fb38 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Sun, 21 Mar 2021 21:11:38 +0100 Subject: [PATCH] People who get creamed while they were already creamed get stunned again. --- .../GameObjects/Components/Nutrition/CreamPiedComponent.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs b/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs index bbf48768a5..a617f15c7a 100644 --- a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs +++ b/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs @@ -22,6 +22,8 @@ namespace Content.Server.GameObjects.Components.Nutrition get => _creamPied; private set { + if (value == _creamPied) return; + _creamPied = value; if (Owner.TryGetComponent(out AppearanceComponent? appearance)) { @@ -51,7 +53,7 @@ namespace Content.Server.GameObjects.Components.Nutrition void IThrowCollide.HitBy(ThrowCollideEventArgs eventArgs) { - if (CreamPied || eventArgs.Thrown.Deleted || !eventArgs.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return; + if (eventArgs.Thrown.Deleted || !eventArgs.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return; CreamPied = true; Owner.PopupMessage(Loc.GetString("You have been creamed by {0:theName}!", eventArgs.Thrown));