Revert "New config option 'cancel-afk-on-move' - Set to false you don't use afk." -- This should fix afk mode.

This reverts commit d927d047650fdbc53d3993611c91d172397a77c8.

Conflicts:

	Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java

4 files changed, 29 insertions, 57 deletions

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 4fb192293..b062d6ed4 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -73,40 +73,37 @@ public class EssentialsPlayerListener implements Listener
 	@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
 	public void onPlayerMove(final PlayerMoveEvent event)
 	{
-		if ((!ess.getSettings().cancelAfkOnMove() && !ess.getSettings().getFreezeAfkPlayers())
-			|| event.getFrom().getBlockX() == event.getTo().getBlockX()
-			   && event.getFrom().getBlockZ() == event.getTo().getBlockZ()
-			   && event.getFrom().getBlockY() == event.getTo().getBlockY())
+		if (event.getFrom().getBlockX() == event.getTo().getBlockX()
+			&& event.getFrom().getBlockZ() == event.getTo().getBlockZ()
+			&& event.getFrom().getBlockY() == event.getTo().getBlockY())
 		{
 			return;
 		}
 
 		final User user = ess.getUser(event.getPlayer());
-		if (user.isAfk())
+
+		if (user.isAfk() && ess.getSettings().getFreezeAfkPlayers())
 		{
-			if (ess.getSettings().getFreezeAfkPlayers())
+			final Location from = event.getFrom();
+			final Location to = event.getTo().clone();
+			to.setX(from.getX());
+			to.setY(from.getY());
+			to.setZ(from.getZ());
+			try
 			{
-				final Location from = event.getFrom();
-				final Location to = event.getTo().clone();
-				to.setX(from.getX());
-				to.setY(from.getY());
-				to.setZ(from.getZ());
-				try
-				{
-					event.setTo(Util.getSafeDestination(to));
-				}
-				catch (Exception ex)
-				{
-					event.setTo(to);
-				}
-				return;
+				event.setTo(Util.getSafeDestination(to));
 			}
-
-			final Location afk = user.getAfkPosition();
-			if (afk == null || event.getTo().getWorld() != afk.getWorld() || afk.distanceSquared(event.getTo()) > 9)
+			catch (Exception ex)
 			{
-				user.updateActivity(true);
+				event.setTo(to);
 			}
+			return;
+		}
+
+		final Location afk = user.getAfkPosition();
+		if (afk == null || !event.getTo().getWorld().equals(afk.getWorld()) || afk.distanceSquared(event.getTo()) > 9)
+		{
+			user.updateActivity(true);
 		}
 	}
 
diff --git a/Essentials/src/com/earth2me/essentials/ISettings.java b/Essentials/src/com/earth2me/essentials/ISettings.java
index 8eca8f06f..2c07ccd58 100644
--- a/Essentials/src/com/earth2me/essentials/ISettings.java
+++ b/Essentials/src/com/earth2me/essentials/ISettings.java
@@ -127,7 +127,7 @@ public interface ISettings extends IConf
 	boolean removeGodOnDisconnect();
 
 	boolean changeDisplayName();
-
+	
 	boolean changePlayerListName();
 
 	boolean isPlayerCommand(String string);
@@ -146,8 +146,6 @@ public interface ISettings extends IConf
 
 	boolean getFreezeAfkPlayers();
 
-	boolean cancelAfkOnMove();
-
 	boolean areDeathMessagesEnabled();
 
 	public void setDebug(boolean debug);
@@ -167,12 +165,12 @@ public interface ISettings extends IConf
 	EventPriority getRespawnPriority();
 
 	long getTpaAcceptCancellation();
-
+	
 	boolean isMetricsEnabled();
-
+	
 	void setMetricsEnabled(boolean metricsEnabled);
 
 	long getTeleportInvulnerability();
-
+	
 	boolean isTeleportInvulnerability();
 }
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 5d49c52b8..281280122 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -385,8 +385,6 @@ public class Settings implements ISettings
 		teleportInvulnerability = _isTeleportInvulnerability();
 		disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
 		registerBackInListener = _registerBackInListener();
-		cancelAfkOnMove = _cancelAfkOnMove();
-		getFreezeAfkPlayers = _getFreezeAfkPlayers();
 		itemSpawnBl = _getItemSpawnBlacklist();
 		kits = _getKits();
 		chatFormats.clear();
@@ -656,30 +654,12 @@ public class Settings implements ISettings
 	{
 		return config.getLong("auto-afk-kick", -1);
 	}
-	private boolean getFreezeAfkPlayers;
 
 	@Override
 	public boolean getFreezeAfkPlayers()
 	{
-		return getFreezeAfkPlayers;
-	}
-
-	private boolean _getFreezeAfkPlayers()
-	{
 		return config.getBoolean("freeze-afk-players", false);
 	}
-	private boolean cancelAfkOnMove;
-
-	@Override
-	public boolean cancelAfkOnMove()
-	{
-		return cancelAfkOnMove;
-	}
-
-	private boolean _cancelAfkOnMove()
-	{
-		return config.getBoolean("cancel-afk-on-move", true);
-	}
 
 	@Override
 	public boolean areDeathMessagesEnabled()
@@ -711,18 +691,20 @@ public class Settings implements ISettings
 	{
 		return config.getBoolean("world-teleport-permissions", false);
 	}
-	private boolean registerBackInListener;
 
+	private boolean registerBackInListener;
+	
 	@Override
 	public boolean registerBackInListener()
 	{
 		return registerBackInListener;
 	}
-
+	
 	private boolean _registerBackInListener()
 	{
 		return config.getBoolean("register-back-in-listener", false);
 	}
+	
 	private boolean disableItemPickupWhileAfk;
 
 	@Override
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index c7c9decb0..e8378f77e 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -272,11 +272,6 @@ freeze-afk-players: false
 # Enable this, when you don't want people idling in mob traps.
 disable-item-pickup-while-afk: false
 
-# Should we automatically remove afk status when the player moves?
-# Player will be removed from afk on chat/command reguardless of this setting.
-# Disable this to reduce server lag.
-cancel-afk-on-move: true
-
 # You can disable the death messages of minecraft here
 death-messages: true