diff options
| author | Khyperia <khyperia@live.com> | 2011-12-03 11:14:53 -0500 |
|---|---|---|
| committer | Khyperia <khyperia@live.com> | 2011-12-03 11:14:53 -0500 |
| commit | 85d743dce50590b69109f3fb82cb78777069b2e8 (patch) | |
| tree | e129e5d1fb2932bc65a6854c97d7152dda1e7c96 | |
| parent | dc74239edc08ebb21e38ce20105aaea864890b59 (diff) | |
| parent | 118b3638eb18ac61365a0679f8d01ebd5aa8e482 (diff) | |
| download | Essentials-85d743dce50590b69109f3fb82cb78777069b2e8.tar Essentials-85d743dce50590b69109f3fb82cb78777069b2e8.tar.gz Essentials-85d743dce50590b69109f3fb82cb78777069b2e8.tar.lz Essentials-85d743dce50590b69109f3fb82cb78777069b2e8.tar.xz Essentials-85d743dce50590b69109f3fb82cb78777069b2e8.zip | |
Merge commit
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/User.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 3c1166240..2ef59eb88 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -468,10 +468,11 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser public void checkActivity() { final long autoafkkick = ess.getSettings().getAutoAfkKick(); - if (autoafkkick > 0 && lastActivity + autoafkkick * 1000 < System.currentTimeMillis() + if (autoafkkick > 0 && lastActivity > 0 && (lastActivity + (autoafkkick * 1000)) < System.currentTimeMillis() && !isHidden() && !isAuthorized("essentials.kick.exempt") && !isAuthorized("essentials.afk.kickexempt")) { final String kickReason = _("autoAfkKickReason", autoafkkick / 60.0); + lastActivity = 0; kickPlayer(kickReason); |