diff --git a/Content.Server/EntityEffects/EntityEffectSystem.cs b/Content.Server/EntityEffects/EntityEffectSystem.cs index 54270ca53d..1277c8df59 100644 --- a/Content.Server/EntityEffects/EntityEffectSystem.cs +++ b/Content.Server/EntityEffects/EntityEffectSystem.cs @@ -133,7 +133,7 @@ public sealed class EntityEffectSystem : EntitySystem args.Result = false; if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp)) { - if (temp.CurrentTemperature > args.Condition.Min && temp.CurrentTemperature < args.Condition.Max) + if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max) args.Result = true; } } diff --git a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs index a9629401a0..e2febd8f48 100644 --- a/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs +++ b/Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs @@ -13,17 +13,14 @@ public sealed partial class SolutionTemperature : EntityEffectCondition [DataField] public float Max = float.PositiveInfinity; + public override bool Condition(EntityEffectBaseArgs args) { if (args is EntityEffectReagentArgs reagentArgs) { - if (reagentArgs.Source == null) - return false; - if (reagentArgs.Source.Temperature < Min) - return false; - if (reagentArgs.Source.Temperature > Max) - return false; - return true; + return reagentArgs?.Source != null && + reagentArgs.Source.Temperature >= Min && + reagentArgs.Source.Temperature <= Max; } // TODO: Someone needs to figure out how to do this for non-reagent effects. diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs index 62b3e037e1..a4baeb634a 100644 --- a/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs +++ b/Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs @@ -18,8 +18,7 @@ public sealed partial class TotalDamage : EntityEffectCondition if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage)) { var total = damage.TotalDamage; - if (total > Min && total < Max) - return true; + return total >= Min && total <= Max; } return false; diff --git a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs index b4f1a1af89..cbeb334c47 100644 --- a/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs +++ b/Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs @@ -18,8 +18,7 @@ public sealed partial class Hunger : EntityEffectCondition if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger)) { var total = args.EntityManager.System().GetHunger(hunger); - if (total > Min && total < Max) - return true; + return total >= Min && total <= Max; } return false;