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
+7
View File
@@ -1860,6 +1860,8 @@ namespace Barotrauma.Networking
break; break;
case ChatMessageType.Radio: case ChatMessageType.Radio:
if (!receiver.IsDead) if (!receiver.IsDead)
{
if (receiver.Inventory != null)
{ {
var receiverItem = receiver.Inventory.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null); var receiverItem = receiver.Inventory.Items.FirstOrDefault(i => i?.GetComponent<WifiComponent>() != null);
//client doesn't have a radio -> don't send //client doesn't have a radio -> don't send
@@ -1875,6 +1877,11 @@ namespace Barotrauma.Networking
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;
} }