From 30e17371e62519c5a8556621f982c07d8bbb6cec Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sat, 7 Jan 2006 01:08:29 +0000 Subject: [PATCH] Do not send JOIN for zombies given ops or voice. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/branches/u2_10_12_branch@1607 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 5 +++++ ircd/channel.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9dbdc70..dcf5159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-06 Michael Poole + + * ircd/channel.c (mode_process_clients): Do not reveal zombies who + are being opped (MODE and KICK crossed). Reported by coekie. + 2006-01-06 Michael Poole * ircd/m_join.c (ms_join): Wipe out all modes (not just chanops) diff --git a/ircd/channel.c b/ircd/channel.c index 61b8896..99e5182 100644 --- a/ircd/channel.c +++ b/ircd/channel.c @@ -3085,7 +3085,7 @@ mode_process_clients(struct ParseState *state) /* actually effect the change */ if (state->flags & MODE_PARSE_SET) { if (state->cli_change[i].flag & MODE_ADD) { - if (IsDelayedJoin(member)) + if (IsDelayedJoin(member) && !IsZombie(member)) RevealDelayedJoin(member); member->status |= (state->cli_change[i].flag & (MODE_CHANOP | MODE_VOICE)); -- 2.20.1