Fixes to CanaryPlayer, CanaryEntityLiving, EntityNPC, and refix
MinecraftServer