Merge branch 'master' into new-netcode

Conflicts: Subsurface/Properties/AssemblyInfo.cs
2017-02-22 23:33:14 +02:00
parent 75d047b57e 5006a9af6c
commit 3fcaff0288
23 changed files with 82 additions and 46 deletions
--- a/Subsurface/Source/Networking/NetworkMember.cs
+++ b/Subsurface/Source/Networking/NetworkMember.cs
@@ -188,6 +188,7 @@ namespace Barotrauma.Networking
            if (radio == null || !sender.HasEquippedItem(radio)) return false;
                       
            var radioComponent = radio.GetComponent<WifiComponent>();
+            if (radioComponent == null) return false;
            return radioComponent.HasRequiredContainedItems(false);
        }