summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemFood.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-14 21:03:48 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-15 10:52:37 +0100
commit61ec751ca11f5bff9ec2dd1644982d5628270004 (patch)
tree8829269e1c5807b55566d367bec5ee630d5dfb1d /src/main/java/net/minecraft/server/ItemFood.java
parent6495eee0c9fddcce2c2aa9bf9c45118abea180c1 (diff)
downloadcraftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.gz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.lz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.xz
craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.zip
Update for 1.1_01 renames.
We know these updates (can) break plugins bypassing Bukkit. They are needed for smooth updates however. There will be another one right before before 1.1-R1.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemFood.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemFood.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemFood.java b/src/main/java/net/minecraft/server/ItemFood.java
index c0dc28bc..f870e814 100644
--- a/src/main/java/net/minecraft/server/ItemFood.java
+++ b/src/main/java/net/minecraft/server/ItemFood.java
@@ -31,11 +31,11 @@ public class ItemFood extends Item {
// CraftBukkit start
int oldFoodLevel = entityhuman.getFoodData().foodLevel;
- FoodLevelChangeEvent event = new FoodLevelChangeEvent(entityhuman.getBukkitEntity(), Math.min(this.o() + entityhuman.getFoodData().foodLevel, 20));
+ FoodLevelChangeEvent event = new FoodLevelChangeEvent(entityhuman.getBukkitEntity(), Math.min(this.getNutrition() + entityhuman.getFoodData().foodLevel, 20));
entityhuman.world.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
- entityhuman.getFoodData().a(event.getFoodLevel() - oldFoodLevel, this.p());
+ entityhuman.getFoodData().eat(event.getFoodLevel() - oldFoodLevel, this.getSaturationModifier());
}
// CraftBukkit end
@@ -62,11 +62,11 @@ public class ItemFood extends Item {
return itemstack;
}
- public int o() {
+ public int getNutrition() {
return this.b;
}
- public float p() {
+ public float getSaturationModifier() {
return this.bS;
}