From 484376bbac625ee595b850d88d22162772ea7606 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Mon, 26 Sep 2011 14:17:32 -0400 Subject: Fixed saturation handling for FoodLevelChange event. --- src/main/java/net/minecraft/server/ItemFood.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/net/minecraft/server/ItemFood.java b/src/main/java/net/minecraft/server/ItemFood.java index dd02041f..de922f2c 100644 --- a/src/main/java/net/minecraft/server/ItemFood.java +++ b/src/main/java/net/minecraft/server/ItemFood.java @@ -29,12 +29,13 @@ public class ItemFood extends Item { public ItemStack b(ItemStack itemstack, World world, EntityHuman entityhuman) { --itemstack.count; // CraftBukkit start + int oldFoodLevel = entityhuman.getFoodData().foodLevel; + FoodLevelChangeEvent event = new FoodLevelChangeEvent(entityhuman.getBukkitEntity(), Math.min(this.k() + entityhuman.getFoodData().foodLevel, 20)); entityhuman.world.getServer().getPluginManager().callEvent(event); if (!event.isCancelled()) { - entityhuman.getFoodData().foodLevel = event.getFoodLevel(); - entityhuman.getFoodData().saturationLevel = Math.min(entityhuman.getFoodData().saturationLevel + (float) event.getFoodLevel() - entityhuman.getFoodData().foodLevel * this.l() * 2.0F, (float) entityhuman.getFoodData().foodLevel); + entityhuman.getFoodData().a(event.getFoodLevel() - oldFoodLevel, this.l()); } // CraftBukkit end -- cgit v1.2.3