mirror of
https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git
synced 2024-11-25 03:26:14 +00:00
76 lines
5.0 KiB
Diff
76 lines
5.0 KiB
Diff
--- a/net/minecraft/world/item/ItemBlock.java
|
|
+++ b/net/minecraft/world/item/ItemBlock.java
|
|
@@ -32,6 +32,13 @@
|
|
import net.minecraft.world.level.gameevent.GameEvent;
|
|
import net.minecraft.world.phys.shapes.VoxelShapeCollision;
|
|
|
|
+// CraftBukkit start
|
|
+import net.minecraft.server.level.WorldServer;
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+import org.bukkit.craftbukkit.block.data.CraftBlockData;
|
|
+import org.bukkit.event.block.BlockCanBuildEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class ItemBlock extends Item {
|
|
|
|
/** @deprecated */
|
|
@@ -62,6 +69,12 @@
|
|
return EnumInteractionResult.FAIL;
|
|
} else {
|
|
IBlockData iblockdata = this.getPlacementState(blockactioncontext1);
|
|
+ // CraftBukkit start - special case for handling block placement with water lilies and snow buckets
|
|
+ org.bukkit.block.BlockState blockstate = null;
|
|
+ if (this instanceof PlaceOnWaterBlockItem || this instanceof SolidBucketItem) {
|
|
+ blockstate = org.bukkit.craftbukkit.block.CraftBlockStates.getBlockState(blockactioncontext1.getLevel(), blockactioncontext1.getClickedPos());
|
|
+ }
|
|
+ // CraftBukkit end
|
|
|
|
if (iblockdata == null) {
|
|
return EnumInteractionResult.FAIL;
|
|
@@ -79,6 +92,19 @@
|
|
this.updateCustomBlockEntityTag(blockposition, world, entityhuman, itemstack, iblockdata1);
|
|
updateBlockEntityComponents(world, blockposition, itemstack);
|
|
iblockdata1.getBlock().setPlacedBy(world, blockposition, iblockdata1, entityhuman, itemstack);
|
|
+ // CraftBukkit start
|
|
+ if (blockstate != null) {
|
|
+ org.bukkit.event.block.BlockPlaceEvent placeEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPlaceEvent((WorldServer) world, entityhuman, blockactioncontext1.getHand(), blockstate, blockposition.getX(), blockposition.getY(), blockposition.getZ());
|
|
+ if (placeEvent != null && (placeEvent.isCancelled() || !placeEvent.canBuild())) {
|
|
+ blockstate.update(true, false);
|
|
+
|
|
+ if (this instanceof SolidBucketItem) {
|
|
+ ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
|
|
+ }
|
|
+ return EnumInteractionResult.FAIL;
|
|
+ }
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (entityhuman instanceof EntityPlayer) {
|
|
CriterionTriggers.PLACED_BLOCK.trigger((EntityPlayer) entityhuman, blockposition, itemstack);
|
|
}
|
|
@@ -86,7 +112,7 @@
|
|
|
|
SoundEffectType soundeffecttype = iblockdata1.getSoundType();
|
|
|
|
- world.playSound(entityhuman, blockposition, this.getPlaceSound(iblockdata1), SoundCategory.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F);
|
|
+ // world.playSound(entityhuman, blockposition, this.getPlaceSound(iblockdata1), SoundCategory.BLOCKS, (soundeffecttype.getVolume() + 1.0F) / 2.0F, soundeffecttype.getPitch() * 0.8F);
|
|
world.gameEvent((Holder) GameEvent.BLOCK_PLACE, blockposition, GameEvent.a.of(entityhuman, iblockdata1));
|
|
itemstack.consume(1, entityhuman);
|
|
return EnumInteractionResult.SUCCESS;
|
|
@@ -144,8 +170,15 @@
|
|
protected boolean canPlace(BlockActionContext blockactioncontext, IBlockData iblockdata) {
|
|
EntityHuman entityhuman = blockactioncontext.getPlayer();
|
|
VoxelShapeCollision voxelshapecollision = entityhuman == null ? VoxelShapeCollision.empty() : VoxelShapeCollision.of(entityhuman);
|
|
+ // CraftBukkit start - store default return
|
|
+ boolean defaultReturn = (!this.mustSurvive() || iblockdata.canSurvive(blockactioncontext.getLevel(), blockactioncontext.getClickedPos())) && blockactioncontext.getLevel().isUnobstructed(iblockdata, blockactioncontext.getClickedPos(), voxelshapecollision);
|
|
+ org.bukkit.entity.Player player = (blockactioncontext.getPlayer() instanceof EntityPlayer) ? (org.bukkit.entity.Player) blockactioncontext.getPlayer().getBukkitEntity() : null;
|
|
|
|
- return (!this.mustSurvive() || iblockdata.canSurvive(blockactioncontext.getLevel(), blockactioncontext.getClickedPos())) && blockactioncontext.getLevel().isUnobstructed(iblockdata, blockactioncontext.getClickedPos(), voxelshapecollision);
|
|
+ BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getLevel(), blockactioncontext.getClickedPos()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
|
|
+ blockactioncontext.getLevel().getCraftServer().getPluginManager().callEvent(event);
|
|
+
|
|
+ return event.isBuildable();
|
|
+ // CraftBukkit end
|
|
}
|
|
|
|
protected boolean mustSurvive() {
|