3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-25 07:40:06 +01:00
Paper/nms-patches/ItemFlintAndSteel.patch

46 Zeilen
2.3 KiB
Diff

2015-05-25 12:37:24 +02:00
--- 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() {
2015-02-26 23:41:06 +01:00
@@ -9,13 +14,31 @@
}
2016-02-29 22:32:46 +01:00
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)) {
2016-02-29 22:32:46 +01:00
return EnumInteractionResult.FAIL;
} else {
2016-02-29 22:32:46 +01:00
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()) {
+ itemstack.damage(1, entityhuman);
2016-02-29 22:32:46 +01:00
+ return EnumInteractionResult.PASS;
+ }
+
+ CraftBlockState blockState = CraftBlockState.getBlockState(world, blockposition.getX(), blockposition.getY(), blockposition.getZ());
+ // CraftBukkit end
2016-03-30 21:50:59 +02:00
world.a(entityhuman, blockposition, SoundEffects.bx, SoundCategory.BLOCKS, 1.0F, ItemFlintAndSteel.j.nextFloat() * 0.4F + 0.8F);
2016-02-29 22:32:46 +01:00
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);
2016-02-29 22:32:46 +01:00
+ return EnumInteractionResult.PASS;
+ }
+ // CraftBukkit end
}
itemstack.damage(1, entityhuman);