JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If private messaging is turned off, deny messages, even from friends.

This commit is contained in:
libraryaddict 2015-02-15 22:10:15 +13:00
parent 3ef3689e6d
commit 3b0a131ca2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plugins/Mineplex.Core/src/mineplex/core/message/MessageManager.java
View File

@ -60,13 +60,15 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
_punish = punish;
_friendsManager = friendManager;
_serverName = GetPlugin().getConfig().getString("serverstatus.name");
MessageHandler messageHandler = new MessageHandler(this);
ServerCommandManager.getInstance().registerCommandType("AnnouncementCommand", AnnouncementCommand.class, new AnnouncementHandler());
ServerCommandManager.getInstance().registerCommandType("AnnouncementCommand", AnnouncementCommand.class,
new AnnouncementHandler());
ServerCommandManager.getInstance().registerCommandType("RedisMessage", RedisMessage.class, messageHandler);
ServerCommandManager.getInstance().registerCommandType("RedisMessageCallback", RedisMessageCallback.class, messageHandler);
ServerCommandManager.getInstance()
.registerCommandType("RedisMessageCallback", RedisMessageCallback.class, messageHandler);
}
public void AddCommands()
@ -113,7 +115,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
{
// If the receiver has turned off private messaging and the sender isn't a mod
if (!_friendsManager.isFriends(target, sender) && !_preferences.Get(target).PrivateMessaging)
if (!_preferences.Get(target).PrivateMessaging)
{
return C.cPurple + target.getName() + " has private messaging disabled.";
@ -472,7 +474,7 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
// Include the sender's rank if this is a admin message. So we can format the receivers chat.
adminMessage ? F.rank(_clientManager.Get(sender).GetRank()) : null);
final UUID uuid = globalMessage.getUUID();
// A backup for the rare case where the message fails to deliver. Server doesn't respond