Underwater NPCs

I have an issue where, in the event a player builds on a small ocean island with no excess land, the raiding npcs are spawning underwater and running around underwater. In many cases the water is too deep to shoot through, and the npcs are unaffected by water in ways players are which make it very wonky and unrealistic.

I did apply a block to ocean and oceanside colliders, but they just spawn farther away and run over to the event still.

Is it possible to add a "is underwater = kill" config check, similar to how raidablebases does a check for npcs underwater? I imagine this is the most straightforward way to resolving this?