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

More portal fixes (#13359)

Browse Source 
fixes https://github.com/space-wizards/space-station-14/issues/13338
fixes https://github.com/space-wizards/space-station-14/issues/13337
This commit is contained in:
Kara
2023-01-06 17:13:22 -06:00
committed by GitHub
parent d491980407
commit 7fcec9e3bc
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Explosion/Components/TriggerOnCollideComponent.cs
View File

@@ -5,5 +5,11 @@ namespace Content.Server.Explosion.Components
{
[DataField("fixtureID", required: true)]
public string FixtureID = String.Empty;
/// <summary>
/// Doesn't trigger if the other colliding fixture is nonhard.
/// </summary>
[DataField("ignoreOtherNonHard")]
public bool IgnoreOtherNonHard = true;
}
}

2
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -102,7 +102,7 @@ namespace Content.Server.Explosion.EntitySystems
private void OnTriggerCollide(EntityUid uid, TriggerOnCollideComponent component, ref StartCollideEvent args)
{
if(args.OurFixture.ID == component.FixtureID)
if(args.OurFixture.ID == component.FixtureID && (!component.IgnoreOtherNonHard || args.OtherFixture.Hard))
Trigger(component.Owner);
}