No blood regen when starving/parched

Simple-Station · Oct 4, 2024 · 9574ad1 · 9574ad1
1 parent 88fca15
commit 9574ad1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs
@@ -513,8 +513,8 @@ private bool TryDoNaturalRegeneration(Entity<BloodstreamComponent> ent, Solution
         // First, check if the entity has enough hunger/thirst
         var hungerComp = CompOrNull<HungerComponent>(ent);
         var thirstComp = CompOrNull<ThirstComponent>(ent);
-        if (usedHunger > 0 && hungerComp is not null && hungerComp.CurrentHunger < usedHunger
-            ||  usedThirst > 0 && thirstComp is not null && thirstComp.CurrentThirst < usedThirst)
+        if (usedHunger > 0 && hungerComp is not null && (hungerComp.CurrentHunger < usedHunger || hungerComp.CurrentThreshold <= HungerThreshold.Starving)
+            ||  usedThirst > 0 && thirstComp is not null && (thirstComp.CurrentThirst < usedThirst || thirstComp.CurrentThirstThreshold <= ThirstThreshold.Parched))
             return false;
 
         // Then actually expend hunger and thirst (if necessary) and regenerate blood.