From 0cb34858f88f9d0a0cf6566444b1c793825f5827 Mon Sep 17 00:00:00 2001
From: Vera Aguilera Puerto <gradientvera@outlook.com>
Date: Tue, 5 Oct 2021 11:14:44 +0200
Subject: [PATCH] Check if entity has FlammableComponent befor calling
 Extinguish on Rejuvenate.

---
 Content.Server/Administration/Commands/RejuvenateCommand.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Administration/Commands/RejuvenateCommand.cs b/Content.Server/Administration/Commands/RejuvenateCommand.cs
index 12616f563c..7fbf25380e 100644
--- a/Content.Server/Administration/Commands/RejuvenateCommand.cs
+++ b/Content.Server/Administration/Commands/RejuvenateCommand.cs
@@ -57,7 +57,10 @@ namespace Content.Server.Administration.Commands
             target.GetComponentOrNull<ThirstComponent>()?.ResetThirst();
             target.GetComponentOrNull<StunnableComponent>()?.ResetStuns();
 
-            EntitySystem.Get<FlammableSystem>().Extinguish(target.Uid);
+            if (target.TryGetComponent(out FlammableComponent? flammable))
+            {
+                EntitySystem.Get<FlammableSystem>().Extinguish(target.Uid, flammable);
+            }
 
             if (target.TryGetComponent(out DamageableComponent? damageable))
             {