Add Entity as a Source capability, and add more API choices, and on Location.
This code was causing NPE's in saving player data, potentially related to reloads.
Resolves #1153