TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-26 16:39:45 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fixed bug when logging in silently"

Browse source 
This reverts commit 5fe19dbd83.
This commit is contained in:
Chris Ward 2013-12-07 13:24:48 +11:00
parent fed250fd74
commit e864696b00
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View file

@ -186,30 +186,19 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerJoin(final PlayerJoinEvent event)
{
final String joinMessage = event.getJoinMessage();
ess.runTaskAsynchronously(new Runnable()
{
@Override
public void run()
{
delayedJoin(event.getPlayer());
delayedJoin(event.getPlayer(), joinMessage);
}
});
if (ess.getSettings().allowSilentJoinQuit() && event.getPlayer().hasPermission("essentials.silentjoin"))
{
event.setJoinMessage(null);
}
if (ess.getSettings().isCustomJoinMessage() && event.getJoinMessage() != null)
{
event.setJoinMessage(null);
ess.getServer().broadcastMessage(
ess.getSettings().getCustomJoinMessage()
.replace("{PLAYER}", event.getPlayer().getDisplayName())
.replace("{USERNAME}", event.getPlayer().getName())
);
}
event.setJoinMessage(null);
}
public void delayedJoin(final Player player)
public void delayedJoin(final Player player, final String message)
{
if (!player.isOnline())
{
@ -219,6 +208,7 @@ public class EssentialsPlayerListener implements Listener
ess.getBackup().onPlayerJoin();
final User user = ess.getUser(player);
if (user.isNPC())
{
user.setNPC(false);
@ -259,6 +249,19 @@ public class EssentialsPlayerListener implements Listener
user.setSleepingIgnored(true);
}
if (ess.getSettings().isCustomJoinMessage())
{
ess.getServer().broadcastMessage(
ess.getSettings().getCustomJoinMessage()
.replace("{PLAYER}", player.getDisplayName())
.replace("{USERNAME}", player.getName())
);
}
else if (!(ess.getSettings().allowSilentJoinQuit() && user.isAuthorized("esentials.silentjoin")) && message != null)
{
ess.getServer().broadcastMessage(message);
}
if (!ess.getSettings().isCommandDisabled("motd") && user.isAuthorized("essentials.motd"))
{
try