Unstable 0.1400.0.0

2021-05-11 15:47:47 +03:00
parent 3f324b14e8
commit 92f0264af2
247 changed files with 8238 additions and 1911 deletions
@@ -174,6 +174,11 @@ namespace Barotrauma
                    float simWidth  = ConvertUnits.ToSimUnits(width);
                    float simHeight = ConvertUnits.ToSimUnits(height);

+                    if (sub.FlippedX)
+                    {
+                        simPos.X = -simPos.X;
+                    }
+
                    if (width > 0.0f && height > 0.0f)
                    {
                        item.StaticFixtures.Add(farseerBody.CreateRectangle(simWidth, simHeight, 5.0f, simPos));
@@ -513,7 +518,7 @@ namespace Barotrauma
            {
                return CheckCharacterCollision(contact, character);
            }
-            else if (f2.UserData is Items.Components.DockingPort)
+            else if (f1.UserData is Items.Components.DockingPort || f2.UserData is Items.Components.DockingPort)
            {
                return false;
            }