From 950a74bd235d04c0e0c86bc04245fddf3e87b52e Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Mon, 4 May 2020 22:16:36 -0400
Subject: [PATCH] Add config check for Towny and Factions channel in /chwho

---
 .../Aust1n46/chat/command/chat/Chwho.java          | 14 ++++++++------
 .../Aust1n46/chat/listeners/ChatListener.java      | 10 ++++++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java
index 21cf35f..b7edd9a 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/command/chat/Chwho.java
@@ -76,11 +76,11 @@ public class Chwho extends MineverseCommand {
 									continue;
 								}
 							}
-							if(pluginManager.isPluginEnabled("Towny") && sender instanceof Player) {
+							if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny") && sender instanceof Player) {
 								try {
-									Resident r = TownyUniverse.getDataSource().getResident(p.getName());
-									Resident pp = TownyUniverse.getDataSource().getResident(((Player) sender).getName());
 									if(channel.getName().equalsIgnoreCase("Town")) {
+										Resident r = TownyUniverse.getDataSource().getResident(p.getName());
+										Resident pp = TownyUniverse.getDataSource().getResident(((Player) sender).getName());
 										if(!pp.hasTown()) {
 											if(playerlist.length() + p.getName().length() > linecount) {
 												playerlist += "\n";
@@ -103,6 +103,8 @@ public class Chwho extends MineverseCommand {
 										}
 									}
 									if(channel.getName().equalsIgnoreCase("Nation")) {
+										Resident r = TownyUniverse.getDataSource().getResident(p.getName());
+										Resident pp = TownyUniverse.getDataSource().getResident(((Player) sender).getName());
 										if(!pp.hasNation()) {
 											if(playerlist.length() + p.getName().length() > linecount) {
 												playerlist += "\n";
@@ -129,11 +131,11 @@ public class Chwho extends MineverseCommand {
 									ex.printStackTrace();
 								}
 							}
-							if(pluginManager.isPluginEnabled("Factions") && sender instanceof Player) {
+							if(plugin.getConfig().getBoolean("enable_factions_channel") && pluginManager.isPluginEnabled("Factions") && sender instanceof Player) {
 								try {
-									MPlayer mplayer = MPlayer.get(p.getPlayer());
-									MPlayer mplayerp = MPlayer.get((Player) sender);
 									if(channel.getName().equalsIgnoreCase("Faction")) {
+										MPlayer mplayer = MPlayer.get(p.getPlayer());
+										MPlayer mplayerp = MPlayer.get((Player) sender);
 										if(!mplayerp.hasFaction()) {
 											if(playerlist.length() + p.getName().length() > linecount) {
 												playerlist += "\n";
diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
index 90501b6..a86db61 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/ChatListener.java
@@ -350,9 +350,9 @@ public class ChatListener implements Listener {
 				}
 				if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny")) {
 					try {
-						Resident r = TownyUniverse.getDataSource().getResident(p.getName());
-						Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName());
 						if(eventChannel.getName().equalsIgnoreCase("Town")) {
+							Resident r = TownyUniverse.getDataSource().getResident(p.getName());
+							Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName());
 							if(!pp.hasTown()) {
 								recipients.remove(p.getPlayer());
 								recipientCount--;
@@ -370,6 +370,8 @@ public class ChatListener implements Listener {
 							}
 						}
 						if(eventChannel.getName().equalsIgnoreCase("Nation")) {
+							Resident r = TownyUniverse.getDataSource().getResident(p.getName());
+							Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName());
 							if(!pp.hasNation()) {
 								recipients.remove(p.getPlayer());
 								recipientCount--;
@@ -394,9 +396,9 @@ public class ChatListener implements Listener {
 
 				if(plugin.getConfig().getBoolean("enable_factions_channel") && pluginManager.isPluginEnabled("Factions")) {
 					try {
-						MPlayer mplayer = MPlayer.get(mcp.getPlayer());
-						MPlayer mplayerp = MPlayer.get(p.getPlayer());
 						if(eventChannel.getName().equalsIgnoreCase("Faction")) {
+							MPlayer mplayer = MPlayer.get(mcp.getPlayer());
+							MPlayer mplayerp = MPlayer.get(p.getPlayer());
 							if(!mplayer.hasFaction()) {
 								recipients.remove(p.getPlayer());
 								recipientCount--;