From 5917231176566cb890ec0d6a211de34258b42ebe Mon Sep 17 00:00:00 2001 From: benwoo1110 <30431861+benwoo1110@users.noreply.github.com> Date: Fri, 11 Dec 2020 11:56:49 +0800 Subject: [PATCH] Show world name for errored links. --- .../commands/ShowLinkCommand.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseNetherPortals/commands/ShowLinkCommand.java b/src/main/java/com/onarandombox/MultiverseNetherPortals/commands/ShowLinkCommand.java index c100a11..5bec8fb 100644 --- a/src/main/java/com/onarandombox/MultiverseNetherPortals/commands/ShowLinkCommand.java +++ b/src/main/java/com/onarandombox/MultiverseNetherPortals/commands/ShowLinkCommand.java @@ -79,20 +79,14 @@ public void runCommand(CommandSender sender, List args) { } private void showWorldLink(CommandSender sender, String fromWorldString, String toWorldString) { - MultiverseWorld fromWorld = this.worldManager.getMVWorld(fromWorldString); - MultiverseWorld toWorld = this.worldManager.getMVWorld(toWorldString); + sender.sendMessage(ParseWorldString(fromWorldString) + ChatColor.WHITE + " -> " + ParseWorldString(toWorldString)); + } - if (fromWorld == null) { - fromWorldString = ChatColor.RED + "!!ERROR!!"; - } else { - fromWorldString = fromWorld.getColoredWorldString(); - } - if (toWorld == null) { - toWorldString = ChatColor.RED + "!!ERROR!!"; - } else { - toWorldString = toWorld.getColoredWorldString(); - } - sender.sendMessage(fromWorldString + ChatColor.WHITE + " -> " + toWorldString); + private String ParseWorldString(String worldName) { + MultiverseWorld world = this.worldManager.getMVWorld(worldName); + return (world == null) + ? ChatColor.GRAY + worldName + ChatColor.RED + " !!ERROR!!" + : world.getColoredWorldString(); } private void showPage(int page, CommandSender sender, Map links, int totalpages, String headerLabel) {