vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

Browse Source
This commit is contained in:
EvilFactory
2023-10-19 12:18:30 -03:00
parent 966236652a 331565f726
commit 9838cc59ee
613 changed files with 22122 additions and 11481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs
+4 -4
View File
@@ -277,12 +277,12 @@ namespace Barotrauma.Networking
return length;
}
public static bool CanUseRadio(Character sender)
public static bool CanUseRadio(Character sender, bool ignoreJamming = false)
{
return CanUseRadio(sender, out _);
return CanUseRadio(sender, out _, ignoreJamming);
}
public static bool CanUseRadio(Character sender, out WifiComponent radio)
public static bool CanUseRadio(Character sender, out WifiComponent radio, bool ignoreJamming = false)
{
radio = null;
if (sender?.Inventory == null || sender.Removed) { return false; }
@@ -290,7 +290,7 @@ namespace Barotrauma.Networking
foreach (Item item in sender.Inventory.AllItems)
{
var wifiComponent = item.GetComponent<WifiComponent>();
if (wifiComponent == null || !wifiComponent.LinkToChat || !wifiComponent.CanTransmit() || !sender.HasEquippedItem(item)) { continue; }
if (wifiComponent == null || !wifiComponent.LinkToChat || !wifiComponent.CanTransmit(ignoreJamming) || !sender.HasEquippedItem(item)) { continue; }
if (radio == null || wifiComponent.Range > radio.Range)
{
radio = wifiComponent;