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

Always consume bonemeal when used on a sapling. Fixes BUKKIT-3755

Browse Source 
In Minecraft 1.5 saplings do not grow with a single use of bonemeal anymore.
Our code assumes they will and only takes away bonemeal from the player
when the tree grows successfully (not cancelled by a plugin). Instead we
now always remove a bonemeal even if a plugin is the reason a tree didn't
grow as this matches the vanilla logic more closely.
This commit is contained in:
Travis Watkins 2013-03-16 08:05:03 -05:00
parent d47849df8c
commit 4fa8c24e42
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minecraft/server/BlockSapling.java
View File

@ -116,7 +116,11 @@ public class BlockSapling extends BlockFlower {
--itemstack.count;
}
}
} else if (bonemeal && itemstack != null) {
// We always consume bonemeal when trying to grow
--itemstack.count;
}
if (!grownTree) {
if (flag) {
world.setTypeIdAndData(i + i1, j, k + j1, this.id, l, 4);

8
src/main/java/net/minecraft/server/ItemDye.java
View File

@ -95,11 +95,11 @@ public class ItemDye extends Item {
if ((double) world.random.nextFloat() < 0.45D) {
// CraftBukkit start
Player player = (entityhuman instanceof EntityPlayer) ? (Player) entityhuman.getBukkitEntity() : null;
((BlockSapling) Block.SAPLING).grow(world, i, j, k, world.random, true, player, itemstack);
((BlockSapling) Block.SAPLING).grow(world, i, j, k, world.random, true, player, null);
// CraftBukkit end
}
// --itemstack.count; - called later if the bonemeal attempt was succesful
// CraftBukkit end
--itemstack.count;
}
return true;
@ -194,7 +194,7 @@ public class ItemDye extends Item {
((BlockMushroom) Block.byId[l]).grow(world, i, j, k, world.random, true, player, itemstack);
}
//--itemstack.count; - called later if the bonemeal attempt was succesful
//--itemstack.count; - called later if the bonemeal attempt was not cancelled by a plugin
// CraftBukkit end
}

1
src/main/java/net/minecraft/server/ItemSnow.java
View File

@ -26,7 +26,6 @@ public class ItemSnow extends ItemBlockWithAuxData {
}
/*
if (k1 <= 6 && world.b(block.b(world, i, j, k)) && world.setData(i, j, k, k1 + 1 | j1 & -8, 2)) {
// CraftBukkit end
world.makeSound((double) ((float) i + 0.5F), (double) ((float) j + 0.5F), (double) ((float) k + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume1() + 1.0F) / 2.0F, block.stepSound.getVolume2() * 0.8F);
--itemstack.count;
return true;