Fix CHL desynchs

Now seems to work pretty well on IRCNet

Signed-off-by: sd <sd@hysteria.cz>
Merge branch 'xpcd' into xp