Attempt to fix player entity duplication on TP in some cases

Signed-off-by: Ross Allan <rallanpcl@gmail.com>