Merged branch master into new-netcode

2016-09-03 21:39:03 -03:00
parent 2ec26d783c ef49a946c9
commit bbc4a53e78
1 changed files with 3 additions and 1 deletions
--- a/Subsurface/Source/Networking/WhiteList.cs
+++ b/Subsurface/Source/Networking/WhiteList.cs
@@ -65,7 +65,9 @@ namespace Barotrauma.Networking
                    if (line[0] == '#')
                    {
                        string lineval = line.Substring(1, line.Length - 1);
-                        if (lineval.ToLower()=="true" || Convert.ToInt32(lineval)!=0)
+                        int intVal = 0;
+                        Int32.TryParse(lineval, out intVal);
+                        if (lineval.ToLower() == "true" || intVal != 0)
                        {
                            enabled = true;
                        }