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

Fixed exception when using radio chat without an inventory

Browse Source
This commit is contained in:
juanjp600
2018-01-19 14:03:31 -03:00
parent 965eef365b
commit ddaf5f21cf
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/GameServer.cs
+16 -9
View File
@@ -1861,19 +1861,26 @@ namespace Barotrauma.Networking
case ChatMessageType.Radio: case ChatMessageType.Radio:
if (!receiver.IsDead) if (!receiver.IsDead)
{ {
var receiverItem = receiver.Inventory.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null); if (receiver.Inventory != null)
//client doesn't have a radio -> don't send {
if (receiverItem == null) return ""; var receiverItem = receiver.Inventory.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null);
//client doesn't have a radio -> don't send
if (receiverItem == null) return "";
var senderItem = sender.Inventory.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null); var senderItem = sender.Inventory.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null);
if (senderItem == null) return ""; if (senderItem == null) return "";
var receiverRadio = receiverItem.GetComponent<WifiComponent>(); var receiverRadio = receiverItem.GetComponent<WifiComponent>();
var senderRadio = senderItem.GetComponent<WifiComponent>(); var senderRadio = senderItem.GetComponent<WifiComponent>();
if (!receiverRadio.CanReceive(senderRadio)) return ""; if (!receiverRadio.CanReceive(senderRadio)) return "";
return ChatMessage.ApplyDistanceEffect(receiverItem, senderItem, message, senderRadio.Range); return ChatMessage.ApplyDistanceEffect(receiverItem, senderItem, message, senderRadio.Range);
}
else
{
return ChatMessage.ApplyDistanceEffect(receiver, sender, message, ChatMessage.SpeakRange, 3.0f);
}
} }
break; break;
} }