From b63b5f021c8b164d301b0de9efd1cb150cc9304c Mon Sep 17 00:00:00 2001 From: Lixfel Date: Fri, 30 Oct 2020 08:03:11 +0100 Subject: [PATCH] Shorten name for ranked matches Signed-off-by: Lixfel --- src/de/steamwar/bungeecore/SubserverSystem.java | 8 ++++++-- src/de/steamwar/bungeecore/commands/RankedCommand.java | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/bungeecore/SubserverSystem.java index 66493aa..1f83898 100644 --- a/src/de/steamwar/bungeecore/SubserverSystem.java +++ b/src/de/steamwar/bungeecore/SubserverSystem.java @@ -82,8 +82,12 @@ public class SubserverSystem { //Generate missing parameters int port = freePort(2500); - if(serverName == null) - serverName = modus.getDisplayName() + (port - 2500); + if(serverName == null){ + if(ranked) + serverName = "Ranked" + (port - 2500); + else + serverName = modus.getDisplayName() + (port - 2500); + } if(mapName == null) mapName = serverName; diff --git a/src/de/steamwar/bungeecore/commands/RankedCommand.java b/src/de/steamwar/bungeecore/commands/RankedCommand.java index 5626f09..3f0914a 100644 --- a/src/de/steamwar/bungeecore/commands/RankedCommand.java +++ b/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())); }