Merge branch 'master' into eventMode

# Conflicts:
#	src/de/steamwar/bungeecore/SubserverSystem.java

src/de/steamwar/bungeecore/SubserverSystem.java

@@ -91,8 +91,12 @@ public class SubserverSystem {
         //Generate missing parameters
         int port = freePort(firstArenaPort);
 
-        if(serverName == null)
+        if(serverName == null){
+            if(ranked)
+                serverName = "Ranked" + (port - firstArenaPort);
+            else
                 serverName = modus.getDisplayName() + (port - firstArenaPort);
+        }
         if(mapName == null)
             mapName = serverName;
 

src/de/steamwar/bungeecore/commands/RankedCommand.java

@@ -165,12 +165,11 @@ public class RankedCommand extends BasicCommand {
                 removeFromAll(wp1.player);
                 removeFromAll(wp2.player);
 
-                String serverName = wp1.player.getName() + " vs " + wp2.player.getName();
-                Subserver arena = SubserverSystem.startArena(mode, mode.getRandomMap(), 0, 0, serverName, serverName.replace(' ', '_'), wp1.player.getUniqueId(), wp2.player.getUniqueId(), true);
+                Subserver arena = SubserverSystem.startArena(mode, mode.getRandomMap(), 0, 0, null, null, wp1.player.getUniqueId(), wp2.player.getUniqueId(), true);
                 arena.sendPlayer(wp1.player);
                 arena.sendPlayer(wp2.player);
 
-                BungeeCore.broadcast(BungeeCore.CHAT_PREFIX + "§7" + mode.getDisplayName() + "§8-§7Ranglistenspiel§8: §e" + serverName,
+                BungeeCore.broadcast(BungeeCore.CHAT_PREFIX + "§7" + mode.getDisplayName() + "§8-§7Ranglistenspiel§8: §e" + wp1.player.getName() + " vs " + wp2.player.getName(),
                         "§aZuschauen",
                         new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + wp1.player.getName()));
             }