TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Tweak to player login event.

Browse source
This commit is contained in:
KHobbits 2014-05-18 13:26:04 +01:00
parent 429a7275ee
commit b145ec59ea
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -340,8 +340,11 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onPlayerLogin2(final PlayerLoginEvent event) public void onPlayerLogin2(final PlayerLoginEvent event)
{ {
if (event.getResult() != Result.KICK_BANNED) switch (event.getResult())
{ {
case KICK_BANNED:
break;
default:
return; return;
} }
@ -352,20 +355,19 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void onPlayerLogin(final PlayerLoginEvent event) public void onPlayerLogin(final PlayerLoginEvent event)
{ {
if (event.getResult() == Result.KICK_FULL) switch (event.getResult())
{ {
final User user = ess.getUser(event.getPlayer()); case KICK_FULL:
if (user.isAuthorized("essentials.joinfullserver")) final User kfuser = ess.getUser(event.getPlayer());
if (kfuser.isAuthorized("essentials.joinfullserver"))
{ {
event.allow(); event.allow();
return; return;
} }
event.disallow(Result.KICK_FULL, tl("serverFull")); event.disallow(Result.KICK_FULL, tl("serverFull"));
return; break;
}
if (event.getResult() == Result.KICK_BANNED || event.getPlayer().isBanned()) case KICK_BANNED:
{
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis()); final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis());
if (banExpired) if (banExpired)
@ -384,6 +386,10 @@ public class EssentialsPlayerListener implements Listener
banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getBanTimeout()); banReason += "\n\n" + "Expires in " + DateUtil.formatDateDiff(user.getBanTimeout());
} }
event.disallow(Result.KICK_BANNED, banReason); event.disallow(Result.KICK_BANNED, banReason);
break;
default:
break;
} }
} }