summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemDye.java
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2011-12-09 16:11:56 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2011-12-09 16:11:56 +0000
commit5e43c61fad9c6620b20518b120ac0448387f2ee5 (patch)
treee35d5a57a4a52f463737f503540c80c31e89c263 /src/main/java/net/minecraft/server/ItemDye.java
parent076460b419586ff5a79e68b700eb6a0ab1aa5994 (diff)
downloadcraftbukkit-5e43c61fad9c6620b20518b120ac0448387f2ee5.tar
craftbukkit-5e43c61fad9c6620b20518b120ac0448387f2ee5.tar.gz
craftbukkit-5e43c61fad9c6620b20518b120ac0448387f2ee5.tar.lz
craftbukkit-5e43c61fad9c6620b20518b120ac0448387f2ee5.tar.xz
craftbukkit-5e43c61fad9c6620b20518b120ac0448387f2ee5.zip
Implemented onStructureGrow event, thanks to md-5.
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemDye.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemDye.java17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java
index 4fab72fe..aa4c8daa 100644
--- a/src/main/java/net/minecraft/server/ItemDye.java
+++ b/src/main/java/net/minecraft/server/ItemDye.java
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import org.bukkit.entity.Player; // Craftbukkit
+
public class ItemDye extends Item {
public static final String[] a = new String[] { "black", "red", "green", "brown", "blue", "purple", "cyan", "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"};
@@ -26,16 +28,23 @@ public class ItemDye extends Item {
if (i1 == Block.SAPLING.id) {
if (!world.isStatic) {
- ((BlockSapling) Block.SAPLING).b(world, i, j, k, world.random);
- --itemstack.count;
+ // Craftbukkit start
+ Player player = (entityhuman instanceof EntityPlayer) ? (Player)entityhuman.getBukkitEntity() : null;
+ ((BlockSapling) Block.SAPLING).b(world, i, j, k, world.random, true, player, itemstack);
+ //--itemstack.count; - called later if the bonemeal attempt was succesful
+ // Craftbukkit end
}
return true;
}
if (i1 == Block.BROWN_MUSHROOM.id || i1 == Block.RED_MUSHROOM.id) {
- if (!world.isStatic && ((BlockMushroom) Block.byId[i1]).b(world, i, j, k, world.random)) {
- --itemstack.count;
+ // Craftbukkit start
+ if (!world.isStatic) {
+ Player player = (entityhuman instanceof EntityPlayer) ? (Player)entityhuman.getBukkitEntity() : null;
+ ((BlockMushroom) Block.byId[i1]).b(world, i, j, k, world.random, true, player, itemstack);
+ //--itemstack.count; - called later if the bonemeal attempt was succesful
+ // Craftbukkit end
}
return true;