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

Change some ordering and clean pmd warnings

Browse Source
This commit is contained in:
md_5 2012-04-14 15:07:10 +10:00
parent 45de85dae2
commit 602bd5b0d4
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,13 +31,11 @@ import org.bukkit.inventory.ItemStack;
public class EssentialsPlayerListener implements Listener public class EssentialsPlayerListener implements Listener
{ {
private static final Logger LOGGER = Logger.getLogger("Minecraft"); private static final Logger LOGGER = Logger.getLogger("Minecraft");
private final transient Server server;
private final transient IEssentials ess; private final transient IEssentials ess;
public EssentialsPlayerListener(final IEssentials parent) public EssentialsPlayerListener(final IEssentials parent)
{ {
this.ess = parent; this.ess = parent;
this.server = parent.getServer();
} }
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
@ -217,7 +215,7 @@ public class EssentialsPlayerListener implements Listener
return; return;
} }
User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
if (user.isNPC()) if (user.isNPC())
{ {
user.setNPC(false); user.setNPC(false);
@ -246,8 +244,8 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onPlayerTeleport(final PlayerTeleportEvent event) public void onPlayerTeleport(final PlayerTeleportEvent event)
{ {
boolean backListener = ess.getSettings().registerBackInListener(); final boolean backListener = ess.getSettings().registerBackInListener();
boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability(); final boolean teleportInvulnerability = ess.getSettings().isTeleportInvulnerability();
if (backListener || teleportInvulnerability) if (backListener || teleportInvulnerability)
{ {
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
@ -319,19 +317,16 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.MONITOR) @EventHandler(priority = EventPriority.MONITOR)
public void onPlayerChangedWorld(final PlayerChangedWorldEvent event) public void onPlayerChangedWorld(final PlayerChangedWorldEvent event)
{ {
final User user = ess.getUser(event.getPlayer()); final User user = ess.getUser(event.getPlayer());
final String newWorld = event.getPlayer().getLocation().getWorld().getName(); final String newWorld = event.getPlayer().getLocation().getWorld().getName();
user.setDisplayNick(); user.setDisplayNick();
updateCompass(user); updateCompass(user);
if (ess.getSettings().getNoGodWorlds().contains(newWorld)) if (ess.getSettings().getNoGodWorlds().contains(newWorld) && user.isGodModeEnabledRaw())
{ {
if (user.isGodModeEnabledRaw()) user.sendMessage(_("noGodWorldWarning"));
{
user.sendMessage(_("noGodWorldWarning"));
}
} }
if(!event.getPlayer().getWorld().getName().equals(newWorld)) if (!event.getPlayer().getWorld().getName().equals(newWorld))
{ {
user.sendMessage(_("currentWorld", newWorld)); user.sendMessage(_("currentWorld", newWorld));
} }
@ -343,11 +338,7 @@ public class EssentialsPlayerListener implements Listener
switch (event.getAction()) switch (event.getAction())
{ {
case RIGHT_CLICK_BLOCK: case RIGHT_CLICK_BLOCK:
if (event.isCancelled()) if (!event.isCancelled() && event.getClickedBlock().getTypeId() == Material.BED_BLOCK.getId() && ess.getSettings().getUpdateBedAtDaytime())
{
return;
}
if (event.getClickedBlock().getTypeId() == Material.BED_BLOCK.getId() && ess.getSettings().getUpdateBedAtDaytime())
{ {
event.getPlayer().setBedSpawnLocation(event.getClickedBlock().getLocation()); event.getPlayer().setBedSpawnLocation(event.getClickedBlock().getLocation());
} }
@ -408,14 +399,12 @@ public class EssentialsPlayerListener implements Listener
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
public void onPlayerPickupItem(final PlayerPickupItemEvent event) public void onPlayerPickupItem(final PlayerPickupItemEvent event)
{ {
if (!ess.getSettings().getDisableItemPickupWhileAfk()) if (ess.getSettings().getDisableItemPickupWhileAfk())
{ {
return; if (ess.getUser(event.getPlayer()).isAfk())
} {
final User user = ess.getUser(event.getPlayer()); event.setCancelled(true);
if (user.isAfk()) }
{
event.setCancelled(true);
} }
} }