Unstable 0.1400.3.0 (Bad sleep schedule edition)

2021-06-03 03:34:18 +03:00
parent 0b3fb5e440
commit de04525d51
47 changed files with 703 additions and 213 deletions
@@ -637,7 +637,7 @@ namespace Barotrauma
                        impactQueue.Enqueue(new Impact(f1, f2, contact, velocity));
                    }
                }
-                return true;
+                return !f2.IsSensor;
            }

            Vector2 colliderBottom = GetColliderBottom();
@@ -1541,6 +1541,7 @@ namespace Barotrauma
                    case Physics.CollisionLevel:
                        if (!fixture.CollidesWith.HasFlag(Physics.CollisionCharacter)) { return -1; }
                        if (fixture.Body.UserData is Submarine && character.Submarine != null) { return -1; }
+                        if (fixture.IsSensor) { return -1; }
                        if (fraction < standOnFloorFraction)
                        {
                            standOnFloorFraction = fraction;