From 51f5420f9ea0062665b10a6567552d177b93f541 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Sat, 13 Nov 2021 17:04:13 +0100 Subject: [PATCH] Removes the replacement of spaces to underscores for the cleanString method --- src/main/java/net/knarcraft/stargate/portal/Portal.java | 3 +-- .../java/net/knarcraft/stargate/portal/PortalSignDrawer.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/portal/Portal.java b/src/main/java/net/knarcraft/stargate/portal/Portal.java index 72463cf..6a66e80 100644 --- a/src/main/java/net/knarcraft/stargate/portal/Portal.java +++ b/src/main/java/net/knarcraft/stargate/portal/Portal.java @@ -304,8 +304,7 @@ public class Portal { * @return

The clean string

*/ public static String cleanString(String string) { - string = ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', string)); - return string.toLowerCase().replace(' ', '_'); + return ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', string)).toLowerCase(); } @Override diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java index 31b72f2..a09b732 100644 --- a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java +++ b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java @@ -247,7 +247,7 @@ public class PortalSignDrawer { * @param sign

The sign to re-draw

*/ private void drawFixedSign(Sign sign) { - Portal destinationPortal = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()), + Portal destinationPortal = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()), portal.getCleanNetwork()); String destinationName = portal.getOptions().isRandom() ? Stargate.getString("signRandom") : (destinationPortal != null ? destinationPortal.getName() : portal.getDestinationName()); @@ -259,7 +259,7 @@ public class PortalSignDrawer { setLine(sign, 2, highlightColor + "(" + mainColor + fixColor(portal.getNetwork()) + highlightColor + ")"); } - Portal destination = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()), + Portal destination = PortalHandler.getByName(Portal.cleanString(portal.getDestinationName()), portal.getNetwork()); if (destination == null && !portal.getOptions().isRandom()) { setLine(sign, 3, errorColor + Stargate.getString("signDisconnected"));