(5a377a8ee) Unstable v0.9.1000.0

2020-05-13 12:55:42 -03:00
parent b143329701
commit a1ca41aa5d
426 changed files with 14384 additions and 5708 deletions
@@ -65,7 +65,7 @@ namespace Barotrauma.Items.Components

            if (PickingTime > 0.0f)
            {
-                if (picker.PickingItem == null && PickingTime <= float.MaxValue)
+                if ((picker.PickingItem == null || picker.PickingItem == item) && PickingTime <= float.MaxValue)
                {
 #if SERVER
                    item.CreateServerEvent(this);