Unstable 0.1300.0.9

2021-04-13 16:58:13 +03:00
parent 86597456ca
commit f48dfb5862
30 changed files with 245 additions and 57 deletions
@@ -612,10 +612,11 @@ namespace Barotrauma
            set
            {
 #if CLIENT
-                HintManager.OnSetSelectedConstruction(this, _selectedConstruction, value);
+                var prevSelectedConstruction = _selectedConstruction;
 #endif
                _selectedConstruction = value;
 #if CLIENT
+                HintManager.OnSetSelectedConstruction(this, prevSelectedConstruction, _selectedConstruction);
                if (Controlled == this)
                {
                    if (_selectedConstruction == null)
@@ -3815,6 +3816,10 @@ namespace Barotrauma
                        }
                    }
                }
+                else
+                {
+                    canBePutInOriginalInventory = inventory.CanBePut(newItem, slotIndices[0]);
+                }

                if (canBePutInOriginalInventory)
                {