Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 03:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Don't consume bonemeal if there is no crop present. Fixes BUKKIT-3790

Browse Source 
Bonemeal dispense behavior already took care of decrementing the item
stack, therefore we shouldn't manage the size manually.

Pulled from PR #1172
This commit is contained in:
Alex Ciuba 2013-06-10 16:04:38 -04:00 committed by feildmaster
parent 0aa187f151
commit 80935e5c2b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minecraft/server/DispenseBehaviorBonemeal.java
View File

@ -20,9 +20,8 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem {
int k = isourceblock.getBlockZ() + enumfacing.e(); int k = isourceblock.getBlockZ() + enumfacing.e();
// CraftBukkit start // CraftBukkit start
ItemStack itemstack1 = itemstack.a(1);
org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockX(), isourceblock.getBlockY(), isourceblock.getBlockZ()); org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockX(), isourceblock.getBlockY(), isourceblock.getBlockZ());
CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1); CraftItemStack craftItem = CraftItemStack.asNewCraftStack(itemstack.getItem());
BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0)); BlockDispenseEvent event = new BlockDispenseEvent(block, craftItem.clone(), new org.bukkit.util.Vector(0, 0, 0));
if (!BlockDispenser.eventFired) { if (!BlockDispenser.eventFired) {
@ -30,12 +29,10 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem {
} }
if (event.isCancelled()) { if (event.isCancelled()) {
itemstack.count++;
return itemstack; return itemstack;
} }
if (!event.getItem().equals(craftItem)) { if (!event.getItem().equals(craftItem)) {
itemstack.count++;
// Chain to handler for new item // Chain to handler for new item
ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem()); ItemStack eventStack = CraftItemStack.asNMSCopy(event.getItem());
IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.a(eventStack.getItem()); IDispenseBehavior idispensebehavior = (IDispenseBehavior) BlockDispenser.a.a(eventStack.getItem());
@ -46,7 +43,7 @@ final class DispenseBehaviorBonemeal extends DispenseBehaviorItem {
} }
// CraftBukkit end // CraftBukkit end
if (ItemDye.a(itemstack1, world, i, j, k)) { // CraftBukkit - itemstack -> itemstack1 if (ItemDye.a(itemstack, world, i, j, k)) {
if (!world.isStatic) { if (!world.isStatic) {
world.triggerEffect(2005, i, j, k, 0); world.triggerEffect(2005, i, j, k, 0);
} }