--- a/net/minecraft/server/ItemBoat.java +++ b/net/minecraft/server/ItemBoat.java @@ -41,6 +41,14 @@ } if (movingobjectposition.getType() == MovingObjectPosition.EnumMovingObjectType.BLOCK) { + // CraftBukkit start - Boat placement + MovingObjectPositionBlock movingobjectpositionblock = (MovingObjectPositionBlock) movingobjectposition; + org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), itemstack, enumhand); + + if (event.isCancelled()) { + return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack); + } + // CraftBukkit end EntityBoat entityboat = new EntityBoat(world, movingobjectposition.getPos().x, movingobjectposition.getPos().y, movingobjectposition.getPos().z); entityboat.setType(this.b); @@ -49,7 +57,15 @@ return InteractionResultWrapper.fail(itemstack); } else { if (!world.isClientSide) { - world.addEntity(entityboat); + // CraftBukkit start + if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPlaceEvent(world, movingobjectpositionblock.getBlockPosition(), movingobjectpositionblock.getDirection(), entityhuman, entityboat).isCancelled()) { + return InteractionResultWrapper.fail(itemstack); + } + + if (!world.addEntity(entityboat)) { + return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack); + } + // CraftBukkit end if (!entityhuman.abilities.canInstantlyBuild) { itemstack.subtract(1); }