The current game / entity code is cumbersome in many ways.
It should be improved as outlined at
At the same time, it may or may not a good opportunity to revise the relationship of the related entity classes:
- server vs. client entity classes,
- engine vs. game entity classes,
- concrete derived entity classes.