1 files changed, 100 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower-stripped/net/minecraft/world/food/FoodData.java.patch b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/food/FoodData.java.patch
new file mode 100644
index 0000000000..601d6a3963
--- /dev/null
+++ b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/food/FoodData.java.patch
@@ -0,0 +1,100 @@
+--- a/net/minecraft/world/food/FoodData.java
++++ b/net/minecraft/world/food/FoodData.java
+@@ -13,20 +15,37 @@
+     private float saturationLevel = 5.0F;
+     private float exhaustionLevel;
+     private int tickTimer;
++    // CraftBukkit start
++    private Player entityhuman;
++    public int saturatedRegenRate = 10;
++    public int unsaturatedRegenRate = 80;
++    public int starvationRate = 80;
++    // CraftBukkit end
+     private int lastFoodLevel = 20;
+ 
+-    public FoodData() {}
++    public FoodData() { throw new AssertionError("Whoopsie, we missed the bukkit."); } // CraftBukkit start - throw an error
+ 
+-    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);
++    // CraftBukkit start - added EntityHuman constructor
++    public FoodData(Player entityhuman) {
++        org.apache.commons.lang.Validate.notNull(entityhuman);
++        this.entityhuman = entityhuman;
+     }
++    // CraftBukkit end
+ 
+     public void eat(Item item, ItemStack itemstack) {
+         if (item.isEdible()) {
+-            FoodProperties foodproperties = item.getFoodProperties();
++            FoodProperties foodinfo = item.getFoodProperties();
++            // CraftBukkit start
++            int oldFoodLevel = foodLevel;
+ 
+-            this.eat(foodproperties.getNutrition(), foodproperties.getSaturationModifier());
++            org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, foodinfo.getNutrition() + oldFoodLevel, stack);
++
++            if (!event.isCancelled()) {
++                this.eat(event.getFoodLevel() - oldFoodLevel, foodinfo.getSaturationModifier());
++            }
++
++            ((ServerPlayer) entityhuman).getBukkitEntity().sendHealthUpdate();
++            // CraftBukkit end
+         }
+ 
+     }
+@@ -39,8 +63,16 @@
+             this.exhaustionLevel -= 4.0F;
+             if (this.saturationLevel > 0.0F) {
+                 this.saturationLevel = Math.max(this.saturationLevel - 1.0F, 0.0F);
+-            } else if (difficulty != Difficulty.PEACEFUL) {
+-                this.foodLevel = Math.max(this.foodLevel - 1, 0);
++            } else if (enumdifficulty != Difficulty.PEACEFUL) {
++                // CraftBukkit start
++                org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(player, Math.max(this.foodLevel - 1, 0));
++
++                if (!event.isCancelled()) {
++                    this.foodLevel = event.getFoodLevel();
++                }
++
++                ((ServerPlayer) player).connection.send(new ClientboundSetHealthPacket(((ServerPlayer) player).getBukkitEntity().getScaledHealth(), this.foodLevel, this.saturationLevel));
++                // CraftBukkit end
+             }
+         }
+ 
+@@ -48,24 +80,26 @@
+ 
+         if (flag && this.saturationLevel > 0.0F && player.isHurt() && this.foodLevel >= 20) {
+             ++this.tickTimer;
+-            if (this.tickTimer >= 10) {
++            if (this.tickTimer >= this.saturatedRegenRate) { // CraftBukkit
+                 float f = Math.min(this.saturationLevel, 6.0F);
+ 
+-                player.heal(f / 6.0F);
+-                this.addExhaustion(f);
++                player.heal(f / 6.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
++                // this.addExhaustion(f); CraftBukkit - EntityExhaustionEvent
++                player.causeFoodExhaustion(f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
+                 this.tickTimer = 0;
+             }
+         } else if (flag && this.foodLevel >= 18 && player.isHurt()) {
+             ++this.tickTimer;
+-            if (this.tickTimer >= 80) {
+-                player.heal(1.0F);
+-                this.addExhaustion(6.0F);
++            if (this.tickTimer >= this.unsaturatedRegenRate) { // CraftBukkit - add regen rate manipulation
++                player.heal(1.0F, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.SATIATED); // CraftBukkit - added RegainReason
++                // this.a(6.0F); CraftBukkit - EntityExhaustionEvent
++                player.causeFoodExhaustion(6.0f, org.bukkit.event.entity.EntityExhaustionEvent.ExhaustionReason.REGEN); // CraftBukkit - EntityExhaustionEvent
+                 this.tickTimer = 0;
+             }
+         } else if (this.foodLevel <= 0) {
+             ++this.tickTimer;
+-            if (this.tickTimer >= 80) {
+-                if (player.getHealth() > 10.0F || difficulty == Difficulty.HARD || player.getHealth() > 1.0F && difficulty == Difficulty.NORMAL) {
++            if (this.tickTimer >= this.starvationRate) { // CraftBukkit - add regen rate manipulation
++                if (player.getHealth() > 10.0F || enumdifficulty == Difficulty.HARD || player.getHealth() > 1.0F && enumdifficulty == Difficulty.NORMAL) {
+                     player.hurt(player.damageSources().starve(), 1.0F);
+                 }
+