[3.3.5][Quest] Daggercap Divin' - related issues

Description:
2 problems with quest http://www.wowhead.com/quest=11443/daggercap-divin
Current behaviour: Tell us what happens

1. http://www.wowhead.com/npc=23730/harold-lagras sometimes drops below the ground (waypoint related)(vmaps and mmaps enabled)
2. http://www.wowhead.com/npc=24707/buoy does not regenerate your breath if you are near it

Expected behaviour: Tell us what should happen instead

1. http://www.wowhead.com/npc=23730/harold-lagras shouel not drop below the ground
2. http://www.wowhead.com/npc=24707/buoy if you are near that creature, you should regenerate your breath
   Steps to reproduce the problem:
3. .quest add http://www.wowhead.com/npc=24707/buoy
4. .go c id 24707
5. .go c id 23730

Branch(es): 3.3.5 / 6.x (Select the branch(es) affected by this issue)
3.3.5

TC hash/commit:
https://github.com/TrinityCore/TrinityCore/commit/c2227910fc10129f66da652ec830d49e5d4f8afa

TDB version:
TDB 335.61

Operating system:
Win 10

Start with the quest and NPCs identified in the report: Harold Lagras (23730) and Buoy (24707), using the listed .quest add and .go c id commands to reproduce both behaviors. Trace the waypoint handling for Harold Lagras and the nearby breath-regeneration behavior for the Buoy. Done means Harold Lagras no longer drops below the ground and the Buoy regenerates breath when approached.