Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2025-02-13 01:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Remove stray logging code and cancel SATIATED RegainReason as well when nohunger is on.

Browse Source
This commit is contained in:
taoneill 2011-10-01 15:35:06 -04:00
parent 73f7dbe8a2
commit d327c34b10
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
war/src/main/java/bukkit/tommytony/war/WarEntityListener.java
View File

@ -387,8 +387,10 @@ public class WarEntityListener extends EntityListener {
*/ */
@Override @Override
public void onEntityRegainHealth(EntityRegainHealthEvent event) { public void onEntityRegainHealth(EntityRegainHealthEvent event) {
if (!War.war.isLoaded() || (event.getRegainReason() != RegainReason.REGEN && event.getRegainReason() != RegainReason.EATING)) { if (!War.war.isLoaded() ||
War.war.log("Refused " + event.getRegainReason().toString(), Level.INFO); (event.getRegainReason() != RegainReason.REGEN
&& event.getRegainReason() != RegainReason.EATING
&& event.getRegainReason().toString() != "SATIATED")) {
return; return;
} }
@ -400,7 +402,9 @@ public class WarEntityListener extends EntityListener {
Player player = (Player) entity; Player player = (Player) entity;
Warzone zone = Warzone.getZoneByPlayerName(player.getName()); Warzone zone = Warzone.getZoneByPlayerName(player.getName());
if (zone != null) { 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) // 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); event.setCancelled(true);
} else if (event.getRegainReason() == RegainReason.REGEN) { } else if (event.getRegainReason() == RegainReason.REGEN) {