From df6e76086b0e2eecc346901b250cd123294c180c Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Thu, 1 Nov 2018 01:24:01 +0100
Subject: [PATCH] Treating the RP channel as global

---
 .gitignore                                    |  4 ++--
 pom.xml                                       |  2 ++
 .../java/buttondevteam/chat/PluginMain.java   |  8 ++------
 .../chat/commands/UnlolCommand.java           | 20 +++++++++----------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea8759c..deefcdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,7 +131,7 @@ publish/
 *.publishproj
 
 # NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+## TO!DO: If you have NuGet Package Restore enabled, uncomment the next line
 #packages/
 
 # Windows Azure Build Output
@@ -221,4 +221,4 @@ TheButtonAutoFlair/out/artifacts/Autoflair/Autoflair.jar
 *.name
 .idea/compiler.xml
 *.xml
-/.apt_generated/
+/.apt_generated/
diff --git a/pom.xml b/pom.xml
index 8056f5b..f9ca404 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,6 +92,8 @@
 				</executions>
 				<configuration>
 					<testFailureIgnore>true</testFailureIgnore>
+					<useSystemClassLoader>false
+					</useSystemClassLoader> <!-- https://stackoverflow.com/a/53012553/2703239 -->
 				</configuration>
 			</plugin>
 			<!-- <plugin> <groupId>org.basepom.maven</groupId> <artifactId>duplicate-finder-maven-plugin</artifactId> 
diff --git a/src/main/java/buttondevteam/chat/PluginMain.java b/src/main/java/buttondevteam/chat/PluginMain.java
index 8a79abb..7ad1825 100644
--- a/src/main/java/buttondevteam/chat/PluginMain.java
+++ b/src/main/java/buttondevteam/chat/PluginMain.java
@@ -62,7 +62,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
 
 	public static Channel TownChat;
 	public static Channel NationChat;
-	private static Channel RPChannel; //TODO: Move to ButtonCore - or use the ch filter in the Discord plugin
+	private static Channel RPChannel;
 
 	/**
 	 * <p>
@@ -98,11 +98,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15.
 				TownChat = new Channel("§3TC§f", Color.DarkAqua, "tc", s -> checkTownNationChat(s, false)));
 		TBMCChatAPI.RegisterChatChannel(
 				NationChat = new Channel("§6NC§f", Color.Gold, "nc", s -> checkTownNationChat(s, true)));
-		TBMCChatAPI.RegisterChatChannel(RPChannel = new Channel("§7RP§f", Color.Gray, "rp", Channel.noScoreResult(s -> {
-			if (s instanceof ConsoleCommandSender)
-				return true;
-			return true; // TODO: Allow hiding it
-		}, "You need to show the RP chat in order to speak in it.")));
+		TBMCChatAPI.RegisterChatChannel(RPChannel = new Channel("§7RP§f", Color.Gray, "rp", null)); //Since it's null, it's recognised as global
 
 		Bukkit.getScheduler().runTask(this, () -> {
 			val dtp = (DynmapTownyPlugin) Bukkit.getPluginManager().getPlugin("Dynmap-Towny");
diff --git a/src/main/java/buttondevteam/chat/commands/UnlolCommand.java b/src/main/java/buttondevteam/chat/commands/UnlolCommand.java
index e21221a..eb3db61 100644
--- a/src/main/java/buttondevteam/chat/commands/UnlolCommand.java
+++ b/src/main/java/buttondevteam/chat/commands/UnlolCommand.java
@@ -1,19 +1,19 @@
 package buttondevteam.chat.commands;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-
 import buttondevteam.lib.TBMCChatEventBase;
 import buttondevteam.lib.chat.Channel;
 import buttondevteam.lib.chat.CommandClass;
 import buttondevteam.lib.chat.TBMCCommandBase;
 import lombok.Data;
+import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
 
 @CommandClass(modOnly = false)
 public final class UnlolCommand extends TBMCCommandBase {
@@ -31,7 +31,7 @@ public final class UnlolCommand extends TBMCCommandBase {
 	@Override
 	public boolean OnCommand(CommandSender sender, String alias, String[] args) {
 		LastlolData lol = Lastlol.values().stream().filter(lld -> lld.Chatevent.shouldSendTo(sender))
-				.max((lld1, lld2) -> Long.compare(lld1.Loltime, lld2.Loltime)).orElse(null);
+				.max(Comparator.comparingLong(lld -> lld.Loltime)).orElse(null);
 		if (lol == null)
 			return true;
 		if (lol.Lolowner instanceof Player)