From 158a6bdefdbe961c053bdb0da04c6dd09b7e4ed7 Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Fri, 12 Feb 2021 01:16:38 -0600
Subject: [PATCH] Updated Towny hook.

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

diff --git a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java
index a444fd8..5353218 100644
--- a/src/mineverse/Aust1n46/chat/command/chat/Chwho.java
+++ b/src/mineverse/Aust1n46/chat/command/chat/Chwho.java
@@ -10,8 +10,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 
 import com.massivecraft.factions.entity.MPlayer;
+import com.palmergames.bukkit.towny.TownyUniverse;
 import com.palmergames.bukkit.towny.object.Resident;
-import com.palmergames.bukkit.towny.object.TownyUniverse;
 
 import mineverse.Aust1n46.chat.MineverseChat;
 import mineverse.Aust1n46.chat.api.MineverseChatAPI;
@@ -78,9 +78,10 @@ public class Chwho extends MineverseCommand {
 							}
 							if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny") && sender instanceof Player) {
 								try {
+									TownyUniverse towny = TownyUniverse.getInstance();
 									if(channel.getName().equalsIgnoreCase("Town")) {
-										Resident r = TownyUniverse.getDataSource().getResident(p.getName());
-										Resident pp = TownyUniverse.getDataSource().getResident(((Player) sender).getName());
+										Resident r = towny.getResident(p.getName());
+										Resident pp = towny.getResident(((Player) sender).getName());
 										if(!pp.hasTown()) {
 											if(playerlist.length() + p.getName().length() > linecount) {
 												playerlist += "\n";
@@ -103,8 +104,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());
+										Resident r = towny.getResident(p.getName());
+										Resident pp = towny.getResident(((Player) sender).getName());
 										if(!pp.hasNation()) {
 											if(playerlist.length() + p.getName().length() > linecount) {
 												playerlist += "\n";
diff --git a/src/mineverse/Aust1n46/chat/listeners/ChatListener.java b/src/mineverse/Aust1n46/chat/listeners/ChatListener.java
index 275a645..be85ffd 100644
--- a/src/mineverse/Aust1n46/chat/listeners/ChatListener.java
+++ b/src/mineverse/Aust1n46/chat/listeners/ChatListener.java
@@ -19,8 +19,8 @@ import org.bukkit.plugin.PluginManager;
 
 import com.comphenix.protocol.events.PacketContainer;
 import com.massivecraft.factions.entity.MPlayer;
+import com.palmergames.bukkit.towny.TownyUniverse;
 import com.palmergames.bukkit.towny.object.Resident;
-import com.palmergames.bukkit.towny.object.TownyUniverse;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import mineverse.Aust1n46.chat.MineverseChat;
@@ -369,9 +369,10 @@ public class ChatListener implements Listener {
 				}
 				if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny")) {
 					try {
+						TownyUniverse towny = TownyUniverse.getInstance();
 						if(eventChannel.getName().equalsIgnoreCase("Town")) {
-							Resident r = TownyUniverse.getDataSource().getResident(p.getName());
-							Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName());
+							Resident r = towny.getResident(p.getName());
+							Resident pp = towny.getResident(mcp.getName());
 							if(!pp.hasTown()) {
 								recipients.remove(p.getPlayer());
 								recipientCount--;
@@ -389,8 +390,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());
+							Resident r = towny.getResident(p.getName());
+							Resident pp = towny.getResident(mcp.getName());
 							if(!pp.hasNation()) {
 								recipients.remove(p.getPlayer());
 								recipientCount--;