--- a/net/minecraft/server/ItemFlintAndSteel.java +++ b/net/minecraft/server/ItemFlintAndSteel.java @@ -13,7 +13,7 @@ BlockPosition blockposition = itemactioncontext.getClickPosition(); IBlockData iblockdata = world.getType(blockposition); - if (BlockCampfire.h(iblockdata)) { + if (BlockCampfire.h(iblockdata) && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition, entityhuman).isCancelled()) { // CraftBukkit world.playSound(entityhuman, blockposition, SoundEffects.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, ItemFlintAndSteel.RANDOM.nextFloat() * 0.4F + 0.8F); world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockProperties.r, true), 11); if (entityhuman != null) { @@ -27,6 +27,14 @@ BlockPosition blockposition1 = blockposition.shift(itemactioncontext.getClickedFace()); if (BlockFireAbstract.a(world, blockposition1, itemactioncontext.f())) { + // CraftBukkit start - Store the clicked block + if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition1, org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, entityhuman).isCancelled()) { + itemactioncontext.getItemStack().damage(1, entityhuman, (entityhuman1) -> { + entityhuman1.broadcastItemBreak(itemactioncontext.getHand()); + }); + return EnumInteractionResult.PASS; + } + // CraftBukkit end world.playSound(entityhuman, blockposition1, SoundEffects.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, ItemFlintAndSteel.RANDOM.nextFloat() * 0.4F + 0.8F); IBlockData iblockdata1 = BlockFireAbstract.a((IBlockAccess) world, blockposition1);