Merge branch 'master' into harvester

AdventureTimeSS14 · Jan 7, 2025 · ad91f43 · ad91f43
2 parents 3cc7b59 + 77894b4
commit ad91f43
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Content.Server/EntityEffects/Effects/Ignite.cs b/Content.Server/EntityEffects/Effects/Ignite.cs
@@ -1,3 +1,4 @@
+using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Shared.Database;
 using Content.Shared.EntityEffects;
@@ -20,6 +21,11 @@ public sealed partial class Ignite : EntityEffect
     public override void Effect(EntityEffectBaseArgs args)
     {
         var flamSys = args.EntityManager.System<FlammableSystem>();
+        // ADT Fix start
+        if (!args.EntityManager.HasComponent<FlammableComponent>(args.TargetEntity))
+            return;
+        // ADT Fix end
+
         if (args is EntityEffectReagentArgs reagentArgs)
         {
             flamSys.Ignite(reagentArgs.TargetEntity, reagentArgs.OrganEntity ?? reagentArgs.TargetEntity);