Don't use mcMMO API to send messages.

cnaude · Jun 7, 2015 · fb8b9ce · fb8b9ce
1 parent c5e1be7
commit fb8b9ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 35 deletions.
diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java
@@ -38,19 +38,10 @@ public McMMOChatListener(PurpleIRC plugin) {
     }
 
     @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,39 +52,21 @@ public void onMcMMOChatEvent(McMMOChatEvent event) {
     }
 
     @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());
                 }
             }
         }
     }
 
     @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();

diff --git a/src/main/java/com/cnaude/purpleirc/Hooks/McMMOChatHook.java b/src/main/java/com/cnaude/purpleirc/Hooks/McMMOChatHook.java
@@ -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 McMMOChatHook(PurpleIRC plugin) {
     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 void sendPartyMessage(String sender, String party, String message) {
             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;
                 }
             }