mirror/VentureChat
1
0
Fork 1
mirror of https://github.com/Aust1n46/VentureChat.git synced 2025-05-23 10:39:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated Towny hook.

Browse Source
This commit is contained in:
Aust1n46 2021-02-12 01:16:38 -06:00
parent 66fcc22266
commit 158a6bdefd
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mineverse/Aust1n46/chat/command/chat/Chwho.java
View File

@ -10,8 +10,8 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import com.massivecraft.factions.entity.MPlayer; 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.Resident;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
import mineverse.Aust1n46.chat.api.MineverseChatAPI; 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) { if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny") && sender instanceof Player) {
try { try {
TownyUniverse towny = TownyUniverse.getInstance();
if(channel.getName().equalsIgnoreCase("Town")) { if(channel.getName().equalsIgnoreCase("Town")) {
Resident r = TownyUniverse.getDataSource().getResident(p.getName()); Resident r = towny.getResident(p.getName());
Resident pp = TownyUniverse.getDataSource().getResident(((Player) sender).getName()); Resident pp = towny.getResident(((Player) sender).getName());
if(!pp.hasTown()) { if(!pp.hasTown()) {
if(playerlist.length() + p.getName().length() > linecount) { if(playerlist.length() + p.getName().length() > linecount) {
playerlist += "\n"; playerlist += "\n";
@ -103,8 +104,8 @@ public class Chwho extends MineverseCommand {
} }
} }
if(channel.getName().equalsIgnoreCase("Nation")) { if(channel.getName().equalsIgnoreCase("Nation")) {
Resident r = TownyUniverse.getDataSource().getResident(p.getName()); Resident r = towny.getResident(p.getName());
Resident pp = TownyUniverse.getDataSource().getResident(((Player) sender).getName()); Resident pp = towny.getResident(((Player) sender).getName());
if(!pp.hasNation()) { if(!pp.hasNation()) {
if(playerlist.length() + p.getName().length() > linecount) { if(playerlist.length() + p.getName().length() > linecount) {
playerlist += "\n"; playerlist += "\n";

11
src/mineverse/Aust1n46/chat/listeners/ChatListener.java
View File

@ -19,8 +19,8 @@ import org.bukkit.plugin.PluginManager;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;
import com.massivecraft.factions.entity.MPlayer; 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.Resident;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import mineverse.Aust1n46.chat.MineverseChat; import mineverse.Aust1n46.chat.MineverseChat;
@ -369,9 +369,10 @@ public class ChatListener implements Listener {
} }
if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny")) { if(plugin.getConfig().getBoolean("enable_towny_channel") && pluginManager.isPluginEnabled("Towny")) {
try { try {
TownyUniverse towny = TownyUniverse.getInstance();
if(eventChannel.getName().equalsIgnoreCase("Town")) { if(eventChannel.getName().equalsIgnoreCase("Town")) {
Resident r = TownyUniverse.getDataSource().getResident(p.getName()); Resident r = towny.getResident(p.getName());
Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName()); Resident pp = towny.getResident(mcp.getName());
if(!pp.hasTown()) { if(!pp.hasTown()) {
recipients.remove(p.getPlayer()); recipients.remove(p.getPlayer());
recipientCount--; recipientCount--;
@ -389,8 +390,8 @@ public class ChatListener implements Listener {
} }
} }
if(eventChannel.getName().equalsIgnoreCase("Nation")) { if(eventChannel.getName().equalsIgnoreCase("Nation")) {
Resident r = TownyUniverse.getDataSource().getResident(p.getName()); Resident r = towny.getResident(p.getName());
Resident pp = TownyUniverse.getDataSource().getResident(mcp.getName()); Resident pp = towny.getResident(mcp.getName());
if(!pp.hasNation()) { if(!pp.hasNation()) {
recipients.remove(p.getPlayer()); recipients.remove(p.getPlayer());
recipientCount--; recipientCount--;