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

Projectiles Now check for Hard (#1397)

Browse Source
This commit is contained in:
Alex S
2020-07-17 04:45:35 -04:00
committed by GitHub
parent a5051c549b
commit 938b23ee49
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
View File

@@ -63,6 +63,15 @@ namespace Content.Server.GameObjects.Components.Projectiles
/// <param name="entity"></param> /// <param name="entity"></param>
void ICollideBehavior.CollideWith(IEntity entity) void ICollideBehavior.CollideWith(IEntity entity)
{ {
// This is so entities that shouldn't get a collision are ignored.
if (entity.TryGetComponent(out ICollidableComponent collidable) && collidable.Hard == false)
{
_deleteOnCollide = false;
return;
}
else
_deleteOnCollide = true;
if (_soundHitSpecies != null && entity.HasComponent<SpeciesComponent>()) if (_soundHitSpecies != null && entity.HasComponent<SpeciesComponent>())
{ {
EntitySystem.Get<AudioSystem>().PlayAtCoords(_soundHitSpecies, entity.Transform.GridPosition); EntitySystem.Get<AudioSystem>().PlayAtCoords(_soundHitSpecies, entity.Transform.GridPosition);