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

Merge remote-tracking branch 'origin/clans/beta' into clans/beta

Browse Source
This commit is contained in:
Shaun Bennett 2016-04-02 14:55:14 +11:00
commit 758004f207
1 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,7 +466,6 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
if (!adminMessage)
{
for (FriendStatus friendInfo : friends.getFriends())
{
@ -548,6 +547,11 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
// If this is a admin message, or the sender isn't muted/ignoring the target
if (adminMessage || canSenderMessageThem(sender, playerTarget))
{
runAsync(new Runnable()
{
@Override
public void run()
{
if (IncognitoManager.Instance.getRepository().GetStatus(playerTarget))
{
@ -555,17 +559,16 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
return;
}
runSync(new Runnable()
{
public void run()
{
// Construct the command to send to redis
RedisMessage globalMessage = new RedisMessage(_serverName,
sender.getName(),
adminMessage ? null : friend.ServerName,
playerTarget,
message,
// 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);
@ -595,6 +598,11 @@ public class MessageManager extends MiniClientPlugin<ClientMessage>
// Time to send the message!
globalMessage.publish();
}
});
}
}
);
}
}
}
}