summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2013-05-09 17:44:10 +0100
committerKHobbits <rob@khobbits.co.uk>2013-05-09 17:44:10 +0100
commit59f67acfd0ce6f01a1fd09bd36b23d083f3d53d2 (patch)
tree56c845389b3517ff63df986fde00b2b56fc6741e
parent7051801a8563082f977947ec5e375c228e91c6ef (diff)
downloadEssentials-59f67acfd0ce6f01a1fd09bd36b23d083f3d53d2.tar
Essentials-59f67acfd0ce6f01a1fd09bd36b23d083f3d53d2.tar.gz
Essentials-59f67acfd0ce6f01a1fd09bd36b23d083f3d53d2.tar.lz
Essentials-59f67acfd0ce6f01a1fd09bd36b23d083f3d53d2.tar.xz
Essentials-59f67acfd0ce6f01a1fd09bd36b23d083f3d53d2.zip
Don't treat AFK players as god mode when dealing with food regen.
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java19
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)
{