From 69ab488c478e68e36ccc8b8563a6baef4ccdf17e Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Tue, 12 Jul 2016 23:15:47 +0100
Subject: [PATCH] Only store prefix in one place

---
 .../me/lucko/luckperms/listeners/PlayerListener.java   | 10 +++-------
 .../me/lucko/luckperms/listeners/PlayerListener.java   |  3 ++-
 .../main/java/me/lucko/luckperms/commands/Util.java    |  6 ++++--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bukkit/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java b/bukkit/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
index f4313040..c098d45c 100644
--- a/bukkit/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
+++ b/bukkit/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
@@ -3,9 +3,9 @@ package me.lucko.luckperms.listeners;
 import lombok.AllArgsConstructor;
 import me.lucko.luckperms.LPBukkitPlugin;
 import me.lucko.luckperms.commands.Util;
+import me.lucko.luckperms.constants.Message;
 import me.lucko.luckperms.users.BukkitUser;
 import me.lucko.luckperms.users.User;
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -22,7 +22,7 @@ public class PlayerListener implements Listener {
     public void onPlayerPreLogin(AsyncPlayerPreLoginEvent e) {
         if (!plugin.getDatastore().isAcceptingLogins()) {
             e.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER,
-                    color(Util.PREFIX + "Error whilst validating login with the network. \nPlease contact an administrator."));
+                    Util.color(Message.PREFIX + "Error whilst validating login with the network. \nPlease contact an administrator."));
             return;
         }
         plugin.getDatastore().loadOrCreateUser(e.getUniqueId(), e.getName());
@@ -35,7 +35,7 @@ public class PlayerListener implements Listener {
 
         if (user == null) {
             e.disallow(PlayerLoginEvent.Result.KICK_OTHER,
-                    color(Util.PREFIX + "User data could not be loaded. Please contact an administrator."));
+                    Util.color(Message.PREFIX + "User data could not be loaded. Please contact an administrator."));
             return;
         }
 
@@ -69,8 +69,4 @@ public class PlayerListener implements Listener {
         plugin.getUserManager().unloadUser(user);
     }
 
-    private static String color(String string) {
-        return ChatColor.translateAlternateColorCodes('&', string);
-    }
-
 }
diff --git a/bungee/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java b/bungee/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
index e0476a12..23babf9d 100644
--- a/bungee/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
+++ b/bungee/src/main/java/me/lucko/luckperms/listeners/PlayerListener.java
@@ -3,6 +3,7 @@ package me.lucko.luckperms.listeners;
 import lombok.AllArgsConstructor;
 import me.lucko.luckperms.LPBungeePlugin;
 import me.lucko.luckperms.commands.Util;
+import me.lucko.luckperms.constants.Message;
 import me.lucko.luckperms.users.User;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -29,7 +30,7 @@ public class PlayerListener implements Listener {
                 plugin.getProxy().getScheduler().schedule(plugin, () -> {
                     final ProxiedPlayer pl = p.get();
                     if (pl != null) {
-                        pl.sendMessage(new TextComponent(Util.color(Util.PREFIX + "Permissions data could not be loaded. Please contact an administrator.")));
+                        pl.sendMessage(new TextComponent(Util.color(Message.PREFIX + "Permissions data could not be loaded. Please contact an administrator.")));
                     }
                 }, 3, TimeUnit.SECONDS);
 
diff --git a/common/src/main/java/me/lucko/luckperms/commands/Util.java b/common/src/main/java/me/lucko/luckperms/commands/Util.java
index 80525b58..d1b2bc0e 100644
--- a/common/src/main/java/me/lucko/luckperms/commands/Util.java
+++ b/common/src/main/java/me/lucko/luckperms/commands/Util.java
@@ -1,15 +1,17 @@
 package me.lucko.luckperms.commands;
 
+import me.lucko.luckperms.constants.Message;
+
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 public class Util {
 
-    public static final String PREFIX = "&7&l[&b&lL&a&lP&7&l] &c";
+    private Util() {}
 
     public static void sendPluginMessage(Sender sender, String message) {
-        sender.sendMessage(color(PREFIX + message));
+        sender.sendMessage(color(Message.PREFIX + message));
     }
 
     public static String color(String s) {