Merge pull request #9 from Regalis11/master

0.14.9.0
2021-08-25 13:18:02 -03:00
parent 5ffe372908 265a2e7ab3
commit 970ee8a93f
140 changed files with 1448 additions and 621 deletions
@@ -264,9 +264,17 @@ namespace Barotrauma.Networking
        {
            radio = null;
            if (sender?.Inventory == null || sender.Removed) { return false; }
-            radio = sender.Inventory.AllItems.FirstOrDefault(i => i.GetComponent<WifiComponent>() != null)?.GetComponent<WifiComponent>();
-            if (radio?.Item == null) { return false; }
-            return sender.HasEquippedItem(radio.Item) && radio.CanTransmit();
+
+            foreach (Item item in sender.Inventory.AllItems)
+            {
+                var wifiComponent = item.GetComponent<WifiComponent>();
+                if (wifiComponent == null || !wifiComponent.CanTransmit() || !sender.HasEquippedItem(item)) { continue; }
+                if (radio == null || wifiComponent.Range > radio.Range)
+                {
+                    radio = wifiComponent;
+                }
+            }
+            return radio?.Item != null;
        }
    }
 }