Fix join/quit messages.

This commit is contained in:
William Burns 2016-04-02 11:08:40 +01:00
parent 6072753624
commit 15cf7f574d
1 changed files with 18 additions and 24 deletions

View File

@ -593,21 +593,18 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
event.setJoinMessage(null);
return;
}
if (event.getJoinMessage() != null)
event.setJoinMessage(null);
for (Player other : UtilServer.getPlayers())
{
event.setJoinMessage(null);
for (Player other : UtilServer.getPlayers())
if (_tutorialManager.isInTutorial(other))
{
if (_tutorialManager.isInTutorial(other))
{
// Don't display join message if player in tutorial.
continue;
}
other.sendMessage(F.sys("Join", event.getPlayer().getName()));
// Don't display join message if player in tutorial.
continue;
}
other.sendMessage(F.sys("Join", event.getPlayer().getName()));
}
}
@ -619,21 +616,18 @@ public class ClansManager extends MiniClientPlugin<ClientClan>implements IRelati
event.setQuitMessage(null);
return;
}
if (event.getQuitMessage() != null)
event.setQuitMessage(null);
for (Player other : UtilServer.getPlayers())
{
event.setQuitMessage(null);
for (Player other : UtilServer.getPlayers())
if (_tutorialManager.isInTutorial(other))
{
if (_tutorialManager.isInTutorial(other))
{
// Don't display quit message if player in tutorial.
continue;
}
other.sendMessage(F.sys("Quit", event.getPlayer().getName()));
// Don't display quit message if player in tutorial.
continue;
}
other.sendMessage(F.sys("Quit", event.getPlayer().getName()));
}
}