improved shot collision detection