2014-11-28 12:23:19 +01:00
|
|
|
--- ../work/decompile-8eb82bde//net/minecraft/server/ItemFlintAndSteel.java 2014-11-28 11:22:56.050823160 +0000
|
|
|
|
|
+++ src/main/java/net/minecraft/server/ItemFlintAndSteel.java 2014-11-28 11:01:54.000000000 +0000
|
2014-11-25 22:32:16 +01:00
|
|
|
@@ -1,5 +1,10 @@
|
|
|
|
|
package net.minecraft.server;
|
|
|
|
|
|
|
|
|
|
+// CraftBukkit start
|
|
|
|
|
+import org.bukkit.craftbukkit.block.CraftBlockState;
|
|
|
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
|
|
|
+// CraftBukkit end
|
|
|
|
|
+
|
|
|
|
|
public class ItemFlintAndSteel extends Item {
|
|
|
|
|
|
|
|
|
|
public ItemFlintAndSteel() {
|
|
|
|
|
@@ -9,13 +14,32 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, BlockPosition blockposition, EnumDirection enumdirection, float f, float f1, float f2) {
|
|
|
|
|
+ BlockPosition clicked = blockposition; // CraftBukkit
|
|
|
|
|
blockposition = blockposition.shift(enumdirection);
|
|
|
|
|
if (!entityhuman.a(blockposition, enumdirection, itemstack)) {
|
|
|
|
|
return false;
|
|
|
|
|
} else {
|
|
|
|
|
if (world.getType(blockposition).getBlock().getMaterial() == Material.AIR) {
|
|
|
|
|
- world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "fire.ignite", 1.0F, ItemFlintAndSteel.g.nextFloat() * 0.4F + 0.8F);
|
|
|
|
|
+ // CraftBukkit start - Store the clicked block
|
|
|
|
|
+ if (CraftEventFactory.callBlockIgniteEvent(world, blockposition.getX(), blockposition.getY(), blockposition.getZ(), org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, entityhuman).isCancelled()) {
|
|
|
|
|
+ itemstack.damage(1, entityhuman);
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ CraftBlockState blockState = CraftBlockState.getBlockState(world, blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
+
|
|
|
|
|
+ world.makeSound((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, "fire.ignite", 1.0F, g.nextFloat() * 0.4F + 0.8F);
|
|
|
|
|
world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData());
|
|
|
|
|
+
|
|
|
|
|
+ // CraftBukkit start
|
|
|
|
|
+ org.bukkit.event.block.BlockPlaceEvent placeEvent = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, blockState, clicked.getX(), clicked.getY(), clicked.getZ());
|
|
|
|
|
+
|
|
|
|
|
+ if (placeEvent.isCancelled() || !placeEvent.canBuild()) {
|
|
|
|
|
+ placeEvent.getBlockPlaced().setTypeIdAndData(0, (byte) 0, false);
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ // CraftBukkit end
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
itemstack.damage(1, entityhuman);
|
