Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 16:45:37 +01:00
Code Issues Projects Releases Wiki Activity

*make it look like i'm doing something*

Browse Source
This commit is contained in:
KHobbits 2012-03-03 05:27:02 +00:00
parent b6bbe237ea
commit 301b609e93
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/EssentialsBlockListener.java
View File

@ -32,7 +32,7 @@ public class EssentialsBlockListener implements Listener
{ {
return; return;
} }
boolean unlimitedForUser = user.hasUnlimited(is); final boolean unlimitedForUser = user.hasUnlimited(is);
if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL) if (unlimitedForUser && user.getGameMode() == GameMode.SURVIVAL)
{ {
ess.scheduleSyncDelayedTask( ess.scheduleSyncDelayedTask(

15
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -182,15 +182,16 @@ 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()) { switch (event.getResult())
{
case ALLOWED: case ALLOWED:
case KICK_FULL: case KICK_FULL:
case KICK_BANNED: case KICK_BANNED:
break; break;
default: default:
return; return;
} }
User user = ess.getUser(event.getPlayer()); User user = ess.getUser(event.getPlayer());
user.setNPC(false); user.setNPC(false);
@ -199,7 +200,7 @@ public class EssentialsPlayerListener implements Listener
user.checkMuteTimeout(currentTime); user.checkMuteTimeout(currentTime);
user.checkJailTimeout(currentTime); user.checkJailTimeout(currentTime);
if (banExpired == false && (user.isBanned() || event.getResult() == Result.KICK_BANNED)) if (!banExpired && (user.isBanned() || event.getResult() == Result.KICK_BANNED))
{ {
final String banReason = user.getBanReason(); final String banReason = user.getBanReason();
event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason")); event.disallow(Result.KICK_BANNED, banReason != null && !banReason.isEmpty() && !banReason.equalsIgnoreCase("ban") ? banReason : _("defaultBanReason"));
@ -291,7 +292,7 @@ public class EssentialsPlayerListener implements Listener
{ {
for (Player player : ess.getServer().getOnlinePlayers()) for (Player player : ess.getServer().getOnlinePlayers())
{ {
User spyer = ess.getUser(player); final User spyer = ess.getUser(player);
if (spyer.isSocialSpyEnabled() && !user.equals(spyer)) if (spyer.isSocialSpyEnabled() && !user.equals(spyer))
{ {
player.sendMessage(user.getDisplayName() + " : " + event.getMessage()); player.sendMessage(user.getDisplayName() + " : " + event.getMessage());
@ -400,7 +401,7 @@ public class EssentialsPlayerListener implements Listener
} }
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void onPlayerPickupItem(PlayerPickupItemEvent event) public void onPlayerPickupItem(final PlayerPickupItemEvent event)
{ {
if (event.isCancelled() || !ess.getSettings().getDisableItemPickupWhileAfk()) if (event.isCancelled() || !ess.getSettings().getDisableItemPickupWhileAfk())
{ {