52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
--- ../src-base/minecraft/net/minecraft/item/ItemFlintAndSteel.java
|
|
+++ ../src-work/minecraft/net/minecraft/item/ItemFlintAndSteel.java
|
|
@@ -6,6 +6,11 @@
|
|
import net.minecraft.init.Blocks;
|
|
import net.minecraft.world.World;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.block.CraftBlockState;
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ItemFlintAndSteel extends Item
|
|
{
|
|
private static final String __OBFID = "CL_00000035";
|
|
@@ -19,6 +24,8 @@
|
|
|
|
public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_)
|
|
{
|
|
+ int clickedX = p_77648_4_, clickedY = p_77648_5_, clickedZ = p_77648_6_; // CraftBukkit
|
|
+
|
|
if (p_77648_7_ == 0)
|
|
{
|
|
--p_77648_5_;
|
|
@@ -57,8 +64,27 @@
|
|
{
|
|
if (p_77648_3_.isAirBlock(p_77648_4_, p_77648_5_, p_77648_6_))
|
|
{
|
|
+ // CraftBukkit start - Store the clicked block
|
|
+ if (CraftEventFactory.callBlockIgniteEvent(p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_, org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, p_77648_2_).isCancelled())
|
|
+ {
|
|
+ p_77648_1_.damageItem(1, p_77648_2_);
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ CraftBlockState blockState = CraftBlockState.getBlockState(p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_);
|
|
+ // CraftBukkit end
|
|
p_77648_3_.playSoundEffect((double)p_77648_4_ + 0.5D, (double)p_77648_5_ + 0.5D, (double)p_77648_6_ + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F);
|
|
p_77648_3_.setBlock(p_77648_4_, p_77648_5_, p_77648_6_, Blocks.fire);
|
|
+ // CraftBukkit start
|
|
+ org.bukkit.event.block.BlockPlaceEvent placeEvent = CraftEventFactory.callBlockPlaceEvent(p_77648_3_, p_77648_2_, blockState, clickedX, clickedY, clickedZ);
|
|
+
|
|
+ if (placeEvent.isCancelled() || !placeEvent.canBuild())
|
|
+ {
|
|
+ placeEvent.getBlockPlaced().setTypeIdAndData(0, (byte) 0, false);
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
p_77648_1_.damageItem(1, p_77648_2_);
|