Disable aiming with holdable items when using a (railgun) controller, syncing ViewTargetID properly between clients, dropping connected wires when a button is picked up, placing large InterestingPositions on the main path through the level

2016-02-13 23:26:50 +02:00
parent 9b6dd5da00
commit ea6824a60d
7 changed files with 88 additions and 43 deletions
@@ -301,7 +301,7 @@ namespace Barotrauma
        {
            Structure structure = f2.Body.UserData as Structure;

-            if (f2.Body.UserData as SubmarineBody != null) return true;
+            if (f2.Body.UserData as Submarine != null && character.Submarine == f2.Body.UserData as Submarine) return false;
            
            //always collides with bodies other than structures
            if (structure == null)