Forest fix
Optimized combat movement functions