Trying to fix client issue with own player instance
Merge branch 'master' of https://github.com/Pequeno0/NGJ14