Make Guard and Deco NPC surface in water