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/EntityMushroomCow.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/EntityMushroomCow.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityMushroomCow.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java index b3860ec9..83467cfd 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -12,9 +12,18 @@ public class EntityMushroomCow extends EntityCow { ItemStack itemstack = entityhuman.inventory.getItemInHand(); if (itemstack != null && itemstack.id == Item.BOWL.id && this.getAge() >= 0) { - entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, new ItemStack(Item.MUSHROOM_SOUP)); - return true; - } else if (itemstack != null && itemstack.id == Item.SHEARS.id && this.getAge() >= 0) { + if (itemstack.count == 1) { + entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, new ItemStack(Item.MUSHROOM_SOUP)); + return true; + } + + if (entityhuman.inventory.pickup(new ItemStack(Item.MUSHROOM_SOUP)) && !entityhuman.abilities.canInstantlyBuild) { + entityhuman.inventory.splitStack(entityhuman.inventory.itemInHandIndex, 1); + return true; + } + } + + if (itemstack != null && itemstack.id == Item.SHEARS.id && this.getAge() >= 0) { // CraftBukkit start org.bukkit.event.player.PlayerShearEntityEvent event = new org.bukkit.event.player.PlayerShearEntityEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), this.getBukkitEntity()); this.world.getServer().getPluginManager().callEvent(event); |