Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2024-09-30 23:47:34 +02:00
Code Issues Projects Releases Wiki Activity

Don't use mcMMO API to send messages.

Browse Source
This commit is contained in:
cnaude 2015-06-07 14:20:20 -07:00
parent 2c689c0271
commit edea3e8b73
2 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java
View File

@ -38,19 +38,10 @@ public class McMMOChatListener implements Listener {
}
@EventHandler
public void onMcMMOChatEvent(McMMOChatEvent event) {
String message = event.getMessage();
message = message.replace(PurpleIRC.TOWNYTAG, "");
if (message.contains(PurpleIRC.PURPLETAG)) {
message = message.replace(PurpleIRC.PURPLETAG, "");
event.setMessage(message);
plugin.logDebug("[onMcMMOChatEvent]: PurpleIRC tag detected. Not sending back IRC." );
return;
}
public void onMcMMOChatEvent(McMMOChatEvent event) {
String sender = event.getSender();
Player player = plugin.getServer().getPlayer(sender);
plugin.logDebug("McMMOChatEvent caught: " + sender);
plugin.logDebug("[onMcMMOChatEvent]: " + sender);
if (player != null && !sender.isEmpty()) {
if (player.hasPermission("irc.message.gamechat")) {
for (PurpleBot ircBot : plugin.ircBots.values()) {
@ -61,23 +52,14 @@ public class McMMOChatListener implements Listener {
}
@EventHandler
public void onMcMMOAdminChatEvent(McMMOAdminChatEvent event) {
String message = event.getMessage();
message = message.replace(PurpleIRC.TOWNYTAG, "");
if (message.contains(PurpleIRC.PURPLETAG)) {
message = message.replace(PurpleIRC.PURPLETAG, "");
event.setMessage(message);
plugin.logDebug("[onMcMMOAdminChatEvent]: PurpleIRC tag detected. Not sending back IRC." );
return;
}
public void onMcMMOAdminChatEvent(McMMOAdminChatEvent event) {
String sender = event.getSender();
Player player = plugin.getServer().getPlayer(sender);
plugin.logDebug("McMMOAdminChatEvent caught: " + sender);
plugin.logDebug("[onMcMMOAdminChatEvent]: " + sender);
if (player != null && !sender.isEmpty()) {
if (player.hasPermission("irc.message.gamechat")) {
for (PurpleBot ircBot : plugin.ircBots.values()) {
ircBot.mcMMOAdminChat(player, message);
ircBot.mcMMOAdminChat(player, event.getMessage());
}
}
}
@ -85,15 +67,6 @@ public class McMMOChatListener implements Listener {
@EventHandler
public void onMcMMOPartyChatEvent(McMMOPartyChatEvent event) {
String message = event.getMessage();
message = message.replace(PurpleIRC.TOWNYTAG, "");
if (message.contains(PurpleIRC.PURPLETAG)) {
message = message.replace(PurpleIRC.PURPLETAG, "");
event.setMessage(message);
plugin.logDebug("[onMcMMOPartyChatEvent]: PurpleIRC tag detected. Not sending back IRC." );
return;
}
String sender = event.getSender();
Player player = plugin.getServer().getPlayer(sender);
String party = event.getParty();

11
src/main/java/com/cnaude/purpleirc/Hooks/McMMOChatHook.java
View File

@ -17,9 +17,12 @@
package com.cnaude.purpleirc.Hooks;
import com.cnaude.purpleirc.PurpleIRC;
import com.gmail.nossr50.api.ChatAPI;
import com.gmail.nossr50.api.PartyAPI;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.datatypes.party.Party;
import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.runnables.party.PartyChatTask;
import org.bukkit.plugin.Plugin;
/**
@ -43,7 +46,9 @@ public class McMMOChatHook {
public void sendAdminMessage(String sender, String message) {
if (mcMMOPlugin != null) {
plugin.logDebug("[mcMMOChatHook:sendAdminMessage]: " + message);
ChatAPI.sendAdminChat(mcMMOPlugin, sender, PurpleIRC.PURPLETAG + message);
String chatPrefix = Config.getInstance().getAdminChatPrefix();
message = LocaleLoader.formatString(chatPrefix, sender) + " " + message;
plugin.getServer().broadcast(message, "mcmmo.chat.adminchat");
}
}
@ -52,7 +57,7 @@ public class McMMOChatHook {
for (Party p : PartyAPI.getParties()) {
if (p.getName().equalsIgnoreCase(party)) {
plugin.logDebug("[mcMMOChatHook:sendPartyMessage]: " + party + " : " + message);
ChatAPI.sendPartyChat(mcMMOPlugin, sender, party, PurpleIRC.PURPLETAG + message);
new PartyChatTask(mcMMOPlugin, PartyManager.getParty(party), sender, sender, message).runTask(mcMMOPlugin);
return;
}
}