I don't think this OnBotKick to hold channels is necessary anymore as Sync should cover everything now, and this causes weird things when the last user in a channel kicks themselves out using the bot. Also handle users rejoining a channel while its held better.

src/messages.cpp

@@ -150,7 +150,14 @@ void Join::SJoin(MessageSource &source, const Anope::string &chan, time_t ts, co
 		/* the channel is synced when the netmerge is complete */
 		Server *src = source.GetServer() ? source.GetServer() : Me;
 		if (src && src->IsSynced())
+		{
 			c->Sync();
+
+			if (c->CheckDelete())
+				delete c;
+			else
+				c->CheckModes();
+		}
 	}
 }