summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-04-03 14:13:27 -0400
committerEvilSeph <evilseph@gmail.com>2012-04-03 14:13:27 -0400
commit0c9e1b13a06148961aa436ba5967a7b215ce6439 (patch)
tree6db62827ede2d6e2aa7dcda4a71865fd87bf4dc4 /src/main/java/net/minecraft/server
parent2315fb77897f700b649971f0c66d869d9522aff7 (diff)
downloadcraftbukkit-0c9e1b13a06148961aa436ba5967a7b215ce6439.tar
craftbukkit-0c9e1b13a06148961aa436ba5967a7b215ce6439.tar.gz
craftbukkit-0c9e1b13a06148961aa436ba5967a7b215ce6439.tar.lz
craftbukkit-0c9e1b13a06148961aa436ba5967a7b215ce6439.tar.xz
craftbukkit-0c9e1b13a06148961aa436ba5967a7b215ce6439.zip
Made using RAW_FISH on Ocelots when a player has the ability to instantly build not decrement the stack. Fixes BUKKIT-1439
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/EntityOcelot.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index c6c89a88..fefd2b63 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -110,7 +110,7 @@ public class EntityOcelot extends EntityTameableAnimal {
if (!this.isTamed()) {
if (this.b.f() && itemstack != null && itemstack.id == Item.RAW_FISH.id && entityhuman.j(this) < 9.0D) {
- --itemstack.count;
+ if (!entityhuman.abilities.canInstantlyBuild) --itemstack.count; // CraftBukkit - if the player can instantly build, don't decrement the item stack
if (itemstack.count <= 0) {
entityhuman.inventory.setItem(entityhuman.inventory.itemInHandIndex, (ItemStack) null);
}