summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-02-05 23:33:22 +0000
committerKHobbits <rob@khobbits.co.uk>2013-02-05 23:34:08 +0000
commit5bb677532330de194ea5726a9df566a54e8311d0 (patch)
tree05a982c3184db4e1e5f72868bb9ac32cead332ff
parentac7bae8ccf93cecdaf288b8167f2c27e60c56368 (diff)
downloadEssentials-5bb677532330de194ea5726a9df566a54e8311d0.tar
Essentials-5bb677532330de194ea5726a9df566a54e8311d0.tar.gz
Essentials-5bb677532330de194ea5726a9df566a54e8311d0.tar.lz
Essentials-5bb677532330de194ea5726a9df566a54e8311d0.tar.xz
Essentials-5bb677532330de194ea5726a9df566a54e8311d0.zip
Don't block food recovery in god mode.
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java3
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandgod.java1
2 files changed, 4 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
index 653068420..fe7cd49f0 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
@@ -169,6 +169,9 @@ public class EssentialsEntityListener implements Listener
{
if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled())
{
+ final Player player = (Player)event.getEntity();
+ player.setFoodLevel(20);
+ player.setSaturation(10);
event.setCancelled(true);
}
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
index 5ca2aad9a..2e27fa192 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandgod.java
@@ -66,6 +66,7 @@ public class Commandgod extends EssentialsCommand
final boolean enabled = player.isGodModeEnabled();
if (enabled)
{
+ player.setHealth(player.getMaxHealth());
player.setFoodLevel(20);
}