Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 20:40:07 +01:00
6abb4398b9
Also adds a missing call to BlockIgniteEvent for players igniting campfires with flint and steel.
27 Zeilen
1.8 KiB
Diff
27 Zeilen
1.8 KiB
Diff
--- a/net/minecraft/server/ItemFlintAndSteel.java
|
|
+++ b/net/minecraft/server/ItemFlintAndSteel.java
|
|
@@ -13,7 +13,7 @@
|
|
BlockPosition blockposition = itemactioncontext.getClickPosition();
|
|
IBlockData iblockdata = world.getType(blockposition);
|
|
|
|
- if (BlockCampfire.h(iblockdata)) {
|
|
+ if (BlockCampfire.h(iblockdata) && !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition, entityhuman).isCancelled()) { // CraftBukkit
|
|
world.playSound(entityhuman, blockposition, SoundEffects.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, ItemFlintAndSteel.RANDOM.nextFloat() * 0.4F + 0.8F);
|
|
world.setTypeAndData(blockposition, (IBlockData) iblockdata.set(BlockProperties.r, true), 11);
|
|
if (entityhuman != null) {
|
|
@@ -27,6 +27,14 @@
|
|
BlockPosition blockposition1 = blockposition.shift(itemactioncontext.getClickedFace());
|
|
|
|
if (BlockFireAbstract.a((GeneratorAccess) world, blockposition1)) {
|
|
+ // CraftBukkit start - Store the clicked block
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(world, blockposition1, org.bukkit.event.block.BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL, entityhuman).isCancelled()) {
|
|
+ itemactioncontext.getItemStack().damage(1, entityhuman, (entityhuman1) -> {
|
|
+ entityhuman1.broadcastItemBreak(itemactioncontext.getHand());
|
|
+ });
|
|
+ return EnumInteractionResult.PASS;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.playSound(entityhuman, blockposition1, SoundEffects.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0F, ItemFlintAndSteel.RANDOM.nextFloat() * 0.4F + 0.8F);
|
|
IBlockData iblockdata1 = BlockFireAbstract.a((IBlockAccess) world, blockposition1);
|
|
|