From 5dbb9fdf3f0c1f2df31e09a43b19b4b096a236f8 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 21 Aug 2018 09:45:54 -0400
Subject: [PATCH] Final tweaks, ready to merge

---
 core/src/io/anuke/mindustry/core/NetServer.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index f8ebc5986d..d792d56d9b 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -507,7 +507,12 @@ public class NetServer extends Module{
             }
         }
 
-        return name.substring(0, Math.min(name.length(), maxNameLength));
+        StringBuilder result = new StringBuilder();
+        int curChar = 0;
+        while(curChar < name.length() && result.toString().getBytes().length < maxNameLength){
+            result.append(name.charAt(curChar++));
+        }
+        return result.toString();
     }
 
     String checkColor(String str){