minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-11 17:15:07 +02:00
Code Issues 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 eafea119a6
commit 8643a27b4e
1 changed files with 27 additions and 34 deletions
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)
public void onPlayerLogin2(final PlayerLoginEvent event)
{
switch (event.getResult())
if (event.getResult() != Result.KICK_BANNED)
{
case KICK_BANNED:
break;
default:
return;
}
@@ -355,22 +352,27 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerLogin(final PlayerLoginEvent event)
{
switch (event.getResult())
if (event.getResult() == Result.KICK_FULL)
{
case KICK_FULL:
case KICK_BANNED:
break;
default:
final User user = ess.getUser(event.getPlayer());
if (user.isAuthorized("essentials.joinfullserver"))
{
event.allow();
return;
}
event.disallow(Result.KICK_FULL, tl("serverFull"));
return;
}
if (event.getResult() == Result.KICK_BANNED || event.getPlayer().isBanned())
{
final User user = ess.getUser(event.getPlayer());
if (event.getResult() == Result.KICK_BANNED || user.getBase().isBanned())
{
final boolean banExpired = user.checkBanTimeout(System.currentTimeMillis());
if (!banExpired)
if (banExpired)
{
event.allow();
return;
}
String banReason = user.getBanReason();
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());
}
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)
public void onPlayerTeleport(final PlayerTeleportEvent event)
{