Redstoner/Modules
Archived
0
Fork 0
Code Activity

Did the old fixeroo, now it no longer dupes messages

Browse Source
This commit is contained in:
Pepich
2018-02-02 13:39:29 +01:00
parent df6677f289
commit b9707cb519
1 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/redstoner/modules/chat/Chat.java
View File

@@ -13,6 +13,7 @@ import com.redstoner.annotations.AutoRegisterListener;
import com.redstoner.annotations.Commands;
import com.redstoner.annotations.Version;
import com.redstoner.coremods.moduleLoader.ModuleLoader;
import com.redstoner.misc.BroadcastFilter;
import com.redstoner.misc.CommandHolderType;
import com.redstoner.misc.Utils;
import com.redstoner.modules.Module;
@@ -116,10 +117,21 @@ public class Chat implements Module, Listener
public boolean broadcastFormatted(String format, CommandSender sender, String message)
{
return broadcastFormatted(format, sender, message, Utils.getName(sender));
return broadcastFormatted(format, sender, message, Utils.getName(sender), null);
}
public boolean broadcastFormatted(String format, CommandSender sender, String message, String name)
{
return broadcastFormatted(format, sender, message, name, null);
}
public boolean broadcastFormatted(String format, CommandSender sender, String message, AsyncPlayerChatEvent event)
{
return broadcastFormatted(format, sender, message, Utils.getName(sender), null);
}
public boolean broadcastFormatted(String format, CommandSender sender, String message, String name,
AsyncPlayerChatEvent event)
{
if ((boolean) DataManager.getOrDefault(sender, "muted", false))
{
@@ -130,7 +142,22 @@ public class Chat implements Module, Listener
}
String raw = (String) DataManager.getConfigOrDefault(format, " %n §7→§r %m");
String formatted = raw.replace("%n", name).replace("%m", message);
Utils.broadcast("", formatted, ModuleLoader.exists("Ignore") ? Ignore.getIgnoredBy(sender) : null);
Utils.broadcast("", formatted, wrap(ModuleLoader.exists("Ignore") ? Ignore.getIgnoredBy(sender) : null, event));
return true;
}
public BroadcastFilter wrap(BroadcastFilter filter, AsyncPlayerChatEvent event)
{
if (event == null)
return filter;
else
return new BroadcastFilter()
{
@Override
public boolean sendTo(CommandSender recipient)
{
return filter.sendTo(recipient) && event.getRecipients().contains(recipient);
}
};
}
}