From 74d13646f745bc103a77caaea2682bbe225f3f0f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 6 Aug 2022 14:48:58 +1000 Subject: [PATCH] Fix disarm resolve error (#10354) --- Content.Server/Contests/ContestsSystem.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Content.Server/Contests/ContestsSystem.cs b/Content.Server/Contests/ContestsSystem.cs index 05ada4b0cd..114b927cdf 100644 --- a/Content.Server/Contests/ContestsSystem.cs +++ b/Content.Server/Contests/ContestsSystem.cs @@ -75,10 +75,7 @@ namespace Content.Server.Contests /// public float StaminaContest(EntityUid roller, EntityUid target, StaminaComponent? rollerStamina = null, StaminaComponent? targetStamina = null) { - if (!Resolve(roller, ref rollerStamina) || !Resolve(target, ref targetStamina)) - return 1f; - - if (rollerStamina == null || targetStamina == null) + if (!Resolve(roller, ref rollerStamina, false) || !Resolve(target, ref targetStamina, false)) return 1f; var rollerDamageScore= rollerStamina.StaminaDamage / rollerStamina.CritThreshold;