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

Fix more errors, client and server now build

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-06 14:00:39 +01:00
parent 525297c5fe
commit af4eb3c7cd
32 changed files with 94 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Damage/Systems/DamageableSystem.cs
View File

@@ -145,7 +145,7 @@ namespace Content.Shared.Damage
/// Returns a <see cref="DamageSpecifier"/> with information about the actual damage changes. This will be
/// null if the user had no applicable components that can take damage.
/// </returns>
public DamageSpecifier? TryChangeDamage(EntityUid uid, DamageSpecifier damage, bool ignoreResistances = false,
public DamageSpecifier? TryChangeDamage(EntityUid? uid, DamageSpecifier damage, bool ignoreResistances = false,
bool interruptsDoAfters = true, bool logChange = false)
{
if (!EntityManager.TryGetComponent<DamageableComponent>(uid, out var damageable))
@@ -175,7 +175,7 @@ namespace Content.Shared.Damage
}
var ev = new DamageModifyEvent(damage);
RaiseLocalEvent(uid, ev, false);
RaiseLocalEvent(uid.Value, ev, false);
damage = ev.Damage;
if (damage.Empty)