--- a/net/minecraft/server/BlockCactus.java +++ b/net/minecraft/server/BlockCactus.java @@ -3,6 +3,8 @@ import java.util.Iterator; import java.util.Random; +import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit + public class BlockCactus extends Block { public static final BlockStateInteger AGE = BlockStateInteger.of("age", 0, 15); @@ -30,9 +32,10 @@ int j = ((Integer) iblockdata.get(BlockCactus.AGE)).intValue(); if (j == 15) { - world.setTypeUpdate(blockposition1, this.getBlockData()); + // world.setTypeUpdate(blockposition1, this.getBlockData()); // CraftBukkit IBlockData iblockdata1 = iblockdata.set(BlockCactus.AGE, Integer.valueOf(0)); + CraftEventFactory.handleBlockGrowEvent(world, blockposition1.getX(), blockposition1.getY(), blockposition1.getZ(), this, 0); // CraftBukkit world.setTypeAndData(blockposition, iblockdata1, 4); iblockdata1.doPhysics(world, blockposition1, this); } else { @@ -87,7 +90,9 @@ } public void a(World world, BlockPosition blockposition, IBlockData iblockdata, Entity entity) { + CraftEventFactory.blockDamage = world.getWorld().getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()); // CraftBukkit entity.damageEntity(DamageSource.CACTUS, 1.0F); + CraftEventFactory.blockDamage = null; // CraftBukkit } public IBlockData fromLegacyData(int i) {