diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-05-09 17:44:10 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-05-09 17:44:10 +0100 |
commit | 4777c083a6709dabb1e7a0f502899ffce1898fdc (patch) | |
tree | 00a7b6e6f1969adb64166e4db5fd35f792098e54 | |
parent | 37b1d66a78a11c5b76a3deb2738445f2d50c2c97 (diff) | |
download | Essentials-4777c083a6709dabb1e7a0f502899ffce1898fdc.tar Essentials-4777c083a6709dabb1e7a0f502899ffce1898fdc.tar.gz Essentials-4777c083a6709dabb1e7a0f502899ffce1898fdc.tar.lz Essentials-4777c083a6709dabb1e7a0f502899ffce1898fdc.tar.xz Essentials-4777c083a6709dabb1e7a0f502899ffce1898fdc.zip |
Don't treat AFK players as god mode when dealing with food regen.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index bb58067bc..9bfc15eea 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -170,12 +170,18 @@ public class EssentialsEntityListener implements Listener @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onFoodLevelChange(final FoodLevelChangeEvent event) { - if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled()) + if (event.getEntity() instanceof Player) { - final Player player = (Player)event.getEntity(); - player.setFoodLevel(20); - player.setSaturation(10); - event.setCancelled(true); + final User user = ess.getUser(event.getEntity()); + if (user.isGodModeEnabled()) + { + if (user.isGodModeEnabledRaw()) + { + user.setFoodLevel(20); + user.setSaturation(10); + } + event.setCancelled(true); + } } } @@ -200,8 +206,9 @@ public class EssentialsEntityListener implements Listener } } } + @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public void onEntityShootBow (EntityShootBowEvent event) + public void onEntityShootBow(EntityShootBowEvent event) { if (event.getEntity() instanceof Player) { |