(86c9256b3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-05-18 17:35:10 +03:00
parent 65a914e5ed
commit f1d794cb39
21 changed files with 241 additions and 162 deletions
@@ -168,7 +168,11 @@ namespace Barotrauma.Items.Components
            }
            else
            {
-                FixBody(user, deltaTime, degreeOfSuccess, Submarine.PickBody(rayStart, rayEnd, ignoredBodies, collisionCategories, ignoreSensors: false, allowInsideFixture: true));
+                FixBody(user, deltaTime, degreeOfSuccess, 
+                    Submarine.PickBody(rayStart, rayEnd, 
+                    ignoredBodies, collisionCategories, ignoreSensors: false, 
+                    customPredicate: (Fixture f) => { return f?.Body?.UserData != null; },
+                    allowInsideFixture: true));
            }
            
            if (ExtinguishAmount > 0.0f && item.CurrentHull != null)