Added a else clause to some classes and a getName() to fix the CraftPlayer issue.