From 91b504cc66783add6589f29648d0aa6b825a1ab9 Mon Sep 17 00:00:00 2001 From: snowleo Date: Thu, 22 Sep 2011 10:46:23 +0200 Subject: Correctly implement food level on god mode --- Essentials/src/com/earth2me/essentials/Essentials.java | 1 + Essentials/src/com/earth2me/essentials/EssentialsTimer.java | 4 ---- Essentials/src/com/earth2me/essentials/User.java | 9 +++++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index 518e853bb..c98671d94 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -188,6 +188,7 @@ public class Essentials extends JavaPlugin implements IEssentials pm.registerEvent(Type.ENTITY_DAMAGE, entityListener, Priority.Lowest, this); pm.registerEvent(Type.ENTITY_COMBUST, entityListener, Priority.Lowest, this); pm.registerEvent(Type.ENTITY_DEATH, entityListener, Priority.Lowest, this); + pm.registerEvent(Type.FOOD_LEVEL_CHANGE, entityListener, Priority.Lowest, this); jail = new Jail(this); final JailPlayerListener jailPlayerListener = new JailPlayerListener(this); diff --git a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java index ab19450f8..f3b447dae 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsTimer.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsTimer.java @@ -26,10 +26,6 @@ public class EssentialsTimer implements Runnable onlineUsers.add(user); user.setLastOnlineActivity(currentTime); user.checkActivity(); - // Food for god mode - if (user.isGodModeEnabled() && user.getFoodLevel() < 20) { - user.setFoodLevel(20); - } } final Iterator iterator = onlineUsers.iterator(); diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 2f4fc2951..736274de0 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -464,4 +464,13 @@ public class User extends UserData implements Comparable, IReplyTo, IUser { return afkPosition; } + + @Override + public boolean toggleGodModeEnabled() + { + if (!isGodModeEnabled()) { + setFoodLevel(20); + } + return super.toggleGodModeEnabled(); + } } -- cgit v1.2.3