summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemFood.java
diff options
context:
space:
mode:
authorTomyLobo <tomylobo@nurfuerspam.de>2012-02-21 13:51:56 +0100
committerEvilSeph <evilseph@gmail.com>2012-02-29 00:12:26 -0500
commit92dfb2500b68de14bc9b873f7d5821090af9bac0 (patch)
tree299f241b2365cc9cdc954461323a233f98551321 /src/main/java/net/minecraft/server/ItemFood.java
parentdcf016822dc84146ee62cc2646d51673b0466706 (diff)
downloadcraftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar
craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar.gz
craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar.lz
craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.tar.xz
craftbukkit-92dfb2500b68de14bc9b873f7d5821090af9bac0.zip
Adjusted CraftBukkit to work with the entity event convenience patch in Bukkit. Addresses BUKKIT-809
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemFood.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemFood.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemFood.java b/src/main/java/net/minecraft/server/ItemFood.java
index f870e814..43990a9a 100644
--- a/src/main/java/net/minecraft/server/ItemFood.java
+++ b/src/main/java/net/minecraft/server/ItemFood.java
@@ -1,7 +1,5 @@
package net.minecraft.server;
-import org.bukkit.event.entity.FoodLevelChangeEvent; // CraftBukkit
-
public class ItemFood extends Item {
public final int a;
@@ -31,8 +29,7 @@ public class ItemFood extends Item {
// CraftBukkit start
int oldFoodLevel = entityhuman.getFoodData().foodLevel;
- FoodLevelChangeEvent event = new FoodLevelChangeEvent(entityhuman.getBukkitEntity(), Math.min(this.getNutrition() + entityhuman.getFoodData().foodLevel, 20));
- entityhuman.world.getServer().getPluginManager().callEvent(event);
+ org.bukkit.event.entity.FoodLevelChangeEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callFoodLevelChangeEvent(entityhuman, Math.min(this.getNutrition() + oldFoodLevel, 20));
if (!event.isCancelled()) {
entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, this.getSaturationModifier());