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

Barotrauma/BarotraumaClient/Source/Characters/Character.cs

@@ -327,6 +327,8 @@ namespace Barotrauma
             debugInteractablesAtCursor.Clear();
             debugInteractablesNearCursor.Clear();
 
+            bool draggingItemToWorld = CharacterInventory.DraggingItemToWorld;
+
             //reduce the amount of aim assist if an item has been selected 
             //= can't switch selection to another item without deselecting the current one first UNLESS the cursor is directly on the item
             //otherwise it would be too easy to accidentally switch the selected item when rewiring items
@@ -348,6 +350,15 @@ namespace Barotrauma
                 if (item.body != null && !item.body.Enabled) continue;
                 if (item.ParentInventory != null) continue;
                 if (ignoredItems != null && ignoredItems.Contains(item)) continue;
+
+                if (draggingItemToWorld)
+                {
+                    if (item.OwnInventory == null || 
+                        !item.OwnInventory.CanBePut(CharacterInventory.draggingItem))
+                    {
+                        continue;
+                    }
+                }
                 
                 float distanceToItem = float.PositiveInfinity;
                 if (item.IsInsideTrigger(displayPosition, out Rectangle transformedTrigger))

Barotrauma/BarotraumaClient/Source/Characters/CharacterHUD.cs

@@ -248,7 +248,7 @@ namespace Barotrauma
                             scale: scale);
                     }
 
-                    if (!GUI.DisableItemHighlights)
+                    if (!GUI.DisableItemHighlights && !Inventory.DraggingItemToWorld)
                     {
                         var hudTexts = focusedItem.GetHUDTexts(character);