diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java index 7422807e..0a30d737 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVEntityListener.java @@ -45,8 +45,10 @@ public class MVEntityListener extends EntityListener { Player p = (Player) event.getEntity(); MVWorld w = this.plugin.getWorldManager().getMVWorld(p.getWorld().getName()); if(w != null && !w.getHunger()) { - // If the world has hunger set to false, do not let the level change - event.setFoodLevel(20); + // If the world has hunger set to false, do not let the level go down + if(event.getFoodLevel() < ((Player) event.getEntity()).getFoodLevel()) { + event.setCancelled(true); + } } } } diff --git a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java index c5d1fa0b..997c4579 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java +++ b/src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java @@ -132,14 +132,15 @@ public class MVPlayerListener extends PlayerListener { MVWorld fromWorld = this.worldManager.getMVWorld(event.getFrom().getWorld().getName()); MVWorld toWorld = this.worldManager.getMVWorld(event.getTo().getWorld().getName()); event.setCancelled(checkWorldPermissions(fromWorld, toWorld, event.getPlayer())); - if (toWorld != null && !toWorld.getHunger() && fromWorld != null && fromWorld.getHunger() && !event.isCancelled()) { - // If to has hunger, and from doesn't, save the hunger - this.plugin.getPlayerSession(event.getPlayer()).setCachedHunger(); - } - else if (toWorld != null && toWorld.getHunger() && fromWorld != null && !fromWorld.getHunger() && !event.isCancelled()) { - // If from has hunger, and to doesn't, restore the hunger - event.getPlayer().setFoodLevel(this.plugin.getPlayerSession(event.getPlayer()).getCachedHunger()); - } + // Dunno If I like these... @fernferret +// if (toWorld != null && !toWorld.getHunger() && fromWorld != null && fromWorld.getHunger() && !event.isCancelled()) { +// // If to has hunger, and from doesn't, save the hunger +// this.plugin.getPlayerSession(event.getPlayer()).setCachedHunger(); +// } +// else if (toWorld != null && toWorld.getHunger() && fromWorld != null && !fromWorld.getHunger() && !event.isCancelled()) { +// // If from has hunger, and to doesn't, restore the hunger +// event.getPlayer().setFoodLevel(this.plugin.getPlayerSession(event.getPlayer()).getCachedHunger()); +// } } @Override