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

OnTriggerCollide Bug fix (#8467)

Browse Source 
* ez gg dubskis

* meteor

* Update meteors.yml
This commit is contained in:
EmoGarbage404
2022-05-26 21:18:57 -04:00
committed by GitHub
parent c0d1700b97
commit 57639943a0
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,5 +3,7 @@ namespace Content.Server.Explosion.Components
[RegisterComponent] [RegisterComponent]
public sealed class TriggerOnCollideComponent : Component public sealed class TriggerOnCollideComponent : Component
{ {
[DataField("fixtureID", required: true)]
public string FixtureID = String.Empty;
} }
} }

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

@@ -72,7 +72,8 @@ namespace Content.Server.Explosion.EntitySystems
private void OnTriggerCollide(EntityUid uid, TriggerOnCollideComponent component, StartCollideEvent args) private void OnTriggerCollide(EntityUid uid, TriggerOnCollideComponent component, StartCollideEvent args)
{ {
Trigger(component.Owner); if(args.OurFixture.ID == component.FixtureID)
Trigger(component.Owner);
} }

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml
View File

@@ -14,6 +14,7 @@
- type: ExplodeOnTrigger - type: ExplodeOnTrigger
- type: DeleteOnTrigger - type: DeleteOnTrigger
- type: TriggerOnCollide - type: TriggerOnCollide
fixtureID: projectile
- type: Projectile - type: Projectile
damage: {} damage: {}
deleteOnCollide: false deleteOnCollide: false
@@ -32,6 +33,7 @@
radius: 0.8 radius: 0.8
mass: 200 mass: 200
hard: true hard: true
id: projectile
# Didn't use MapGrid for now as the bounds are stuffed. # Didn't use MapGrid for now as the bounds are stuffed.
layer: layer:
- LargeMobLayer - LargeMobLayer

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
View File

@@ -39,6 +39,7 @@
noSpawn: true noSpawn: true
components: components:
- type: TriggerOnCollide - type: TriggerOnCollide
fixtureID: projectile
- type: Projectile - type: Projectile
damage: damage:
types: types: