summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
diff options
context:
space:
mode:
authorspeakeasy <mekevin1917@gmail.com>2011-01-11 05:37:16 +0800
committertahg <tahgtahv@gmail.com>2011-01-11 05:45:59 +0800
commit5993b21b88eaa334987fe1f7bacd3ac1bfc84f03 (patch)
tree96d7d92ad3a5091d3aec11117e3f982da390e38b /src/main/java/net/minecraft/server/ItemFlintAndSteel.java
parent6a15ae252b6a1cfd63db8722b7878eedfcda170f (diff)
downloadcraftbukkit-5993b21b88eaa334987fe1f7bacd3ac1bfc84f03.tar
craftbukkit-5993b21b88eaa334987fe1f7bacd3ac1bfc84f03.tar.gz
craftbukkit-5993b21b88eaa334987fe1f7bacd3ac1bfc84f03.tar.lz
craftbukkit-5993b21b88eaa334987fe1f7bacd3ac1bfc84f03.tar.xz
craftbukkit-5993b21b88eaa334987fe1f7bacd3ac1bfc84f03.zip
Fixed file name mismatch :(
Signed-off-by: speakeasy <mekevin1917@gmail.com>
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemFlintAndSteel.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemFlintAndSteel.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
index 5a2f9d43..de365d03 100644
--- a/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
+++ b/src/main/java/net/minecraft/server/ItemFlintAndSteel.java
@@ -5,6 +5,7 @@ import org.bukkit.craftbukkit.CraftItemStack;
import org.bukkit.craftbukkit.CraftPlayer;
import org.bukkit.event.Event.Type;
import org.bukkit.event.player.PlayerItemEvent;
+import org.bukkit.event.block.BlockIgniteEvent;
public class ItemFlintAndSteel extends Item {
@@ -46,12 +47,16 @@ public class ItemFlintAndSteel extends Item {
CraftItemStack itemInHand = new CraftItemStack(itemstack);
CraftPlayer thePlayer = new CraftPlayer(((WorldServer) world).getServer(), (EntityPlayerMP) entityplayer);
PlayerItemEvent pie = new PlayerItemEvent(Type.PLAYER_ITEM, thePlayer, itemInHand, blockClicked, CraftBlock.notchToBlockFace(l));
-
((WorldServer) world).getServer().getPluginManager().callEvent(pie);
+ org.bukkit.Block pblock = (((WorldServer) world).getWorld().getBlockAt(i, j, k));
+ BlockIgniteEvent bie = new BlockIgniteEvent((org.bukkit.Block) pblock, BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, thePlayer);
+ ((WorldServer) world).getServer().getPluginManager().callEvent(bie);
+
boolean preventLighter = pie.isCancelled();
+ boolean preventFire = bie.isCancelled();
- if (preventLighter) {
+ if (preventLighter || preventFire) {
return false;
} else {
world.a((double) i + 0.5D, (double) j + 0.5D, (double) k + 0.5D, "fire.ignite", 1.0F, b.nextFloat() * 0.4F + 0.8F);