Revert "Revert "Preparations for non-player entities!""

This reverts commit d2ccf3771390421e1ff3e256f135c658e1d5d0e1.