diff options
Diffstat (limited to 'nms-patches/ItemFlintAndSteel.patch')
| -rw-r--r-- | nms-patches/ItemFlintAndSteel.patch | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nms-patches/ItemFlintAndSteel.patch b/nms-patches/ItemFlintAndSteel.patch index 34616f00..68072925 100644 --- a/nms-patches/ItemFlintAndSteel.patch +++ b/nms-patches/ItemFlintAndSteel.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ItemFlintAndSteel.java 2014-11-28 17:43:43.229707432 +0000 -+++ src/main/java/net/minecraft/server/ItemFlintAndSteel.java 2014-11-28 17:38:18.000000000 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/ItemFlintAndSteel.java 2015-02-26 22:40:22.823608137 +0000 ++++ src/main/java/net/minecraft/server/ItemFlintAndSteel.java 2015-02-26 22:40:22.823608137 +0000 @@ -1,5 +1,10 @@ package net.minecraft.server; @@ -11,7 +11,7 @@ public class ItemFlintAndSteel extends Item { public ItemFlintAndSteel() { -@@ -9,13 +14,32 @@ +@@ -9,13 +14,31 @@ } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, BlockPosition blockposition, EnumDirection enumdirection, float f, float f1, float f2) { @@ -21,7 +21,6 @@ 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); @@ -30,8 +29,7 @@ + + 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.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); world.setTypeUpdate(blockposition, Blocks.FIRE.getBlockData()); + + // CraftBukkit start |