diff --git a/src/com/redstoner/modules/chat/Chat.cmd b/src/com/redstoner/modules/chat/Chat.cmd index fe511e7..1e6bc13 100644 --- a/src/com/redstoner/modules/chat/Chat.cmd +++ b/src/com/redstoner/modules/chat/Chat.cmd @@ -26,6 +26,11 @@ command shrug { run shrug message; help Appends the shrug emoticon to the end of your message.; } + [empty] { + perm utils.shrug; + run shrug; + help Just the shrug emoticon.; + } } command say { [string:message...] { diff --git a/src/com/redstoner/modules/chat/Chat.java b/src/com/redstoner/modules/chat/Chat.java index 0053bcb..22ff4e0 100644 --- a/src/com/redstoner/modules/chat/Chat.java +++ b/src/com/redstoner/modules/chat/Chat.java @@ -97,6 +97,13 @@ public class Chat implements Module, Listener return true; } + @Command(hook = "shrugnoarg") + public boolean shrug(CommandSender sender) + { + broadcastFormatted("shrug", sender, ""); + return true; + } + @Command(hook = "mute") public boolean mute(CommandSender sender, String player) { diff --git a/src/com/redstoner/modules/mentio/Mentio.java b/src/com/redstoner/modules/mentio/Mentio.java index b224175..3328280 100644 --- a/src/com/redstoner/modules/mentio/Mentio.java +++ b/src/com/redstoner/modules/mentio/Mentio.java @@ -19,10 +19,12 @@ import com.nemez.cmdmgr.Command; 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.CommandHolderType; import com.redstoner.misc.JsonManager; import com.redstoner.misc.Main; import com.redstoner.modules.Module; +import com.redstoner.modules.ignore.Ignore; import net.nemez.chatapi.click.Message; @@ -127,6 +129,8 @@ public class Mentio implements Module, Listener return; for (Player player : event.getRecipients()) { + if (ModuleLoader.exists("Ignore") ? !Ignore.getIgnoredBy(event.getPlayer()).sendTo(player) : false) + return; UUID uuid = player.getUniqueId(); JSONArray playerMentios = (JSONArray) mentios.get(uuid.toString()); if (playerMentios == null)