Updated attack mechanics and collisions with attacks