Unstable 0.1300.0.7

2021-04-07 15:24:22 +03:00
parent 96b2184811
commit 538c3dbfc3
47 changed files with 246 additions and 103 deletions
@@ -695,6 +695,7 @@ namespace Barotrauma
                if (firstItem != null && !DraggingItems.Contains(firstItem) && Character.Controlled?.Inventory == this &&
                    GUI.KeyboardDispatcher.Subscriber == null && !CrewManager.IsCommandInterfaceOpen && PlayerInput.InventoryKeyHit(visualSlots[i].InventoryKeyIndex))
                {
+                    if (SubEditorScreen.IsSubEditor() && SubEditorScreen.SkipInventorySlotUpdate) { continue; }
 #if LINUX
                    // some window managers on Linux use windows key + number to change workspaces or perform other actions
                    if (PlayerInput.KeyDown(Keys.RightWindows) || PlayerInput.KeyDown(Keys.LeftWindows)) { continue; }
@@ -587,7 +587,7 @@ namespace Barotrauma.Items.Components
            //ID ushort.MaxValue = launched without a projectile
            if (projectileID == ushort.MaxValue)
            {
-                Launch(null);
+                Launch(null, user);
            }
            else
            {
@@ -596,7 +596,7 @@ namespace Barotrauma.Items.Components
                    DebugConsole.ThrowError("Failed to launch a projectile - item with the ID \"" + projectileID + " not found");
                    return;
                }
-                Launch(projectile, launchRotation: newTargetRotation);
+                Launch(projectile, user, launchRotation: newTargetRotation);
            }
        }
    }