Misc fixes

-Temp fix for HoR despawn
-Pets should swim
-Temp fix for Blackheart