diff --git a/src/com/massivecraft/mcore/InternalListener.java b/src/com/massivecraft/mcore/InternalListener.java index 76dee661..6740e357 100644 --- a/src/com/massivecraft/mcore/InternalListener.java +++ b/src/com/massivecraft/mcore/InternalListener.java @@ -62,21 +62,6 @@ public class InternalListener implements Listener // It clears the recipient set so the event isn't cancelled completely. // It will cause non async chat events not to fire. - public static void recipientChat(Player sender, String message, String format, Set recipients) - { - // For each of the recipients - for (CommandSender recipient : recipients) - { - // Run the event for this unique recipient - MCorePlayerToRecipientChatEvent recipientEvent = new MCorePlayerToRecipientChatEvent(sender, recipient, message, format); - recipientEvent.run(); - - // Format and send with the format and message from this recipient's own event. - String recipientMessage = String.format(recipientEvent.getFormat(), sender.getDisplayName(), recipientEvent.getMessage()); - recipient.sendMessage(recipientMessage); - } - } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void recipientChat(final AsyncPlayerChatEvent event) { @@ -97,7 +82,7 @@ public class InternalListener implements Listener for (Player recipient : players) { // Run the event for this unique recipient - recipientEvent = new MCorePlayerToRecipientChatEvent(sender, recipient, message, format); + recipientEvent = new MCorePlayerToRecipientChatEvent(event.isAsynchronous(), sender, recipient, message, format); recipientEvent.run(); // Format and send with the format and message from this recipient's own event. @@ -106,7 +91,7 @@ public class InternalListener implements Listener } // For the console - recipientEvent = new MCorePlayerToRecipientChatEvent(sender, Bukkit.getConsoleSender(), message, format); + recipientEvent = new MCorePlayerToRecipientChatEvent(event.isAsynchronous(), sender, Bukkit.getConsoleSender(), message, format); recipientEvent.run(); event.setMessage(recipientEvent.getMessage()); event.setFormat(recipientEvent.getFormat()); diff --git a/src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java b/src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java index beb2e92e..896a6562 100644 --- a/src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java +++ b/src/com/massivecraft/mcore/event/MCorePlayerToRecipientChatEvent.java @@ -36,9 +36,9 @@ public class MCorePlayerToRecipientChatEvent extends MCoreEvent // CONSTRUCT // -------------------------------------------- // - public MCorePlayerToRecipientChatEvent(Player sender, CommandSender recipient, String message, String format) + public MCorePlayerToRecipientChatEvent(boolean async, Player sender, CommandSender recipient, String message, String format) { - super(true); + super(async); this.sender = sender; this.recipient = recipient; this.message = message;