Projectiles Now check for Hard (#1397)

2020-07-17 04:45:35 -04:00
parent a5051c549b
commit 938b23ee49
1 changed files with 9 additions and 0 deletions
--- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
+++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
@@ -63,6 +63,15 @@ namespace Content.Server.GameObjects.Components.Projectiles
        /// <param name="entity"></param>
        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>())
            {
                EntitySystem.Get<AudioSystem>().PlayAtCoords(_soundHitSpecies, entity.Transform.GridPosition);