fixes /tp and /tphere
Merge origin/crow into crow