1 files changed, 28 insertions, 11 deletions

diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
index bda2efb1..39c41b87 100644
--- a/src/main/java/net/minecraft/server/FoodMetaData.java
+++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -1,7 +1,5 @@
 package net.minecraft.server;
 
-import org.bukkit.event.entity.EntityDamageEvent; // CraftBukkit
-
 public class FoodMetaData {
 
     // CraftBukkit start - All made public
@@ -9,29 +7,47 @@ public class FoodMetaData {
     public float saturationLevel = 5.0F;
     public float exhaustionLevel;
     public int foodTickTimer;
+    private EntityHuman entityhuman;
     // CraftBukkit end
     private int e = 20;
 
-    public FoodMetaData() {}
+    public FoodMetaData() { throw new AssertionError("Whoopsie, we missed the bukkit."); } // CraftBukkit start - throw an error
+
+    // CraftBukkit start - added EntityHuman constructor
+    public FoodMetaData(EntityHuman entityhuman) {
+        org.apache.commons.lang.Validate.notNull(entityhuman);
+        this.entityhuman = entityhuman;
+    }
+    // CraftBukkit end
 
     public void eat(int i, float f) {
         this.foodLevel = Math.min(i + this.foodLevel, 20);
         this.saturationLevel = Math.min(this.saturationLevel + (float) i * f * 2.0F, (float) this.foodLevel);
     }
 
-    public void a(ItemFood itemfood) {
-        this.eat(itemfood.getNutrition(), itemfood.getSaturationModifier());
+    public void a(ItemFood itemfood, ItemStack itemstack) {
+        // CraftBukkit start
+        int oldFoodLevel = foodLevel;
+
+        org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, itemfood.getNutrition(itemstack) + oldFoodLevel);
+
+        if (!event.isCancelled()) {
+            this.eat(event.getFoodLevel() - oldFoodLevel, itemfood.getSaturationModifier(itemstack));
+        }
+
+        ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutUpdateHealth(((EntityPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel));
+        // CraftBukkit end
     }
 
     public void a(EntityHuman entityhuman) {
-        int i = entityhuman.world.difficulty;
+        EnumDifficulty enumdifficulty = entityhuman.world.difficulty;
 
         this.e = this.foodLevel;
         if (this.exhaustionLevel > 4.0F) {
             this.exhaustionLevel -= 4.0F;
             if (this.saturationLevel > 0.0F) {
                 this.saturationLevel = Math.max(this.saturationLevel - 1.0F, 0.0F);
-            } else if (i > 0) {
+            } else if (enumdifficulty != EnumDifficulty.PEACEFUL) {
                 // CraftBukkit start
                 org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, Math.max(this.foodLevel - 1, 0));
 
@@ -39,22 +55,23 @@ public class FoodMetaData {
                     this.foodLevel = event.getFoodLevel();
                 }
 
-                ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet8UpdateHealth(((EntityPlayer) entityhuman).getBukkitEntity().getScaledHealth(), this.foodLevel, this.saturationLevel));
+                ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutUpdateHealth(((EntityPlayer) entityhuman).getBukkitEntity().getScaledHealth(), this.foodLevel, this.saturationLevel));
                 // CraftBukkit end
             }
         }
 
-        if (entityhuman.world.getGameRules().getBoolean("naturalRegeneration") && this.foodLevel >= 18 && entityhuman.bJ()) {
+        if (entityhuman.world.getGameRules().getBoolean("naturalRegeneration") && this.foodLevel >= 18 && entityhuman.bP()) {
             ++this.foodTickTimer;
             if (this.foodTickTimer >= 80) {
                 // CraftBukkit - added RegainReason
                 entityhuman.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED);
+                this.a(3.0F);
                 this.foodTickTimer = 0;
             }
         } else if (this.foodLevel <= 0) {
             ++this.foodTickTimer;
             if (this.foodTickTimer >= 80) {
-                if (entityhuman.getHealth() > 10.0F || i >= 3 || entityhuman.getHealth() > 1.0F && i >= 2) {
+                if (entityhuman.getHealth() > 10.0F || enumdifficulty == EnumDifficulty.HARD || entityhuman.getHealth() > 1.0F && enumdifficulty == EnumDifficulty.NORMAL) {
                     entityhuman.damageEntity(DamageSource.STARVE, 1.0F);
                 }
 
@@ -66,7 +83,7 @@ public class FoodMetaData {
     }
 
     public void a(NBTTagCompound nbttagcompound) {
-        if (nbttagcompound.hasKey("foodLevel")) {
+        if (nbttagcompound.hasKeyOfType("foodLevel", 99)) {
             this.foodLevel = nbttagcompound.getInt("foodLevel");
             this.foodTickTimer = nbttagcompound.getInt("foodTickTimer");
             this.saturationLevel = nbttagcompound.getFloat("foodSaturationLevel");