Fixed In-combat Teleporting