From a8e39e3db2b8bd3935f8f3371213b07eb8d701b5 Mon Sep 17 00:00:00 2001
From: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
Date: Wed, 28 Mar 2018 21:37:40 +1100
Subject: [PATCH] Actually use the admin's personal tag if available (#51)

---
 .../totalfreedommod/command/Command_vanish.java            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
index cf0ef574..f18eb2e5 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_vanish.java
@@ -24,6 +24,7 @@ public class Command_vanish extends FreedomCommand
         Displayable display = plugin.rm.getDisplay(playerSender);
         String loginMsg = display.getColoredLoginMessage();
         String displayName = display.getColor() + playerSender.getName();
+        String tag = display.getColoredTag();
         Admin admin = plugin.al.getAdmin(playerSender);
         if (VANISHED.contains(playerSender))
         {
@@ -34,7 +35,11 @@ public class Command_vanish extends FreedomCommand
             }
             FUtil.bcastMsg(ChatColor.AQUA + playerSender.getName() + " is " + loginMsg);
             FUtil.bcastMsg(playerSender.getName() + " joined the game", ChatColor.YELLOW);
-            plugin.pl.getPlayer(playerSender).setTag(display.getColoredTag());
+            if (admin.getTag() != null)
+            {
+                tag = FUtil.colorize(admin.getTag());
+            }
+            plugin.pl.getPlayer(playerSender).setTag(tag);
             FLog.info(playerSender.getName() + " is no longer vanished.");
             for (Player player : server.getOnlinePlayers())
             {