Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing health alerts not properly updating when players are damaged (#13480)

Browse Source
This commit is contained in:
Jezithyr
2023-01-14 23:52:20 -08:00
committed by GitHub
parent 6b2a132ceb
commit 2e0121b21e
14 changed files with 105 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Alert/AlertsSystem.cs
View File

@@ -19,7 +19,7 @@ public abstract class AlertsSystem : EntitySystem
public short GetSeverityRange(AlertType alertType)
{
var minSeverity = _typeToAlert[alertType].MinSeverity;
return (short)MathF.Min(minSeverity,_typeToAlert[alertType].MaxSeverity - minSeverity);
return (short)MathF.Max(minSeverity,_typeToAlert[alertType].MaxSeverity - minSeverity);
}
public short GetMaxSeverity(AlertType alertType)

2
Content.Shared/Mobs/Systems/MobThresholdSystem.cs
View File

@@ -301,8 +301,6 @@ public sealed class MobThresholdSystem : EntitySystem
var severity = _alerts.GetMinSeverity(AlertType.HumanHealth);
if (TryGetIncapPercentage(target, damageable.TotalDamage, out var percentage))
{
severity = (short) MathF.Floor(percentage.Value.Float() *
_alerts.GetSeverityRange(AlertType.HumanHealth));
severity += _alerts.GetMinSeverity(AlertType.HumanHealth);