Refactored entity creation code into _addEntityFeatures().
Refactored entity creation code into _addEntityFeatures().

tpoikela/battles,tpoikela/battles,tpoikela/battles,tpoikela/battles,tpoikela/battles