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

Escape inventory refactor (#10203)

Browse Source
This commit is contained in:
Rane
2022-08-10 04:37:20 -04:00
committed by GitHub
parent 49986231ca
commit e81510bf3e
3 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ namespace Content.Server.Contests
/// </summary>
public float MassContest(EntityUid roller, EntityUid target, PhysicsComponent? rollerPhysics = null, PhysicsComponent? targetPhysics = null)
{
if (!Resolve(roller, ref rollerPhysics) || !Resolve(target, ref targetPhysics))
if (!Resolve(roller, ref rollerPhysics, false) || !Resolve(target, ref targetPhysics, false))
return 1f;
if (rollerPhysics == null || targetPhysics == null)
@@ -43,7 +43,7 @@ namespace Content.Server.Contests
/// <summary>
public float DamageContest(EntityUid roller, EntityUid target, DamageableComponent? rollerDamage = null, DamageableComponent? targetDamage = null)
{
if (!Resolve(roller, ref rollerDamage) || !Resolve(target, ref targetDamage))
if (!Resolve(roller, ref rollerDamage, false) || !Resolve(target, ref targetDamage, false))
return 1f;
if (rollerDamage == null || targetDamage == null)