summaryrefslogtreecommitdiffstats
path: root/nms-patches/ItemFlintAndSteel.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ItemFlintAndSteel.patch')
-rw-r--r--nms-patches/ItemFlintAndSteel.patch34
1 files changed, 2 insertions, 32 deletions
diff --git a/nms-patches/ItemFlintAndSteel.patch b/nms-patches/ItemFlintAndSteel.patch
index 5dbe893e..928d8ce9 100644
--- a/nms-patches/ItemFlintAndSteel.patch
+++ b/nms-patches/ItemFlintAndSteel.patch
@@ -1,45 +1,15 @@
--- a/net/minecraft/server/ItemFlintAndSteel.java
+++ b/net/minecraft/server/ItemFlintAndSteel.java
-@@ -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,31 @@
- }
-
- public EnumInteractionResult a(ItemStack itemstack, EntityHuman entityhuman, World world, BlockPosition blockposition, EnumHand enumhand, EnumDirection enumdirection, float f, float f1, float f2) {
-+ BlockPosition clicked = blockposition; // CraftBukkit
- blockposition = blockposition.shift(enumdirection);
- if (!entityhuman.a(blockposition, enumdirection, itemstack)) {
+@@ -14,6 +14,12 @@
return EnumInteractionResult.FAIL;
} else {
if (world.getType(blockposition).getMaterial() == Material.AIR) {
+ // 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()) {
++ if (org.bukkit.craftbukkit.event.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 EnumInteractionResult.PASS;
+ }
-+
-+ CraftBlockState blockState = CraftBlockState.getBlockState(world, blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ // CraftBukkit end
world.a(entityhuman, blockposition, SoundEffects.bx, SoundCategory.BLOCKS, 1.0F, ItemFlintAndSteel.j.nextFloat() * 0.4F + 0.8F);
world.setTypeAndData(blockposition, Blocks.FIRE.getBlockData(), 11);
-+
-+ // CraftBukkit start
-+ org.bukkit.event.block.BlockPlaceEvent placeEvent = CraftEventFactory.callBlockPlaceEvent(world, entityhuman, enumhand, blockState, clicked.getX(), clicked.getY(), clicked.getZ());
-+
-+ if (placeEvent.isCancelled() || !placeEvent.canBuild()) {
-+ placeEvent.getBlockPlaced().setTypeIdAndData(0, (byte) 0, false);
-+ return EnumInteractionResult.PASS;
-+ }
-+ // CraftBukkit end
}
-
- itemstack.damage(1, entityhuman);