(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -174,8 +174,8 @@ namespace Barotrauma.Networking
            get { return name; }
            set
            {
-                if (string.IsNullOrEmpty(value)) return;
-                name = value;
+                if (string.IsNullOrEmpty(value)) { return; }
+                name = value.Replace(":", "").Replace(";", "");
            }
        }