Bugfix Player2 Shooting
Merge conflict