Correctly implement food level on god mode

This commit is contained in:
snowleo 2011-09-22 10:46:23 +02:00
parent 6ea57bcd2f
commit 91b504cc66
3 changed files with 10 additions and 4 deletions

View File

@ -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);

View File

@ -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<User> iterator = onlineUsers.iterator();

View File

@ -464,4 +464,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
{
return afkPosition;
}
@Override
public boolean toggleGodModeEnabled()
{
if (!isGodModeEnabled()) {
setFoodLevel(20);
}
return super.toggleGodModeEnabled();
}
}