client packet handling part 1
Merge