Fixed 2 test fails (#123)

SerbiaStrong-220 · Jul 22, 2023 · 4ecd6c8 · 4ecd6c8
1 parent 0acdd1b
commit 4ecd6c8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Proximity.cs
@@ -68,7 +68,7 @@ private void OnMapInit(EntityUid uid, TriggerOnProximityComponent component, Map
             collisionLayer: component.Layer);
     }
 
-    private bool ShouldCollideThroughWall(EntityUid uid, TriggerOnProximityComponent component,ref StartCollideEvent args)
+    private bool ShouldCollideThroughWall(EntityUid uid, TriggerOnProximityComponent component, ref StartCollideEvent args)
     {
         if (component.TriggerBehindWall)
             return true;
@@ -77,14 +77,19 @@ private bool ShouldCollideThroughWall(EntityUid uid, TriggerOnProximityComponent
         if (TryComp<TransformComponent>(uid, out var entTransform) &&
                 TryComp<TransformComponent>(args.OtherBody.Owner, out var otherTranform))
         {
-            SharedPhysicsSystem physSystem = EntityManager.System<SharedPhysicsSystem>();
+            var physSystem = EntityManager.System<SharedPhysicsSystem>();
 
             var startPos = otherTranform.MapPosition.Position;
             var endPos = entTransform.MapPosition.Position;
 
             float distance = (startPos - endPos).Length();
+            var direction = (endPos - startPos).Normalized();
 
-            var rayRes = physSystem.IntersectRay(otherTranform.MapID, new CollisionRay(startPos, (endPos - startPos).Normalized(), (int)CollisionGroup.Impassable), distance/2).ToList();
+            // If entity that caused activation is so close that direction becomes non-1, we assume that it can collide
+            if (!MathHelper.CloseToPercent(direction.LengthSquared(), 1))
+                return true;
+
+            var rayRes = physSystem.IntersectRay(otherTranform.MapID, new CollisionRay(startPos, direction, (int)CollisionGroup.Impassable), distance/2).ToList();
 
             if (!rayRes.Any())
                 return true;

diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml
@@ -41,7 +41,7 @@
             Chaplain: [ 1, 1 ]
             Warden: [ 1, 1 ]
             Librarian: [ 1, 1 ]
-            Lawyer: [ 2, 2 ]
+            IAA: [ 1, 1 ]
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
             Musician: [ 1, 1 ]