diff options
| author | Dinnerbone (Laptop) <dinnerbone@dinnerbone.com> | 2012-03-30 23:33:51 +0200 |
|---|---|---|
| committer | Dinnerbone (Laptop) <dinnerbone@dinnerbone.com> | 2012-03-30 23:33:51 +0200 |
| commit | 1fa4d8430e4174d0f8eb5d50667d0247f7877679 (patch) | |
| tree | a806cee32737d36dbb27576c564d3099f336fbe7 /src/main/java/net/minecraft/server/EntityWolf.java | |
| parent | e0c01154b030c527815e884b6b331c5534ab247f (diff) | |
| download | craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.gz craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.lz craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.tar.xz craftbukkit-1fa4d8430e4174d0f8eb5d50667d0247f7877679.zip | |
Updated version to 1.2.5-R0.1-SNAPSHOT
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityWolf.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityWolf.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java index 76956b26..688fe2ca 100644 --- a/src/main/java/net/minecraft/server/EntityWolf.java +++ b/src/main/java/net/minecraft/server/EntityWolf.java @@ -180,7 +180,10 @@ public class EntityWolf extends EntityTameableAnimal { if (!this.isTamed()) { if (itemstack != null && itemstack.id == Item.BONE.id && !this.isAngry()) { - --itemstack.count; + if (!entityhuman.abilities.canInstantlyBuild) { + --itemstack.count; + } + if (itemstack.count <= 0) { entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null); } @@ -209,8 +212,11 @@ public class EntityWolf extends EntityTameableAnimal { ItemFood itemfood = (ItemFood) Item.byId[itemstack.id]; if (itemfood.q() && this.datawatcher.getInt(18) < 20) { - --itemstack.count; - this.heal(itemfood.getNutrition(), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit + if (!entityhuman.abilities.canInstantlyBuild) { + --itemstack.count; + } + + this.heal(itemfood.getNutrition()); if (itemstack.count <= 0) { entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null); } |