Fix newline pattern conflicting with new chatcolors

CitizensDev · Jun 11, 2020 · cc91489 · cc91489
1 parent 5ae1b4a
commit cc91489
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/command/CommandContext.java b/src/main/java/net/citizensnpcs/api/command/CommandContext.java
@@ -211,10 +211,11 @@ public String[] getPaddedSlice(int index, int padding) {
     public Location getSenderLocation() throws CommandException {
         if (location != null || sender == null)
             return location;
-        if (sender instanceof Player)
+        if (sender instanceof Player) {
             location = ((Player) sender).getLocation();
-        else if (sender instanceof BlockCommandSender)
+        } else if (sender instanceof BlockCommandSender) {
             location = ((BlockCommandSender) sender).getBlock().getLocation();
+        }
         if (hasValueFlag("location")) {
             location = parseLocation(location, getFlag("location"));
         }

diff --git a/src/main/java/net/citizensnpcs/api/util/Messaging.java b/src/main/java/net/citizensnpcs/api/util/Messaging.java
@@ -21,7 +21,6 @@
 import com.google.common.base.Splitter;
 
 import net.citizensnpcs.api.npc.NPC;
-import net.citizensnpcs.api.trait.trait.Owner;
 
 public class Messaging {
     private static class DebugFormatter extends Formatter {
@@ -111,7 +110,7 @@ private static String prettify(String message) {
         }
         message = message.replace("[[", HIGHLIGHT_COLOUR);
         message = message.replace("{{", ERROR_COLOUR);
-        return CHAT_NEWLINE.matcher(message).replaceAll("<n>]]").replace("]]", messageColour);
+        return CHAT_NEWLINE.matcher(message).replaceAll("<br>]]").replace("]]", messageColour);
     }
 
     public static void send(CommandSender sender, Object... msg) {
@@ -169,7 +168,7 @@ public static String tryTranslate(Object possible) {
         return count >= 2 ? tr(message) : message;
     }
 
-    private static final Pattern CHAT_NEWLINE = Pattern.compile("<br>|<n>|\\n", Pattern.MULTILINE);
+    private static final Pattern CHAT_NEWLINE = Pattern.compile("<br>|\\n", Pattern.MULTILINE);
     private static final Splitter CHAT_NEWLINE_SPLITTER = Splitter.on(CHAT_NEWLINE);
     private static boolean DEBUG = false;
     private static Logger DEBUG_LOGGER;