Moved right click check to player :santa:
Merge
Merge remote-tracking branch 'origin/master' into shuriken-limit