Fix players in tutorial receiving messages from the real game whenever the message sender is not in a clan.

This commit is contained in:
Ben 2016-05-02 10:31:45 +01:00
parent 026ab15099
commit 8a1b5572a8
1 changed files with 7 additions and 23 deletions

View File

@ -855,7 +855,13 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
{ {
if (clan == null) if (clan == null)
{ {
UtilServer.broadcast(String.format(rank + C.cYellow + "%s " + C.cWhite + "%s", event.getPlayer().getName(), _chat.getFilteredMessage(event.getPlayer(), event.getMessage()))); for (Player other : event.getRecipients())
{
if (_tutorial.inTutorial(other))
continue;
UtilPlayer.message(other, String.format(rank + C.cYellow + "%s " + C.cWhite + "%s", event.getPlayer().getName(), event.getMessage()));
}
return; return;
} }
@ -903,28 +909,6 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void handlePlayerChat(AsyncPlayerChatEvent event) public void handlePlayerChat(AsyncPlayerChatEvent event)
{ {
// PunishClient punishclient = _punish.GetClient(event.getPlayer().getName());
//
// if (punishclient != null && punishclient.IsMuted())
// {
// return;
// }
//
// if (_chat.SilenceCheck(event.getPlayer()))
// {
// return;
// }
// MessageData lastMessage = _chat.lastMessage(event.getPlayer());
// long chatSlowTime = 1000L * _chat.getChatSlow();
// long timeDiff = System.currentTimeMillis() - lastMessage.getTimeSent();
// if (timeDiff < chatSlowTime && !_clientManager.Get(event.getPlayer()).GetRank().has(Rank.HELPER))
// {
//
// }
ClientClan client = Get(event.getPlayer()); ClientClan client = Get(event.getPlayer());
if (client == null) if (client == null)