Attempt to fix player entity duplication on TP in some casesSigned-off-by: Ross Allan <[email protected]> (commit: 748a10f)