From bdd3c4dabe7fdcb8a5e1e1225c2789999fac7c7d Mon Sep 17 00:00:00 2001 From: speakeasy Date: Wed, 19 Jan 2011 08:59:22 +0800 Subject: [PATCH] Change block ignite in flint and steel to be seperate from item use --- .../minecraft/server/ItemFlintAndSteel.java | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java index cd54a2b764..0f644ac15b 100644 --- a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java +++ b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java @@ -59,15 +59,20 @@ public class ItemFlintAndSteel extends Item { server.getPluginManager().callEvent(pie); boolean preventLighter = pie.isCancelled(); - boolean preventFire = false; - if (blockClicked.getTypeId() != Block.ar.bi){ - IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL; - BlockIgniteEvent bie = new BlockIgniteEvent(blockClicked, igniteCause, thePlayer); - server.getPluginManager().callEvent(bie); - preventFire = bie.isCancelled(); - } + + + IgniteCause igniteCause = BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL; + BlockIgniteEvent bie = new BlockIgniteEvent(blockClicked, igniteCause, thePlayer); + server.getPluginManager().callEvent(bie); + boolean preventFire = bie.isCancelled(); - if (preventLighter || preventFire) { + + if (preventLighter) { + return false; + } + + if (preventFire) { + itemstack.b(1); return false; } // CraftBukkit end