(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -338,9 +338,15 @@ namespace Barotrauma.Items.Components
                canPlaceNode = true;
            }

+            Vector2 relativeNodePos = newNodePos - item.Position;
+            if (sub != null)
+            {
+                relativeNodePos += sub.HiddenSubPosition;
+            }
+
            sectionExtents = new Vector2(
-                Math.Max(Math.Abs((newNodePos.X + sub.HiddenSubPosition.X) - item.Position.X), sectionExtents.X),
-                Math.Max(Math.Abs((newNodePos.Y + sub.HiddenSubPosition.Y) - item.Position.Y), sectionExtents.Y));
+                Math.Max(Math.Abs(relativeNodePos.X), sectionExtents.X),
+                Math.Max(Math.Abs(relativeNodePos.Y), sectionExtents.Y));
        }
        
        public override bool Use(float deltaTime, Character character = null)