v0.11.0.9

2020-12-09 16:34:16 +02:00
parent bbf06f0984
commit f433a7ba10
325 changed files with 13947 additions and 3652 deletions
@@ -143,13 +143,15 @@ namespace Barotrauma.Items.Components
        public override void Update(float deltaTime, Camera cam)
        {
            if (!item.body.Enabled) { impactQueue.Clear(); return; }
-            if (!picker.HasSelectedItem(item)) { impactQueue.Clear(); IsActive = false; }
+            if (picker == null && !picker.HasSelectedItem(item)) { impactQueue.Clear(); IsActive = false; }

            while (impactQueue.Count > 0)
            {
                var impact = impactQueue.Dequeue();
                HandleImpact(impact.Body);
            }
+            //in case handling the impact does something to the picker
+            if (picker == null) { return; }

            reloadTimer -= deltaTime;
            if (reloadTimer < 0) { reloadTimer = 0; }