From 6482b6f0bd30c2330e38e8f722921af066a6fc12 Mon Sep 17 00:00:00 2001 From: T00thpick1 Date: Fri, 19 Jul 2013 16:42:05 -0400 Subject: Fire FoodLevelChangeEvent when eating cake. Fixes BUKKIT-2242 --- src/main/java/net/minecraft/server/BlockCake.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/net/minecraft/server/BlockCake.java b/src/main/java/net/minecraft/server/BlockCake.java index 65cc2865..2c850b8a 100644 --- a/src/main/java/net/minecraft/server/BlockCake.java +++ b/src/main/java/net/minecraft/server/BlockCake.java @@ -53,7 +53,17 @@ public class BlockCake extends Block { private void b(World world, int i, int j, int k, EntityHuman entityhuman) { if (entityhuman.g(false)) { - entityhuman.getFoodData().eat(2, 0.1F); + // CraftBukkit start + int oldFoodLevel = entityhuman.getFoodData().foodLevel; + + org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, 2 + oldFoodLevel); + + if (!event.isCancelled()) { + entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, 0.1F); + } + + ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet8UpdateHealth(((EntityPlayer) entityhuman).getBukkitEntity().getScaledHealth(), entityhuman.getFoodData().foodLevel, entityhuman.getFoodData().saturationLevel)); + // CraftBukkit end int l = world.getData(i, j, k) + 1; if (l >= 6) { -- cgit v1.2.3