(869ac975f) Merge branch 'master' into dev

Barotrauma/BarotraumaServer/Source/DebugConsole.cs

@@ -167,7 +167,8 @@ namespace Barotrauma
                         RewriteInputToCommandLine(input);
                     }
                     
-                    Thread.Yield();
+                    //TODO: be more clever about it
+                    Thread.Sleep(10); //sleep for 10ms to not pin the CPU super hard
                 }
             }
             catch (ThreadAbortException)

Barotrauma/BarotraumaServer/Source/Networking/GameServer.cs

@@ -93,6 +93,10 @@ namespace Barotrauma.Networking
         {
             name = name.Replace(":", "");
             name = name.Replace(";", "");
+            if (name.Length > NetConfig.ServerNameMaxLength)
+            {
+                name = name.Substring(0, NetConfig.ServerNameMaxLength);
+            }
             
             this.name = name;