From d77da1c3e4b45011d60240c61f41d6ff8a85b4fa Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Sat, 7 Mar 2020 00:11:52 -0500
Subject: [PATCH] Fixed BungeeCord ignoring when player to ignore has never
 logged into server the command executer is playing on.

---
 .../Aust1n46/chat/MineverseChat.java          |  9 +++++-
 .../Aust1n46/chat/command/message/Ignore.java | 28 +++++++++----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
index 4c25676..0d8d870 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
@@ -784,7 +784,6 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 				if(ccInfo.isChannel(chatchannel) && ccInfo.getChannelInfo(chatchannel).getBungee()) {
 					Bukkit.getConsoleSender().sendMessage(consoleChat);
 					for(MineverseChatPlayer p : MineverseChat.onlinePlayers) {
-						System.out.println(p.getName() + " received chat message");
 						if(p.getListening().contains(ccInfo.getChannelInfo(chatchannel).getName())) {
 							if(!p.getBungeeToggle() && MineverseChatAPI.getOnlineMineverseChatPlayer(senderName) == null) {
 								continue;
@@ -974,6 +973,14 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 					if(r != null) {
 						rName = Format.FormatStringAll(r.getNickname());
 					}
+					
+					if(p.getIgnores().contains(receiver)) {
+						p.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + rName);
+						p.removeIgnore(receiver);
+						plugin.synchronize(p, true);
+						return;
+					}
+					
 					p.addIgnore(receiver);
 					p.getPlayer().sendMessage(ChatColor.GOLD + "You are now ignoring player: " + ChatColor.RED + rName);
 					this.synchronize(p, true);
diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java b/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java
index a1bfa21..eac9966 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/command/message/Ignore.java
@@ -47,20 +47,6 @@ public class Ignore extends MineverseCommand {
 			return;
 		}
 		MineverseChatPlayer player = MineverseChatAPI.getMineverseChatPlayer(args[0]);
-		if(player == null) {
-			mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online.");
-			return;
-		}
-		if(mcp.getIgnores().contains(player.getUUID())) {
-			mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + player.getName());
-			mcp.removeIgnore(player.getUUID());
-			plugin.synchronize(mcp, true);
-			return;
-		}
-		if(mcp.getName().equalsIgnoreCase(player.getName())) {
-			mcp.getPlayer().sendMessage(ChatColor.RED + "You can not ignore yourself!");
-			return;
-		}
 		if(plugin.getConfig().getBoolean("bungeecordmessaging", true)) {
 			ByteArrayOutputStream byteOutStream = new ByteArrayOutputStream();
 			DataOutputStream out = new DataOutputStream(byteOutStream);
@@ -76,6 +62,20 @@ public class Ignore extends MineverseCommand {
 				e.printStackTrace();
 			}
 			return;
+		}
+		if(player == null) {
+			mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + args[0] + ChatColor.RED + " is not online.");
+			return;
+		}
+		if(mcp.getIgnores().contains(player.getUUID())) {
+			mcp.getPlayer().sendMessage(ChatColor.GOLD + "You are no longer ignoring player: " + ChatColor.RED + player.getName());
+			mcp.removeIgnore(player.getUUID());
+			plugin.synchronize(mcp, true);
+			return;
+		}
+		if(mcp.getName().equalsIgnoreCase(player.getName())) {
+			mcp.getPlayer().sendMessage(ChatColor.RED + "You can not ignore yourself!");
+			return;
 		}		
 		if(!player.isOnline()) {
 			mcp.getPlayer().sendMessage(ChatColor.RED + "Player: " + ChatColor.GOLD + player.getName() + ChatColor.RED + " is not online.");