diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-10-25 16:21:56 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-10-25 16:21:56 +0100 |
| commit | bb7183deeb37de590f81c52ef06fe73948039fcc (patch) | |
| tree | ce71223e2bdc633c189634864a8edfec0e1e14fb | |
| parent | 2604cfdc386aac580ce5f20a1a014f6115ae66d2 (diff) | |
| download | Essentials-bb7183deeb37de590f81c52ef06fe73948039fcc.tar Essentials-bb7183deeb37de590f81c52ef06fe73948039fcc.tar.gz Essentials-bb7183deeb37de590f81c52ef06fe73948039fcc.tar.lz Essentials-bb7183deeb37de590f81c52ef06fe73948039fcc.tar.xz Essentials-bb7183deeb37de590f81c52ef06fe73948039fcc.zip | |
Only prevent AFK heal, if freeze player is enabled.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Essentials.java | 1 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java index fe0c3560c..27543dae3 100644 --- a/Essentials/src/com/earth2me/essentials/Essentials.java +++ b/Essentials/src/com/earth2me/essentials/Essentials.java @@ -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.ENTITY_REGAIN_HEALTH, entityListener, Priority.Lowest, this); pm.registerEvent(Type.FOOD_LEVEL_CHANGE, entityListener, Priority.Lowest, this); jail = new Jail(this); diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index 11c32c059..ecc368473 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -1,6 +1,8 @@ package com.earth2me.essentials; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.entity.EntityCombustEvent; @@ -17,6 +19,7 @@ import org.bukkit.inventory.ItemStack; public class EssentialsEntityListener extends EntityListener { + private static final Logger LOGGER = Logger.getLogger("Minecraft"); private final IEssentials ess; public EssentialsEntityListener(IEssentials ess) @@ -94,6 +97,7 @@ public class EssentialsEntityListener extends EntityListener @Override public void onFoodLevelChange(FoodLevelChangeEvent event) { + LOGGER.log(Level.INFO, "Getting hungry..."); if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isGodModeEnabled()) { event.setCancelled(true); @@ -103,12 +107,10 @@ public class EssentialsEntityListener extends EntityListener @Override public void onEntityRegainHealth(EntityRegainHealthEvent event) { - if (event.getEntity() instanceof Player && ess.getUser(event.getEntity()).isAfk()) + if (event.getRegainReason() == RegainReason.SATIATED && event.getEntity() instanceof Player + && ess.getUser(event.getEntity()).isAfk() && ess.getSettings().getFreezeAfkPlayers()) { - if (event.getRegainReason() == RegainReason.SATIATED) - { - event.setCancelled(true); - } + event.setCancelled(true); } } } |