Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-09-29 16:17:25 +02:00
Code Issues Projects Releases Wiki Activity

Correctly implement food level on god mode

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Essentials/src/com/earth2me/essentials/Essentials.java
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_DAMAGE, entityListener, Priority.Lowest, this);
pm.registerEvent(Type.ENTITY_COMBUST, 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.ENTITY_DEATH, entityListener, Priority.Lowest, this);
pm.registerEvent(Type.FOOD_LEVEL_CHANGE, entityListener, Priority.Lowest, this);
jail = new Jail(this); jail = new Jail(this);
final JailPlayerListener jailPlayerListener = new JailPlayerListener(this); final JailPlayerListener jailPlayerListener = new JailPlayerListener(this);

4
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
View File

@ -26,10 +26,6 @@ public class EssentialsTimer implements Runnable
onlineUsers.add(user); onlineUsers.add(user);
user.setLastOnlineActivity(currentTime); user.setLastOnlineActivity(currentTime);
user.checkActivity(); user.checkActivity();
// Food for god mode
if (user.isGodModeEnabled() && user.getFoodLevel() < 20) {
user.setFoodLevel(20);
}
} }
final Iterator<User> iterator = onlineUsers.iterator(); final Iterator<User> iterator = onlineUsers.iterator();

9
Essentials/src/com/earth2me/essentials/User.java
View File

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