From d327c34b10a80ec428783e52da2460c7c1031172 Mon Sep 17 00:00:00 2001 From: taoneill Date: Sat, 1 Oct 2011 15:35:06 -0400 Subject: [PATCH] Remove stray logging code and cancel SATIATED RegainReason as well when nohunger is on. --- .../java/bukkit/tommytony/war/WarEntityListener.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java b/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java index ae66cb6..4233996 100644 --- a/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java +++ b/war/src/main/java/bukkit/tommytony/war/WarEntityListener.java @@ -387,8 +387,10 @@ public class WarEntityListener extends EntityListener { */ @Override public void onEntityRegainHealth(EntityRegainHealthEvent event) { - if (!War.war.isLoaded() || (event.getRegainReason() != RegainReason.REGEN && event.getRegainReason() != RegainReason.EATING)) { - War.war.log("Refused " + event.getRegainReason().toString(), Level.INFO); + if (!War.war.isLoaded() || + (event.getRegainReason() != RegainReason.REGEN + && event.getRegainReason() != RegainReason.EATING + && event.getRegainReason().toString() != "SATIATED")) { return; } @@ -400,7 +402,9 @@ public class WarEntityListener extends EntityListener { Player player = (Player) entity; Warzone zone = Warzone.getZoneByPlayerName(player.getName()); if (zone != null) { - if (event.getRegainReason() == RegainReason.EATING && zone.isNoHunger()) { + if ((event.getRegainReason() == RegainReason.EATING + || event.getRegainReason().toString() != "SATIATED" ) + && zone.isNoHunger()) { // noHunger setting means you can't auto-heal with full hunger bar (use saturation instead to control how fast you get hungry) event.setCancelled(true); } else if (event.getRegainReason() == RegainReason.REGEN) {