Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2025-02-09 08:01:38 +01:00
Code Issues Projects Releases Wiki Activity

Fall back to Herochat 5.6.5 (re-up)

Browse Source
This commit is contained in:
cnaude 2016-05-30 10:50:09 -07:00
parent 5071014d7f
commit aebf34f88e
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -197,7 +197,7 @@
<dependency>
<groupId>com.cnaude.herochat</groupId>
<artifactId>Herochat</artifactId>
<version>5.7.0</version>
<version>5.6.5</version>
</dependency>
<!-- VentureChat -->

18
src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java
View File

@ -18,11 +18,11 @@ package com.cnaude.purpleirc.GameListeners;
import com.cnaude.purpleirc.PurpleBot;
import com.cnaude.purpleirc.PurpleIRC;
import com.dthielke.api.Channel;
import com.dthielke.api.ChatResult;
import com.dthielke.api.Chatter;
import com.dthielke.api.event.ChannelChatEvent;
import com.dthielke.channel.ConversationChannel;
import com.dthielke.herochat.Channel;
import com.dthielke.herochat.ChannelChatEvent;
import com.dthielke.herochat.Chatter;
import com.dthielke.herochat.Chatter.Result;
import com.dthielke.herochat.ConversationChannel;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -51,13 +51,13 @@ public class HeroChatListener implements Listener {
*/
@EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
public void onChannelChatEvent(ChannelChatEvent event) {
Chatter chatter = event.getChatter();
Chatter chatter = event.getSender();
Channel channel = chatter.getActiveChannel();
if (channel instanceof ConversationChannel || event.getFormat().contains("{convopartner}")) {
plugin.logDebug("Ignoring private message: " + chatter.getPrivateMessageFocus() + ":" + event.getMessage());
plugin.logDebug("Ignoring private message: " + event.getMessage());
return;
}
ChatResult result = event.getResult();
Result result = event.getResult();
plugin.logDebug("HC Format: " + event.getFormat());
plugin.logDebug("HC Result: " + event.getResult());
if (plugin.heroPrivateChatFormat.equals(event.getFormat())) {
@ -69,7 +69,7 @@ public class HeroChatListener implements Listener {
Player player = chatter.getPlayer();
if (player.hasPermission("irc.message.gamechat")
&& chatter.getChannels().contains(event.getChannel())
&& result.equals(ChatResult.ALLOWED)) {
&& result.equals(Result.ALLOWED)) {
for (PurpleBot ircBot : plugin.ircBots.values()) {
if (plugin.heroChatEmoteFormat.equals(event.getFormat())) {
plugin.logDebug("HC Emote: TRUE");

4
src/main/java/com/cnaude/purpleirc/PurpleBot.java
View File

@ -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;
import com.dthielke.api.Chatter;
import com.dthielke.herochat.Herochat;
import com.dthielke.herochat.Chatter;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableSortedSet;
import com.massivecraft.factions.entity.Faction;

2
src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
View File

@ -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.channel.ChannelManager;
import com.dthielke.herochat.ChannelManager;
import com.gmail.nossr50.util.player.UserManager;
import com.nyancraft.reportrts.data.Ticket;
import com.palmergames.bukkit.TownyChat.channels.Channel;