tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix disarm resolve error (#10354)

Browse Source
This commit is contained in:
metalgearsloth
2022-08-06 14:48:58 +10:00
committed by GitHub
parent b381255302
commit 74d13646f7
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Contests/ContestsSystem.cs
View File

@@ -75,10 +75,7 @@ namespace Content.Server.Contests
/// <summary> /// <summary>
public float StaminaContest(EntityUid roller, EntityUid target, StaminaComponent? rollerStamina = null, StaminaComponent? targetStamina = null) public float StaminaContest(EntityUid roller, EntityUid target, StaminaComponent? rollerStamina = null, StaminaComponent? targetStamina = null)
{ {
if (!Resolve(roller, ref rollerStamina) || !Resolve(target, ref targetStamina)) if (!Resolve(roller, ref rollerStamina, false) || !Resolve(target, ref targetStamina, false))
return 1f;
if (rollerStamina == null || targetStamina == null)
return 1f; return 1f;
var rollerDamageScore= rollerStamina.StaminaDamage / rollerStamina.CritThreshold; var rollerDamageScore= rollerStamina.StaminaDamage / rollerStamina.CritThreshold;