summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-02-03 05:15:25 +0000
committerKHobbits <rob@khobbits.co.uk>2013-02-03 05:15:25 +0000
commit04ef95e8709c2266f63513ae4b14f875675bbcbb (patch)
tree02cabd3c77d328f496eab6606e312bd197c94988
parent0d3cf9657b4155f5e660d011b83804f7fcb58669 (diff)
downloadEssentials-04ef95e8709c2266f63513ae4b14f875675bbcbb.tar
Essentials-04ef95e8709c2266f63513ae4b14f875675bbcbb.tar.gz
Essentials-04ef95e8709c2266f63513ae4b14f875675bbcbb.tar.lz
Essentials-04ef95e8709c2266f63513ae4b14f875675bbcbb.tar.xz
Essentials-04ef95e8709c2266f63513ae4b14f875675bbcbb.zip
We don't need move events if afk interact is disabled.
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index a16c9a01f..1ac58d851 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -468,8 +468,8 @@ public class Settings implements ISettings
teleportInvulnerability = _isTeleportInvulnerability();
disableItemPickupWhileAfk = _getDisableItemPickupWhileAfk();
registerBackInListener = _registerBackInListener();
- cancelAfkOnMove = _cancelAfkOnMove();
cancelAfkOnInteract = _cancelAfkOnInteract();
+ cancelAfkOnMove = _cancelAfkOnMove() && cancelAfkOnInteract;
getFreezeAfkPlayers = _getFreezeAfkPlayers();
itemSpawnBl = _getItemSpawnBlacklist();
loginAttackDelay = _getLoginAttackDelay();
@@ -832,7 +832,6 @@ public class Settings implements ISettings
{
return config.getBoolean("cancel-afk-on-move", true);
}
-
private boolean cancelAfkOnInteract;
@Override
@@ -870,7 +869,7 @@ public class Settings implements ISettings
{
return config.getBoolean("repair-enchanted", true);
}
-
+
@Override
public boolean allowUnsafeEnchantments()
{