diff --git a/pom.xml b/pom.xml index 374f305..764cb9b 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ com.cnaude.herochat Herochat - 5.6.7 + 5.7.0 diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java index 5a897cf..17f4f53 100644 --- a/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java +++ b/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java @@ -18,9 +18,9 @@ package com.cnaude.purpleirc.GameListeners; import com.cnaude.purpleirc.PurpleBot; import com.cnaude.purpleirc.PurpleIRC; -import com.dthielke.herochat.ChannelChatEvent; -import com.dthielke.herochat.Chatter; -import com.dthielke.herochat.Chatter.Result; +import com.dthielke.api.ChatResult; +import com.dthielke.api.Chatter; +import com.dthielke.api.event.ChannelChatEvent; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -49,7 +49,8 @@ public class HeroChatListener implements Listener { */ @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL) public void onChannelChatEvent(ChannelChatEvent event) { - Chatter chatter = event.getSender(); + Chatter chatter = event.getChatter(); + ChatResult result = event.getResult(); plugin.logDebug("HC Format: " + event.getFormat()); plugin.logDebug("HC Result: " + event.getResult()); @@ -57,7 +58,7 @@ public class HeroChatListener implements Listener { Player player = chatter.getPlayer(); if (player.hasPermission("irc.message.gamechat") && chatter.getChannels().contains(event.getChannel()) - && event.getResult().equals(Result.ALLOWED)) { + && result.equals(ChatResult.ALLOWED)) { for (PurpleBot ircBot : plugin.ircBots.values()) { if (plugin.heroChatEmoteFormat.equals(event.getFormat())) { plugin.logDebug("HC Emote: TRUE"); diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java index bf55d40..c5a4923 100644 --- a/src/main/java/com/cnaude/purpleirc/PurpleBot.java +++ b/src/main/java/com/cnaude/purpleirc/PurpleBot.java @@ -35,8 +35,8 @@ import com.cnaude.purpleirc.IRCListeners.ServerResponseListener; import com.cnaude.purpleirc.IRCListeners.TopicListener; import com.cnaude.purpleirc.IRCListeners.WhoisListener; import com.cnaude.purpleirc.Utilities.CaseInsensitiveMap; -import com.dthielke.herochat.Chatter; -import com.dthielke.herochat.Herochat; +import com.dthielke.Herochat; +import com.dthielke.api.Chatter; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSortedSet; import com.massivecraft.factions.entity.Faction; diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java index 745eeb7..d3071e4 100644 --- a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java +++ b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java @@ -20,7 +20,7 @@ import com.cnaude.purpleirc.PlayerList; import com.cnaude.purpleirc.PurpleBot; import com.cnaude.purpleirc.PurpleIRC; import com.cnaude.purpleirc.TemplateName; -import com.dthielke.herochat.ChannelManager; +import com.dthielke.channel.ChannelManager; import com.gmail.nossr50.util.player.UserManager; import com.nyancraft.reportrts.data.Ticket; import com.palmergames.bukkit.TownyChat.channels.Channel;