(fdc49c8c) Unstable 0.9.7.1

2020-02-29 14:45:16 -03:00
parent 27e10f7c2e
commit c81486a993
74 changed files with 666 additions and 468 deletions
@@ -405,9 +405,24 @@ namespace Barotrauma.Items.Components
        {
            if (User != null && User.Removed) { User = null; return false; }
            if (IgnoredBodies.Contains(target.Body)) { return false; }
-            if (target.Body.UserData is Submarine submarine)
+            if (target.Body.UserData is Submarine sub)
            {
-                return !Hitscan;
+                Vector2 dir = item.body.LinearVelocity.LengthSquared() < 0.001f ?
+                    contact.Manifold.LocalNormal : Vector2.Normalize(item.body.LinearVelocity);
+
+                //do a raycast in the sub's coordinate space to see if it hit a structure
+                var wallBody = Submarine.PickBody(
+                    item.body.SimPosition - ConvertUnits.ToSimUnits(sub.Position) - dir,
+                    item.body.SimPosition - ConvertUnits.ToSimUnits(sub.Position) + dir,
+                    collisionCategory: Physics.CollisionWall);
+                if (wallBody?.FixtureList?.First() != null && wallBody.UserData is Structure structure)
+                {
+                    target = wallBody.FixtureList.First();
+                }
+                else
+                {
+                    return false;
+                }
            }
            else if (target.Body.UserData is Limb limb)
            {