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

Fix component generic usages where IComponent would not be valid (#19482)

Browse Source
This commit is contained in:
DrSmugleaf
2023-08-24 03:10:55 -07:00
committed by GitHub
parent e42148f433
commit 35107f7c2b
27 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs
View File

@@ -26,7 +26,7 @@ namespace Content.Server.Damage.Systems
return;
if (component.WeldingDamage is {} weldingDamage
&& EntityManager.TryGetComponent<WelderComponent?>(args.Used, out var welder)
&& EntityManager.TryGetComponent(args.Used, out WelderComponent? welder)
&& welder.Lit
&& !welder.TankSafe)
{
@@ -39,7 +39,7 @@ namespace Content.Server.Damage.Systems
args.Handled = true;
}
else if (component.DefaultDamage is {} damage
&& EntityManager.TryGetComponent<ToolComponent?>(args.Used, out var tool)
&& EntityManager.TryGetComponent(args.Used, out ToolComponent? tool)
&& tool.Qualities.ContainsAny(component.Tools))
{
var dmg = _damageableSystem.TryChangeDamage(args.Target, damage, origin: args.User);