TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-05-17 12:59:57 +00:00
Code Issues Projects Releases Wiki Activity

Optimize PlayerLoginEvent

Browse source
This commit is contained in:
@ArkhamNetwork 2014-05-17 03:49:48 +01:00 committed by KHobbits
parent 4672e51806
commit 9307e0cb71
1 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -340,11 +340,8 @@ 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)
{ {
switch (event.getResult()) if (event.getResult() != Result.KICK_BANNED)
{ {
case KICK_BANNED:
break;
default:
return; return;
} }
@ -355,22 +352,27 @@ 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)
{ {
switch (event.getResult()) if (event.getResult() == Result.KICK_FULL)
{ {
case KICK_FULL: final User user = ess.getUser(event.getPlayer());
case KICK_BANNED: if (user.isAuthorized("essentials.joinfullserver"))
break; {
default: event.allow();
return;
}
event.disallow(Result.KICK_FULL, tl("serverFull"));
return; return;
} }
if (event.getResult() == Result.KICK_BANNED || event.getPlayer().isBanned())
{
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
if (event.getResult() == Result.KICK_BANNED || user.getBase().isBanned())
{
final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis()); final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis());
if (!banExpired) if (banExpired)
{ {
event.allow();
return;
}
String banReason = user.getBanReason(); String banReason = user.getBanReason();
if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban")) if (banReason == null || banReason.isEmpty() || banReason.equalsIgnoreCase("ban"))
{ {
@ -382,18 +384,9 @@ 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);
return;
} }
} }
if (event.getResult() == Result.KICK_FULL && !user.isAuthorized("essentials.joinfullserver"))
{
event.disallow(Result.KICK_FULL, tl("serverFull"));
return;
}
event.allow();
}
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerTeleport(final PlayerTeleportEvent event) public void onPlayerTeleport(final PlayerTeleportEvent event)
{ {