From 1275cdafd0c94906384ad8c4b5053ff0ee17084f Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Tue, 13 Aug 2019 15:02:34 +0200
Subject: [PATCH] Removed scoreboard that has been there for a long time

PluginMain.java:40
Also made the channel scores unnecessary
As well as the recently introduced dispatchConsoleCommand method
Also probably fixed Towny spy (#100)
---
 pom.xml                                       |   8 +-
 .../buttondevteam/chat/ChatProcessing.java    | 497 +++++++++---------
 .../java/buttondevteam/chat/PluginMain.java   |   5 -
 .../java/buttondevteam/chat/VanillaUtils.java |  69 ++-
 .../chat/components/towny/TownyComponent.java |  19 +-
 .../chat/listener/PlayerListener.java         |   7 -
 6 files changed, 305 insertions(+), 300 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6bca684..b06f542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,10 +155,10 @@
 			<id>Essentials</id>
 			<url>http://repo.ess3.net/content/repositories/essrel/</url>
 		</repository>
-		<repository>
-			<id>Minigames</id>
-			<url>http://maven.addstar.com.au/artifactory/release</url>
-		</repository>
+        <!-- <repository>
+            <id>Minigames</id>
+            <url>http://maven.addstar.com.au/artifactory/release</url>
+        </repository> -->
 		<!-- <repository>
 			<id>vault-repo</id>
 			<url>http://nexus.hc.to/content/repositories/pub_releases</url>
diff --git a/src/main/java/buttondevteam/chat/ChatProcessing.java b/src/main/java/buttondevteam/chat/ChatProcessing.java
index be67739..5245bf0 100644
--- a/src/main/java/buttondevteam/chat/ChatProcessing.java
+++ b/src/main/java/buttondevteam/chat/ChatProcessing.java
@@ -29,7 +29,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.Sound;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
-import org.bukkit.scoreboard.Objective;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -38,287 +37,283 @@ import java.util.function.Consumer;
 import java.util.regex.Pattern;
 
 public class ChatProcessing {
-    private static final Pattern NULL_MENTION_PATTERN = Pattern.compile("null");
-    private static final Pattern CYAN_PATTERN = Pattern.compile("cyan");
-    private static final Pattern ESCAPE_PATTERN = Pattern.compile("\\\\");
-    private static final Pattern CONSOLE_PING_PATTERN = Pattern.compile("(?i)" + Pattern.quote("@console"));
-    private static final Pattern HASHTAG_PATTERN = Pattern.compile("#(\\w+)");
+	private static final Pattern NULL_MENTION_PATTERN = Pattern.compile("null");
+	private static final Pattern CYAN_PATTERN = Pattern.compile("cyan");
+	private static final Pattern ESCAPE_PATTERN = Pattern.compile("\\\\");
+	private static final Pattern CONSOLE_PING_PATTERN = Pattern.compile("(?i)" + Pattern.quote("@console"));
+	private static final Pattern HASHTAG_PATTERN = Pattern.compile("#(\\w+)");
 	private static final Pattern URL_PATTERN = Pattern.compile("(http[\\w:/?=$\\-_.+!*'(),&]+(?:#[\\w]+)?)");
-    public static final Pattern ENTIRE_MESSAGE_PATTERN = Pattern.compile(".+");
-    private static final Pattern UNDERLINED_PATTERN = Pattern.compile("_");
-    private static final Pattern ITALIC_PATTERN = Pattern.compile("\\*");
-    private static final Pattern BOLD_PATTERN = Pattern.compile("\\*\\*");
-    private static final Pattern CODE_PATTERN = Pattern.compile("`");
+	public static final Pattern ENTIRE_MESSAGE_PATTERN = Pattern.compile(".+");
+	private static final Pattern UNDERLINED_PATTERN = Pattern.compile("_");
+	private static final Pattern ITALIC_PATTERN = Pattern.compile("\\*");
+	private static final Pattern BOLD_PATTERN = Pattern.compile("\\*\\*");
+	private static final Pattern CODE_PATTERN = Pattern.compile("`");
 	private static final Pattern MASKED_LINK_PATTERN = Pattern.compile("\\[([^\\[\\]]+)]\\(([^()]+)\\)");
-    private static final Pattern SOMEONE_PATTERN = Pattern.compile("@someone"); //TODO
+	private static final Pattern SOMEONE_PATTERN = Pattern.compile("@someone"); //TODO
 	private static final Pattern STRIKETHROUGH_PATTERN = Pattern.compile("~~");
 	private static final Pattern SPOILER_PATTERN = Pattern.compile("\\|\\|");
-    private static final Color[] RainbowPresserColors = new Color[]{Color.Red, Color.Gold, Color.Yellow, Color.Green,
-            Color.Blue, Color.DarkPurple};
+	private static final Color[] RainbowPresserColors = new Color[]{Color.Red, Color.Gold, Color.Yellow, Color.Green,
+		Color.Blue, Color.DarkPurple};
 	private static final Pattern WORD_PATTERN = Pattern.compile("\\S+");
 	private static boolean pingedconsole = false;
 
-    public static final ChatFormatter ESCAPE_FORMATTER = ChatFormatter.builder().regex(ESCAPE_PATTERN).build();
+	public static final ChatFormatter ESCAPE_FORMATTER = ChatFormatter.builder().regex(ESCAPE_PATTERN).build();
 
-    private static ArrayList<ChatFormatter> commonFormatters = Lists.newArrayList(
-            ChatFormatter.builder().regex(BOLD_PATTERN).bold(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
-                    .priority(Priority.High).build(),
-            ChatFormatter.builder().regex(ITALIC_PATTERN).italic(true).removeCharCount((short) 1).type(ChatFormatter.Type.Range).build(),
-            ChatFormatter.builder().regex(UNDERLINED_PATTERN).underlined(true).removeCharCount((short) 1).type(ChatFormatter.Type.Range)
-                    .build(),
-	    ChatFormatter.builder().regex(STRIKETHROUGH_PATTERN).strikethrough(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
-		    .build(),
-	    ChatFormatter.builder().regex(SPOILER_PATTERN).obfuscated(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
-		    .onmatch((match, cf, fs) -> {
-			    cf.setHoverText(match);
-			    return match;
-		    }).build(),
-	    ESCAPE_FORMATTER, ChatFormatter.builder().regex(NULL_MENTION_PATTERN).color(Color.DarkRed).build(), // Properly added a bug as a feature
-	    ChatFormatter.builder().regex(CONSOLE_PING_PATTERN).color(Color.Aqua).onmatch((match, builder, section) -> {
-                if (!pingedconsole) {
-                    System.out.print("\007");
-                    pingedconsole = true; // Will set it to false in ProcessChat
-                }
-                return match;
-            }).priority(Priority.High).build(),
+	private static ArrayList<ChatFormatter> commonFormatters = Lists.newArrayList(
+		ChatFormatter.builder().regex(BOLD_PATTERN).bold(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
+			.priority(Priority.High).build(),
+		ChatFormatter.builder().regex(ITALIC_PATTERN).italic(true).removeCharCount((short) 1).type(ChatFormatter.Type.Range).build(),
+		ChatFormatter.builder().regex(UNDERLINED_PATTERN).underlined(true).removeCharCount((short) 1).type(ChatFormatter.Type.Range)
+			.build(),
+		ChatFormatter.builder().regex(STRIKETHROUGH_PATTERN).strikethrough(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
+			.build(),
+		ChatFormatter.builder().regex(SPOILER_PATTERN).obfuscated(true).removeCharCount((short) 2).type(ChatFormatter.Type.Range)
+			.onmatch((match, cf, fs) -> {
+				cf.setHoverText(match);
+				return match;
+			}).build(),
+		ESCAPE_FORMATTER, ChatFormatter.builder().regex(NULL_MENTION_PATTERN).color(Color.DarkRed).build(), // Properly added a bug as a feature
+		ChatFormatter.builder().regex(CONSOLE_PING_PATTERN).color(Color.Aqua).onmatch((match, builder, section) -> {
+			if (!pingedconsole) {
+				System.out.print("\007");
+				pingedconsole = true; // Will set it to false in ProcessChat
+			}
+			return match;
+		}).priority(Priority.High).build(),
 
-            ChatFormatter.builder().regex(HASHTAG_PATTERN).color(Color.Blue).openlink("https://twitter.com/hashtag/$1")
-                    .priority(Priority.High).build(),
-            ChatFormatter.builder().regex(CYAN_PATTERN).color(Color.Aqua).build(), // #55
-            ChatFormatter.builder().regex(CODE_PATTERN).color(Color.DarkGray).removeCharCount((short) 1).type(ChatFormatter.Type.Range)
-                    .build(),
-	    ChatFormatter.builder().regex(MASKED_LINK_PATTERN).underlined(true).onmatch((match, builder, section) -> {
-		    String text, link;
-		    if (section.Matches.size() < 2 || (text = section.Matches.get(0)).length() == 0 || (link = section.Matches.get(1)).length() == 0)
-			    return "";
-		    builder.setOpenlink(link);
-		    return text;
-	    }).type(ChatFormatter.Type.Excluder).build(),
-	    ChatFormatter.builder().regex(URL_PATTERN).underlined(true).openlink("$1").type(ChatFormatter.Type.Excluder).build());
-    private static Gson gson = new GsonBuilder()
-            .registerTypeHierarchyAdapter(TellrawSerializableEnum.class, new TellrawSerializer.TwEnum())
-            .registerTypeHierarchyAdapter(Collection.class, new TellrawSerializer.TwCollection())
-            .registerTypeAdapter(Boolean.class, new TellrawSerializer.TwBool())
-            .registerTypeAdapter(boolean.class, new TellrawSerializer.TwBool()).disableHtmlEscaping().create();
-    private static final String[] testPlayers = {"Koiiev", "iie", "Alisolarflare", "NorbiPeti", "Arsen_Derby_FTW", "carrot_lynx"};
+		ChatFormatter.builder().regex(HASHTAG_PATTERN).color(Color.Blue).openlink("https://twitter.com/hashtag/$1")
+			.priority(Priority.High).build(),
+		ChatFormatter.builder().regex(CYAN_PATTERN).color(Color.Aqua).build(), // #55
+		ChatFormatter.builder().regex(CODE_PATTERN).color(Color.DarkGray).removeCharCount((short) 1).type(ChatFormatter.Type.Range)
+			.build(),
+		ChatFormatter.builder().regex(MASKED_LINK_PATTERN).underlined(true).onmatch((match, builder, section) -> {
+			String text, link;
+			if (section.Matches.size() < 2 || (text = section.Matches.get(0)).length() == 0 || (link = section.Matches.get(1)).length() == 0)
+				return "";
+			builder.setOpenlink(link);
+			return text;
+		}).type(ChatFormatter.Type.Excluder).build(),
+		ChatFormatter.builder().regex(URL_PATTERN).underlined(true).openlink("$1").type(ChatFormatter.Type.Excluder).build());
+	private static Gson gson = new GsonBuilder()
+		.registerTypeHierarchyAdapter(TellrawSerializableEnum.class, new TellrawSerializer.TwEnum())
+		.registerTypeHierarchyAdapter(Collection.class, new TellrawSerializer.TwCollection())
+		.registerTypeAdapter(Boolean.class, new TellrawSerializer.TwBool())
+		.registerTypeAdapter(boolean.class, new TellrawSerializer.TwBool()).disableHtmlEscaping().create();
+	private static final String[] testPlayers = {"Koiiev", "iie", "Alisolarflare", "NorbiPeti", "Arsen_Derby_FTW", "carrot_lynx"};
 	public static final String MCORIGIN = "Minecraft"; //Shouldn't change, like ever - TBMCPlayer.getFolderForType(TBMCPlayer.class) capitalized
 
-    private ChatProcessing() {
-    }
+	private ChatProcessing() {
+	}
 
-    public static boolean ProcessChat(TBMCChatEvent e) {
-        Channel channel = e.getChannel();
-        CommandSender sender = e.getSender();
-        String message = e.getMessage();
-        long processstart = System.nanoTime();
-        Player player = (sender instanceof Player ? (Player) sender : null);
-        User user = PluginMain.essentials.getUser(player);
+	public static boolean ProcessChat(TBMCChatEvent e) {
+		Channel channel = e.getChannel();
+		CommandSender sender = e.getSender();
+		String message = e.getMessage();
+		long processstart = System.nanoTime();
+		Player player = (sender instanceof Player ? (Player) sender : null);
+		User user = PluginMain.essentials.getUser(player);
 
-        if (player != null) {
-            user.updateActivity(true); //Could talk in a private channel, so broadcast
-            if (user.isMuted())
-                return true;
-        }
+		if (player != null) {
+			user.updateActivity(true); //Could talk in a private channel, so broadcast
+			if (user.isMuted())
+				return true;
+		}
 
-        doFunStuff(sender, e, message);
+		doFunStuff(sender, e, message);
 
-	    final String channelidentifier = getChannelID(channel, e.getOrigin());
-	    PluginMain.Instance.getServer().getConsoleSender()
-		    .sendMessage(String.format("%s <%s§r> %s", channelidentifier, getSenderName(sender, player), message));
+		final String channelidentifier = getChannelID(channel, e.getOrigin());
+		PluginMain.Instance.getServer().getConsoleSender()
+			.sendMessage(String.format("%s <%s§r> %s", channelidentifier, getSenderName(sender, player), message));
 
-	    if (Bukkit.getOnlinePlayers().size() == 0) return false; //Don't try to send to nobody (errors on 1.14)
+		if (Bukkit.getOnlinePlayers().size() == 0) return false; //Don't try to send to nobody (errors on 1.14)
 
-        ChatPlayer mp;
-        if (player != null)
-            mp = TBMCPlayerBase.getPlayer(player.getUniqueId(), ChatPlayer.class);
-        else //Due to the online player map, getPlayer() can be more efficient than getAs()
-            mp = e.getUser().getAs(ChatPlayer.class); //May be null
+		ChatPlayer mp;
+		if (player != null)
+			mp = TBMCPlayerBase.getPlayer(player.getUniqueId(), ChatPlayer.class);
+		else //Due to the online player map, getPlayer() can be more efficient than getAs()
+			mp = e.getUser().getAs(ChatPlayer.class); //May be null
 
-	    Color colormode = channel.Color().get();
-        if (mp != null && mp.OtherColorMode != null)
-            colormode = mp.OtherColorMode;
-        if (message.startsWith(">"))
-            colormode = Color.Green;
-        // If greentext, ignore channel or player colors
+		Color colormode = channel.Color().get();
+		if (mp != null && mp.OtherColorMode != null)
+			colormode = mp.OtherColorMode;
+		if (message.startsWith(">"))
+			colormode = Color.Green;
+		// If greentext, ignore channel or player colors
 
-        ArrayList<ChatFormatter> formatters = addFormatters(colormode);
-	    if (colormode == channel.Color().get() && mp != null && mp.RainbowPresserColorMode) { // Only overwrite channel color
-            final AtomicInteger rpc = new AtomicInteger(0);
-		    formatters.add(ChatFormatter.builder().regex(WORD_PATTERN).color(colormode).onmatch((match, cf, s) -> {
-                cf.setColor(RainbowPresserColors[rpc.getAndUpdate(i -> ++i < RainbowPresserColors.length ? i : 0)]);
-                return match;
-            }).build());
-        }
-        pingedconsole = false; // Will set it to true onmatch (static constructor)
+		ArrayList<ChatFormatter> formatters = addFormatters(colormode);
+		if (colormode == channel.Color().get() && mp != null && mp.RainbowPresserColorMode) { // Only overwrite channel color
+			final AtomicInteger rpc = new AtomicInteger(0);
+			formatters.add(ChatFormatter.builder().regex(WORD_PATTERN).color(colormode).onmatch((match, cf, s) -> {
+				cf.setColor(RainbowPresserColors[rpc.getAndUpdate(i -> ++i < RainbowPresserColors.length ? i : 0)]);
+				return match;
+			}).build());
+		}
+		pingedconsole = false; // Will set it to true onmatch (static constructor)
 
-        TellrawPart json = createTellraw(sender, message, player, mp, e.getUser(), channelidentifier, e.getOrigin());
-        long combinetime = System.nanoTime();
-        ChatFormatter.Combine(formatters, message, json);
-        combinetime = System.nanoTime() - combinetime;
-        String jsonstr = toJson(json);
-        if (jsonstr.length() >= 32767) {
-            sender.sendMessage(
-                    "§cError: Message too long. Try shortening it, or remove hashtags and other formatting.");
-            return true;
-        }
-        DebugCommand.SendDebugMessage(jsonstr);
+		TellrawPart json = createTellraw(sender, message, player, mp, e.getUser(), channelidentifier, e.getOrigin());
+		long combinetime = System.nanoTime();
+		ChatFormatter.Combine(formatters, message, json);
+		combinetime = System.nanoTime() - combinetime;
+		String jsonstr = toJson(json);
+		if (jsonstr.length() >= 32767) {
+			sender.sendMessage(
+				"§cError: Message too long. Try shortening it, or remove hashtags and other formatting.");
+			return true;
+		}
+		DebugCommand.SendDebugMessage(jsonstr);
 
-        try {
-            if (!channel.isGlobal()) {
-                Objective obj = PluginMain.SB.getObjective(channel.ID);
-                int score = -1;
-                for (Player p : Bukkit.getOnlinePlayers()) {
-                    final int mcScore;
-                    if (player != null
-                            && PluginMain.essentials.getUser(p).isIgnoredPlayer(PluginMain.essentials.getUser(player)))
-                        mcScore = -1; // Don't send the message to them
-                    else
-                        mcScore = VanillaUtils.getMCScoreIfChatOn(p, e);
-                    obj.getScore(p.getName())
-                            .setScore(p.getUniqueId().equals(player == null ? null : player.getUniqueId()) // p.UniqueID==player?.UniqueID
-                                    ? score = mcScore : mcScore);
-                }
-                if (score == -1) // Even if the player object isn't null, it may not be in OnlinePlayers
-                    score = e.getMCScore(sender);
-                if (score < 0) // Never send messages to score below 0
-                    sender.sendMessage("§cYou don't have permission to send this message or something went wrong");
-                else {
-	                ChatUtils.dispatchConsoleCommand(
-		                String.format("tellraw @a[score_%s=%d,score_%s_min=%d] %s", channel.ID, score, channel.ID,
-			                score, jsonstr), true);
-	                val tc = ComponentManager.getIfEnabled(TownyComponent.class);
-	                if (tc != null) tc.handleSpies(channel, json, ChatProcessing::toJson);
-                }
-            } else
-	            ChatUtils.dispatchConsoleCommand(String.format("tellraw @a %s", jsonstr), true);
-        } catch (Exception ex) {
-            TBMCCoreAPI.SendException("An error occured while sending a chat message!", ex);
-            sender.sendMessage("§cAn error occured while sending the message.");
-            return true;
-        }
-        DebugCommand.SendDebugMessage(
-                "-- Full ChatProcessing time: " + (System.nanoTime() - processstart) / 1000000f + " ms");
-        DebugCommand.SendDebugMessage("-- ChatFormatter.Combine time: " + combinetime / 1000000f + " ms");
-        return false;
-    }
+		try {
+			if (!channel.isGlobal()) {
+				String senderGroup = e.getGroupID(sender);
+				if (senderGroup == null) { // Never send messages to score below 0
+					sender.sendMessage("§cYou don't have permission to send this message or something went wrong");
+					return true;
+				}
+				val tc = ComponentManager.getIfEnabled(TownyComponent.class);
+				if (tc != null) tc.handleSpiesInit(channel, json, ChatProcessing::toJson);
+				for (Player p : Bukkit.getOnlinePlayers()) {
+					final String group;
+					if (player != null
+						&& PluginMain.essentials.getUser(p).isIgnoredPlayer(PluginMain.essentials.getUser(player)))
+						group = null; // Don't send the message to them
+					else
+						group = VanillaUtils.getGroupIfChatOn(p, e);
+					if (group != null)
+						VanillaUtils.tellRaw(p, jsonstr);
+					else if (tc != null) tc.handleSpies(channel, p);
+					//Only sends if didn't send normally
+				}
+			} else
+				for (Player p : Bukkit.getOnlinePlayers())
+					VanillaUtils.tellRaw(p, jsonstr);
+		} catch (Exception ex) {
+			TBMCCoreAPI.SendException("An error occured while sending a chat message!", ex);
+			sender.sendMessage("§cAn error occured while sending the message.");
+			return true;
+		}
+		DebugCommand.SendDebugMessage(
+			"-- Full ChatProcessing time: " + (System.nanoTime() - processstart) / 1000000f + " ms");
+		DebugCommand.SendDebugMessage("-- ChatFormatter.Combine time: " + combinetime / 1000000f + " ms");
+		return false;
+	}
 
-    static String toJson(TellrawPart json) {
-        return gson.toJson(json);
-    }
+	static String toJson(TellrawPart json) {
+		return gson.toJson(json);
+	}
 
-    static TellrawPart createTellraw(CommandSender sender, String message, @Nullable Player player,
-                                     @Nullable ChatPlayer mp, @Nullable ChromaGamerBase cg, final String channelidentifier,
-                                     String origin) {
-        TellrawPart json = new TellrawPart("");
+	static TellrawPart createTellraw(CommandSender sender, String message, @Nullable Player player,
+	                                 @Nullable ChatPlayer mp, @Nullable ChromaGamerBase cg, final String channelidentifier,
+	                                 String origin) {
+		TellrawPart json = new TellrawPart("");
 		ChatOnlyComponent.tellrawCreate(mp, json); //TODO: Make nice API
-        json.addExtra(
-                new TellrawPart(channelidentifier)
-                        .setHoverEvent(
-                                TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT,
-                                        new TellrawPart((MCORIGIN.equals(origin) ? "" : "From " + origin + "n")
-                                                + "Copy message").setColor(Color.Blue)))
-                        .setClickEvent(TellrawEvent.create(TellrawEvent.ClickAction.SUGGEST_COMMAND, message)));
-        if (PluginMain.permission.has(sender, "tbmc.badge.diamond"))
-            json.addExtra(new TellrawPart("[P]").setColor(Color.Aqua).setBold(true)
-                    .setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Diamond Patreon supporter")));
-        else if (PluginMain.permission.has(sender, "tbmc.badge.gold"))
-            json.addExtra(new TellrawPart("[P]").setColor(Color.Gold).setBold(true)
-                    .setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Gold Patreon supporter")));
-        json.addExtra(new TellrawPart(" <"));
-        TellrawPart hovertp = new TellrawPart("");
-        if (cg != null)
-            hovertp.addExtra(new TellrawPart(cg.getInfo(ChromaGamerBase.InfoTarget.MCHover)));
-        json.addExtra(new TellrawPart(getSenderName(sender, player))
-                .setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, hovertp)));
-        json.addExtra(new TellrawPart("> "));
-        return json;
-    }
+		json.addExtra(
+			new TellrawPart(channelidentifier)
+				.setHoverEvent(
+					TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT,
+						new TellrawPart((MCORIGIN.equals(origin) ? "" : "From " + origin + "n")
+							+ "Copy message").setColor(Color.Blue)))
+				.setClickEvent(TellrawEvent.create(TellrawEvent.ClickAction.SUGGEST_COMMAND, message)));
+		if (PluginMain.permission.has(sender, "tbmc.badge.diamond"))
+			json.addExtra(new TellrawPart("[P]").setColor(Color.Aqua).setBold(true)
+				.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Diamond Patreon supporter")));
+		else if (PluginMain.permission.has(sender, "tbmc.badge.gold"))
+			json.addExtra(new TellrawPart("[P]").setColor(Color.Gold).setBold(true)
+				.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, "Gold Patreon supporter")));
+		json.addExtra(new TellrawPart(" <"));
+		TellrawPart hovertp = new TellrawPart("");
+		if (cg != null)
+			hovertp.addExtra(new TellrawPart(cg.getInfo(ChromaGamerBase.InfoTarget.MCHover)));
+		json.addExtra(new TellrawPart(getSenderName(sender, player))
+			.setHoverEvent(TellrawEvent.create(TellrawEvent.HoverAction.SHOW_TEXT, hovertp)));
+		json.addExtra(new TellrawPart("> "));
+		return json;
+	}
 
-    private static String getSenderName(CommandSender sender, Player player) {
-        if (player == null)
-            return sender.getName();
-        return player.getDisplayName();
-    }
+	private static String getSenderName(CommandSender sender, Player player) {
+		if (player == null)
+			return sender.getName();
+		return player.getDisplayName();
+	}
 
 	static String getChannelID(Channel channel, String origin) {
-	    return ("[" + (MCORIGIN.equals(origin) ? "" : "§8" + origin.substring(0, 1) + "§r|") + channel.DisplayName().get())
-                + "]";
-    }
+		return ("[" + (MCORIGIN.equals(origin) ? "" : "§8" + origin.substring(0, 1) + "§r|") + channel.DisplayName().get())
+			+ "]";
+	}
 
-    static ArrayList<ChatFormatter> addFormatters(Color colormode) {
-        @SuppressWarnings("unchecked")
-        ArrayList<ChatFormatter> formatters = (ArrayList<ChatFormatter>) commonFormatters.clone();
+	static ArrayList<ChatFormatter> addFormatters(Color colormode) {
+		@SuppressWarnings("unchecked")
+		ArrayList<ChatFormatter> formatters = (ArrayList<ChatFormatter>) commonFormatters.clone();
 
-        formatters.add(
-                ChatFormatter.builder().regex(ENTIRE_MESSAGE_PATTERN).color(colormode).priority(Priority.Low).build());
+		formatters.add(
+			ChatFormatter.builder().regex(ENTIRE_MESSAGE_PATTERN).color(colormode).priority(Priority.Low).build());
 
-        boolean nottest; //Not assigning a default value, so that it can only be used in the if
-        if ((nottest = Bukkit.getOnlinePlayers().size() > 0) || Bukkit.getVersion().equals("test")) {
-            StringBuilder namesb = new StringBuilder("(?i)(");
-            if (nottest)
-                for (Player p : Bukkit.getOnlinePlayers())
-                    namesb.append(p.getName()).append("|");
-            else
-                for (String testPlayer : testPlayers)
-                    namesb.append(testPlayer).append("|");
-            namesb.deleteCharAt(namesb.length() - 1);
-            namesb.append(")");
-            StringBuilder nicksb = new StringBuilder("(?i)(");
-            boolean addNickFormatter = false;
-            for (Player p : Bukkit.getOnlinePlayers()) {
-                final String nick = PlayerListener.nicknames.inverse().get(p.getUniqueId());
-                if (nick != null) {
-	                nicksb.append(nick).append("|");
-                    addNickFormatter = true; //Add it even if there's only 1 player online (it was in the if)
-                }
-            }
-	        nicksb.deleteCharAt(nicksb.length() - 1);
-            nicksb.append(")");
+		boolean nottest; //Not assigning a default value, so that it can only be used in the if
+		if ((nottest = Bukkit.getOnlinePlayers().size() > 0) || Bukkit.getVersion().equals("test")) {
+			StringBuilder namesb = new StringBuilder("(?i)(");
+			if (nottest)
+				for (Player p : Bukkit.getOnlinePlayers())
+					namesb.append(p.getName()).append("|");
+			else
+				for (String testPlayer : testPlayers)
+					namesb.append(testPlayer).append("|");
+			namesb.deleteCharAt(namesb.length() - 1);
+			namesb.append(")");
+			StringBuilder nicksb = new StringBuilder("(?i)(");
+			boolean addNickFormatter = false;
+			for (Player p : Bukkit.getOnlinePlayers()) {
+				final String nick = PlayerListener.nicknames.inverse().get(p.getUniqueId());
+				if (nick != null) {
+					nicksb.append(nick).append("|");
+					addNickFormatter = true; //Add it even if there's only 1 player online (it was in the if)
+				}
+			}
+			nicksb.deleteCharAt(nicksb.length() - 1);
+			nicksb.append(")");
 
-            Consumer<String> error = message -> {
-                if (PluginMain.Instance != null)
-                    PluginMain.Instance.getLogger().warning(message);
-                else
-                    System.out.println(message);
-            };
+			Consumer<String> error = message -> {
+				if (PluginMain.Instance != null)
+					PluginMain.Instance.getLogger().warning(message);
+				else
+					System.out.println(message);
+			};
 
-            formatters.add(ChatFormatter.builder().regex(Pattern.compile(namesb.toString())).color(Color.Aqua)
-	            .onmatch((match, builder, section) -> {
-                        Player p = Bukkit.getPlayer(match);
-	                    Optional<String> pn = nottest ? Optional.empty()
-			                    : Arrays.stream(testPlayers).filter(tp -> tp.equalsIgnoreCase(match)).findAny();
-	                    if (nottest ? p == null : !pn.isPresent()) {
-                            error.accept("Error: Can't find player " + match + " but was reported as online.");
-                            return "§c" + match + "§r";
-                        }
-                        ChatPlayer mpp = TBMCPlayer.getPlayer(nottest ? p.getUniqueId() : new UUID(0, 0), ChatPlayer.class);
-                        if (nottest) {
+			formatters.add(ChatFormatter.builder().regex(Pattern.compile(namesb.toString())).color(Color.Aqua)
+				.onmatch((match, builder, section) -> {
+					Player p = Bukkit.getPlayer(match);
+					Optional<String> pn = nottest ? Optional.empty()
+						: Arrays.stream(testPlayers).filter(tp -> tp.equalsIgnoreCase(match)).findAny();
+					if (nottest ? p == null : !pn.isPresent()) {
+						error.accept("Error: Can't find player " + match + " but was reported as online.");
+						return "§c" + match + "§r";
+					}
+					ChatPlayer mpp = TBMCPlayer.getPlayer(nottest ? p.getUniqueId() : new UUID(0, 0), ChatPlayer.class);
+					if (nottest) {
+						playPingSound(p);
+					}
+					String color = String.format("§%x", (mpp.GetFlairColor() == 0x00 ? 0xb : mpp.GetFlairColor()));
+					return color + (nottest ? p.getName() : pn.get()) + "§r"; //Fix name casing, except when testing
+				}).priority(Priority.High).type(ChatFormatter.Type.Excluder).build());
+
+			if (addNickFormatter)
+				formatters.add(ChatFormatter.builder().regex((Pattern.compile(nicksb.toString()))).color(Color.Aqua)
+					.onmatch((match, builder, section) -> {
+						if (PlayerListener.nicknames.containsKey(match.toLowerCase())) { //Made a stream and all that but I can actually store it lowercased
+							Player p = Bukkit.getPlayer(PlayerListener.nicknames.get(match.toLowerCase()));
+							if (p == null) {
+								error.accept("Error: Can't find player nicknamed "
+									+ match.toLowerCase() + " but was reported as online.");
+								return "§c" + match + "§r";
+							}
 							playPingSound(p);
+							return PluginMain.essentials.getUser(p).getNickname();
 						}
-                        String color = String.format("§%x", (mpp.GetFlairColor() == 0x00 ? 0xb : mpp.GetFlairColor()));
-	                    return color + (nottest ? p.getName() : pn.get()) + "§r"; //Fix name casing, except when testing
-                    }).priority(Priority.High).type(ChatFormatter.Type.Excluder).build());
-
-            if (addNickFormatter)
-                formatters.add(ChatFormatter.builder().regex((Pattern.compile(nicksb.toString()))).color(Color.Aqua)
-	                .onmatch((match, builder, section) -> {
-                            if (PlayerListener.nicknames.containsKey(match.toLowerCase())) { //Made a stream and all that but I can actually store it lowercased
-                                Player p = Bukkit.getPlayer(PlayerListener.nicknames.get(match.toLowerCase()));
-                                if (p == null) {
-                                    error.accept("Error: Can't find player nicknamed "
-                                            + match.toLowerCase() + " but was reported as online.");
-                                    return "§c" + match + "§r";
-                                }
-								playPingSound(p);
-								return PluginMain.essentials.getUser(p).getNickname();
-                            }
-                            error.accept("Player nicknamed " + match.toLowerCase()
-                                    + " not found in nickname map but was reported as online.");
-                            return "§c" + match + "§r";
-                        }).priority(Priority.High).type(ChatFormatter.Type.Excluder).build());
-        }
-        return formatters;
-    }
+						error.accept("Player nicknamed " + match.toLowerCase()
+							+ " not found in nickname map but was reported as online.");
+						return "§c" + match + "§r";
+					}).priority(Priority.High).type(ChatFormatter.Type.Excluder).build());
+		}
+		return formatters;
+	}
 
 	private static void playPingSound(Player p) {
 		if (PluginMain.Instance.notificationSound().get().length() == 0)
@@ -329,7 +324,7 @@ public class ChatProcessing {
 	}
 
 	static void doFunStuff(CommandSender sender, TBMCChatEventBase event, String message) {
-		val fc=ComponentManager.getIfEnabled(FunComponent.class);
-		if(fc!=null) fc.onChat(sender, event, message);
-    }
+		val fc = ComponentManager.getIfEnabled(FunComponent.class);
+		if (fc != null) fc.onChat(sender, event, message);
+	}
 }
diff --git a/src/main/java/buttondevteam/chat/PluginMain.java b/src/main/java/buttondevteam/chat/PluginMain.java
index a01632f..89c4ed1 100644
--- a/src/main/java/buttondevteam/chat/PluginMain.java
+++ b/src/main/java/buttondevteam/chat/PluginMain.java
@@ -29,7 +29,6 @@ import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Bukkit;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.scoreboard.Scoreboard;
 
 public class PluginMain extends ButtonPlugin { // Translated to Java: 2015.07.15.
 	// A user, which flair isn't obtainable:
@@ -37,8 +36,6 @@ public class PluginMain extends ButtonPlugin { // Translated to Java: 2015.07.15
 	public static PluginMain Instance;
 	public static ConsoleCommandSender Console;
 
-	public static Scoreboard SB;
-
 	public ConfigData<String> notificationSound() {
 		return getIConfig().getData("notificationSound", "");
 	}
@@ -58,8 +55,6 @@ public class PluginMain extends ButtonPlugin { // Translated to Java: 2015.07.15
 		MainPlugin.Instance.setChatHandlerEnabled(false); //Disable Core chat handler
 		Console = this.getServer().getConsoleSender();
 
-		SB = getServer().getScoreboardManager().getMainScoreboard(); // Main can be detected with @a[score_...]
-
 		if (Bukkit.getPluginManager().isPluginEnabled("Towny"))
 			Component.registerComponent(this, new TownyComponent());
 
diff --git a/src/main/java/buttondevteam/chat/VanillaUtils.java b/src/main/java/buttondevteam/chat/VanillaUtils.java
index 157afbc..edf0810 100644
--- a/src/main/java/buttondevteam/chat/VanillaUtils.java
+++ b/src/main/java/buttondevteam/chat/VanillaUtils.java
@@ -4,25 +4,22 @@ import buttondevteam.core.MainPlugin;
 import buttondevteam.lib.TBMCChatEvent;
 import lombok.experimental.UtilityClass;
 import lombok.val;
-import net.minecraft.server.v1_12_R1.ChatComponentUtils;
-import net.minecraft.server.v1_12_R1.IChatBaseComponent;
-import org.bukkit.craftbukkit.v1_12_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 
-import java.util.function.BiConsumer;
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 @UtilityClass
 public class VanillaUtils {
-	public int getMCScoreIfChatOn(Player p, TBMCChatEvent e) {
+	public String getGroupIfChatOn(Player p, TBMCChatEvent e) {
 		try {
 			if (isChatOn(p)) // Only send if client allows chat
-				return e.getMCScore(p);
+				return e.getGroupID(p);
 			else
-				return -1;
+				return null;
 		} catch (NoClassDefFoundError ex) {
 			MainPlugin.Instance.getLogger().warning("Compatibility error, can't check if the chat is hidden by the player.");
-			return e.getMCScore(p);
+			return e.getGroupID(p);
 		}
 	}
 
@@ -47,6 +44,7 @@ public class VanillaUtils {
 				val full = ff.get(null); // EnumChatVisibility.FULL
 				isChatOn = pl -> {
 					try {
+						if (notCraftPlayer(pl.getClass())) return true; //Need to check each time
 						val ph = hm.invoke(pl); //pl.getHandle()
 						val flags = gcfm.invoke(ph); //handle.getChatFlags()
 						return flags == full; //TODO: It's only checked if not global
@@ -72,34 +70,49 @@ public class VanillaUtils {
 		return Short.parseShort(v);
 	}*/
 
-	private BiConsumer<Player, String> tellRaw;
+	private BiPredicate<Player, String> tellRaw;
 
 	public boolean tellRaw(Player p, String json) {
 		try {
-			val pcl = p.getClass();
-			if (notCraftPlayer(pcl)) return false;
-			val hm = pcl.getMethod("getHandle");
-			val handle = hm.invoke(p); ;
-			val nms = handle.getClass().getPackage().getName();
-			val chatcompcl = Class.forName(nms + ".IChatBaseComponent");
-			val sendmsg = handle.getClass().getMethod("sendMessage", chatcompcl);
+			if (tellRaw == null) {
+				val pcl = p.getClass();
+				if (notCraftPlayer(pcl)) return false;
+				val hm = pcl.getMethod("getHandle");
+				val handle = hm.invoke(p);
+				val nms = handle.getClass().getPackage().getName();
+				val chatcompcl = Class.forName(nms + ".IChatBaseComponent");
+				val sendmsg = handle.getClass().getMethod("sendMessage", chatcompcl);
 
-			val ccucl = Class.forName(nms + ".ChatComponentUtils");
-			val iclcl = Class.forName(nms + ".ICommandListener");
-			val encl = Class.forName(nms + ".Entity");
-			val ffdm = ccucl.getMethod("filterForDisplay", iclcl, chatcompcl, encl);
+				val ccucl = Class.forName(nms + ".ChatComponentUtils");
+				val iclcl = Class.forName(nms + ".ICommandListener");
+				val encl = Class.forName(nms + ".Entity");
+				//val ffdm = ccucl.getMethod("filterForDisplay", iclcl, chatcompcl, encl);
 
-			val cscl = Class.forName(chatcompcl.getName() + "$ChatSerializer");
-			val am = cscl.getMethod("a", String.class);
-			val deserialized = am.invoke(null, json);
-			val filtered = ffdm.invoke(null, handle, deserialized, handle); //TODO: Use BiConsumer
-			sendmsg.invoke(handle, filtered);
+				val cscl = Class.forName(chatcompcl.getName() + "$ChatSerializer");
+				val am = cscl.getMethod("a", String.class);
 
-			((CraftPlayer) p).getHandle().sendMessage(ChatComponentUtils
+				tellRaw = (pl, jsonStr) -> {
+					if (notCraftPlayer(pl.getClass())) return false;
+					try {
+						val hhandle = hm.invoke(pl);
+						val deserialized = am.invoke(null, jsonStr);
+						//val filtered = ffdm.invoke(null, hhandle, deserialized, hhandle);
+						sendmsg.invoke(hhandle, deserialized);
+						return true;
+					} catch (Exception e) {
+						e.printStackTrace();
+						return false;
+					}
+				};
+			}
+
+			/*((CraftPlayer) p).getHandle().sendMessage(ChatComponentUtils
 				.filterForDisplay(((CraftPlayer) p).getHandle(),
-					IChatBaseComponent.ChatSerializer.a(json), ((CraftPlayer) p).getHandle()));
+					IChatBaseComponent.ChatSerializer.a(json), ((CraftPlayer) p).getHandle()));*/
+			return tellRaw.test(p, json);
 		} catch (Exception e) {
-			e.printStackTrace();
+			PluginMain.Instance.getLogger().warning("Could not use tellRaw: " + e.getMessage());
+			return false;
 		}
 	}
 
diff --git a/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java b/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java
index dc4777b..0ddd52c 100644
--- a/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java
+++ b/src/main/java/buttondevteam/chat/components/towny/TownyComponent.java
@@ -1,7 +1,7 @@
 package buttondevteam.chat.components.towny;
 
-import buttondevteam.chat.ChatUtils;
 import buttondevteam.chat.PluginMain;
+import buttondevteam.chat.VanillaUtils;
 import buttondevteam.chat.formatting.TellrawPart;
 import buttondevteam.core.component.channel.Channel;
 import buttondevteam.lib.architecture.Component;
@@ -20,6 +20,7 @@ import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -48,12 +49,20 @@ public class TownyComponent extends Component<PluginMain> {
 		TownyAnnouncer.setdown();
 	}
 
-	public void handleSpies(Channel channel, TellrawPart json, Function<TellrawPart, String> toJson) {
+	public void handleSpiesInit(Channel channel, TellrawPart json, Function<TellrawPart, String> toJson) {
 		if (channel.ID.equals(TownChat.ID) || channel.ID.equals(NationChat.ID)) {
 			((List<TellrawPart>) json.getExtra()).add(0, new TellrawPart("[SPY]"));
-			String jsonstr = toJson.apply(json);
-			ChatUtils.dispatchConsoleCommand(String.format(
-				"tellraw @a[score_%s=1000,score_%s_min=1000] %s", channel.ID, channel.ID, jsonstr), true);
+			jsonstr = toJson.apply(json);
+		}
+	}
+
+	private String jsonstr;
+
+	public void handleSpies(Channel channel, Player p) {
+		if (channel.ID.equals(TownChat.ID) || channel.ID.equals(NationChat.ID)) {
+			if (Optional.ofNullable(TU.getResidentMap().get(p.getName().toLowerCase()))
+				.filter(r -> r.hasMode("spy")).isPresent())
+				VanillaUtils.tellRaw(p, jsonstr);
 		}
 	}
 
diff --git a/src/main/java/buttondevteam/chat/listener/PlayerListener.java b/src/main/java/buttondevteam/chat/listener/PlayerListener.java
index 84f7fc1..54f7b4d 100644
--- a/src/main/java/buttondevteam/chat/listener/PlayerListener.java
+++ b/src/main/java/buttondevteam/chat/listener/PlayerListener.java
@@ -8,7 +8,6 @@ import buttondevteam.chat.components.flair.FlairComponent;
 import buttondevteam.chat.components.towncolors.TownColorComponent;
 import buttondevteam.core.ComponentManager;
 import buttondevteam.core.component.channel.Channel;
-import buttondevteam.core.component.channel.ChatChannelRegisterEvent;
 import buttondevteam.core.component.channel.ChatRoom;
 import buttondevteam.lib.TBMCChatEvent;
 import buttondevteam.lib.TBMCCoreAPI;
@@ -178,12 +177,6 @@ public class PlayerListener implements Listener {
 		}
 	}
 
-	@EventHandler
-	public void onChannelRegistered(ChatChannelRegisterEvent e) {
-		if (!e.getChannel().isGlobal() && PluginMain.SB.getObjective(e.getChannel().ID) == null) // Not global chat and doesn't exist yet
-			PluginMain.SB.registerNewObjective(e.getChannel().ID, "dummy");
-	}
-
 	@EventHandler
 	public void onNickChange(NickChangeEvent e) {
         String nick = e.getValue();