Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make GetExplosionResistance event a struct (#20274)

Browse Source 
Also fixed a typo.
This commit is contained in:
metalgearsloth
2023-09-17 19:04:04 +10:00
committed by GitHub
parent 3be88f4680
commit e5d6d7f1eb
6 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs
View File

@@ -152,7 +152,7 @@ public sealed partial class ExplosionSystem : EntitySystem
continue;
var ev = new GetExplosionResistanceEvent(explosionType.ID);
RaiseLocalEvent(uid, ev, false);
RaiseLocalEvent(uid, ref ev);
damagePerIntensity += value * Math.Max(0, ev.DamageCoefficient);
}

2
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
View File

@@ -390,7 +390,7 @@ public sealed partial class ExplosionSystem : EntitySystem
if (damage != null && damageQuery.TryGetComponent(uid, out var damageable))
{
var ev = new GetExplosionResistanceEvent(id);
RaiseLocalEvent(uid, ev, false);
RaiseLocalEvent(uid, ref ev, false);
ev.DamageCoefficient = Math.Max(0, ev.DamageCoefficient);

13
Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
View File

@@ -76,7 +76,7 @@ public sealed partial class ExplosionSystem : EntitySystem
SubscribeLocalEvent<ExplosionResistanceComponent, GetExplosionResistanceEvent>(OnGetResistance);
// as long as explosion-resistance mice are never added, this should be fine (otherwise a mouse-hat will transfer it's power to the wearer).
SubscribeLocalEvent<ExplosionResistanceComponent, InventoryRelayedEvent<GetExplosionResistanceEvent>>((e, c, ev) => OnGetResistance(e, c, ev.Args));
SubscribeLocalEvent<ExplosionResistanceComponent, InventoryRelayedEvent<GetExplosionResistanceEvent>>(RelayedResistance);
SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
@@ -112,10 +112,17 @@ public sealed partial class ExplosionSystem : EntitySystem
_pathfindingSystem.PauseUpdating = false;
}
private void OnGetResistance(EntityUid uid, ExplosionResistanceComponent component, GetExplosionResistanceEvent args)
private void RelayedResistance(EntityUid uid, ExplosionResistanceComponent component,
InventoryRelayedEvent<GetExplosionResistanceEvent> args)
{
var a = args.Args;
OnGetResistance(uid, component, ref a);
}
private void OnGetResistance(EntityUid uid, ExplosionResistanceComponent component, ref GetExplosionResistanceEvent args)
{
args.DamageCoefficient *= component.DamageCoefficient;
if (component.Modifiers.TryGetValue(args.ExplotionPrototype, out var modifier))
if (component.Modifiers.TryGetValue(args.ExplosionPrototype, out var modifier))
args.DamageCoefficient *= modifier;
}