6 files changed, 1246 insertions, 1354 deletions

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index efe5e4d16..283c4014b 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -293,15 +293,15 @@ class BahamutIRCdProto : public IRCDProto
 } ircd_proto;
 
 /* EVENT: SJOIN */
-int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
+bool event_sjoin(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	Channel *c = findchan(av[1]);
-	time_t ts = Anope::string(av[0]).is_pos_number_only() ? convertTo<time_t>(av[0]) : 0;
+	Channel *c = findchan(params[1]);
+	time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0;
 	bool keep_their_modes = false;
 
 	if (!c)
 	{
-		c = new Channel(av[1], ts);
+		c = new Channel(params[1], ts);
 		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
@@ -318,16 +318,21 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 		keep_their_modes = false;
 
 	/* If we need to keep their modes, and this SJOIN string contains modes */
-	if (keep_their_modes && ac >= 4)
+	if (keep_their_modes && params.size() >= 4)
 	{
 		/* Set the modes internally */
-		ChanSetInternalModes(c, ac - 3, av + 2);
+		Anope::string modes;
+		for (unsigned i = 2; i < params.size(); ++i)
+			modes += " " + params[i];
+		if (!modes.empty())
+			modes.erase(modes.begin());
+		c->SetModesInternal(NULL, modes);
 	}
 
 	/* For a reason unknown to me, bahamut will send a SJOIN from the user joining a channel
 	 * if the channel already existed
 	 */
-	if (!c->HasFlag(CH_SYNCING) && ac == 2)
+	if (!c->HasFlag(CH_SYNCING) && params.size() == 2)
 	{
 		User *u = finduser(source);
 		if (!u)
@@ -355,7 +360,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 	}
 	else
 	{
-		spacesepstream sep(av[ac - 1]);
+		spacesepstream sep(params[params.size() - 1]);
 		Anope::string buf;
 		while (sep.GetToken(buf))
 		{
@@ -418,7 +423,7 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 		c->Sync();
 	}
 
-	return MOD_CONT;
+	return true;
 }
 
 /*
@@ -439,17 +444,17 @@ int anope_event_sjoin(const Anope::string &source, int ac, const char **av)
 **	parv[0] = new nickname
 **	  parv[1] = hopcount
 */
-int anope_event_nick(const Anope::string &source, int ac, const char **av)
+bool event_nick(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	User *user;
 
-	if (ac != 2)
+	if (params.size() != 2)
 	{
-		user = do_nick(source, av[0], av[4], av[5], av[6], av[9], Anope::string(av[2]).is_pos_number_only() ? convertTo<time_t>(av[2]) : 0, av[8], "", "", av[3]);
+		user = do_nick(source, params[0], params[4], params[5], params[6], params[9], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, params[8], "", "", params[3]);
 		if (user)
 		{
 			NickAlias *na;
-			if (user->timestamp == convertTo<time_t>(av[7]) && (na = findnick(user->nick)))
+			if (user->timestamp == convertTo<time_t>(params[7]) && (na = findnick(user->nick)))
 			{
 				user->Login(na->nc);
 				user->SetMode(NickServ, UMODE_REGISTERED);
@@ -459,214 +464,199 @@ int anope_event_nick(const Anope::string &source, int ac, const char **av)
 		}
 	}
 	else
-		do_nick(source, av[0], "", "", "", "", Anope::string(av[1]).is_pos_number_only() ? convertTo<time_t>(av[1]) : 0, "", "", "", "");
-	return MOD_CONT;
+		do_nick(source, params[0], "", "", "", "", Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0, "", "", "", "");
+	return true;
 }
 
 /* EVENT : CAPAB */
-int anope_event_capab(const Anope::string &source, int ac, const char **av)
+bool event_capab(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	CapabParse(ac, av);
-	return MOD_CONT;
+	CapabParse(params);
+	return true;
 }
 
 /* EVENT : OS */
-int anope_event_os(const Anope::string &source, int ac, const char **av)
+bool event_os(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	m_privmsg(source, Config->s_OperServ, av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_privmsg(source, Config->s_OperServ, params[0]);
+	return true;
 }
 
 /* EVENT : NS */
-int anope_event_ns(const Anope::string &source, int ac, const char **av)
+bool event_ns(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	m_privmsg(source, Config->s_NickServ, av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_privmsg(source, Config->s_NickServ, params[0]);
+	return true;
 }
 
 /* EVENT : MS */
-int anope_event_ms(const Anope::string &source, int ac, const char **av)
+bool event_ms(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	m_privmsg(source, Config->s_MemoServ, av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_privmsg(source, Config->s_MemoServ, params[0]);
+	return true;
 }
 
 /* EVENT : HS */
-int anope_event_hs(const Anope::string &source, int ac, const char **av)
+bool event_hs(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	m_privmsg(source, Config->s_HostServ, av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_privmsg(source, Config->s_HostServ, params[0]);
+	return true;
 }
 
 /* EVENT : CS */
-int anope_event_cs(const Anope::string &source, int ac, const char **av)
+bool event_cs(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	m_privmsg(source, Config->s_ChanServ, av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_privmsg(source, Config->s_ChanServ, params[0]);
+	return true;
 }
 
-int anope_event_436(const Anope::string &source, int ac, const char **av)
+bool event_436(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-
-	m_nickcoll(av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_nickcoll(params[0]);
+	return true;
 }
 
 /* EVENT : SERVER */
-int anope_event_server(const Anope::string &source, int ac, const char **av)
+bool event_server(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	do_server(source, av[0], Anope::string(av[1]).is_pos_number_only() ? convertTo<unsigned>(av[1]) : 0, av[2], "");
-	return MOD_CONT;
+	do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], "");
+	return true;
 }
 
 /* EVENT : PRIVMSG */
-int anope_event_privmsg(const Anope::string &source, int ac, const char **av)
+bool event_privmsg(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-	m_privmsg(source, av[0], av[1]);
-	return MOD_CONT;
+	if (params.size() > 1)
+		m_privmsg(source, params[0], params[1]);
+	return true;
 }
 
-int anope_event_part(const Anope::string &source, int ac, const char **av)
+bool event_part(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1 || ac > 2)
-		return MOD_CONT;
-	do_part(source, ac, av);
-	return MOD_CONT;
+	if (!params.empty())
+		do_part(source, params[0], params.size() > 1 ? params[1] : "");
+	return true;
 }
 
-int anope_event_whois(const Anope::string &source, int ac, const char **av)
+bool event_whois(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (!source.empty() && ac >= 1)
-		m_whois(source, av[0]);
-	return MOD_CONT;
+	if (!source.empty() && params.size() > 0)
+		m_whois(source, params[0]);
+	return true;
 }
 
-int anope_event_topic(const Anope::string &source, int ac, const char **av)
+bool event_topic(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 4)
-		return MOD_CONT;
+	if (params.size() < 4)
+		return true;
 
-	Channel *c = findchan(av[0]);
+	Channel *c = findchan(params[0]);
 	if (!c)
 	{
-		Log() << "TOPIC for nonexistant channel " << av[0];
-		return MOD_CONT;
+		Log() << "TOPIC for nonexistant channel " << params[0];
+		return true;
 	}
 
-	c->ChangeTopicInternal(av[1], av[3], Anope::string(av[2]).is_pos_number_only() ? convertTo<time_t>(av[2]) : Anope::CurTime);
+	c->ChangeTopicInternal(params[1], params[3], Anope::string(params[2]).is_pos_number_only() ? convertTo<time_t>(params[2]) : Anope::CurTime);
 
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_squit(const Anope::string &source, int ac, const char **av)
+bool event_squit(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-	do_squit(source, ac, av);
-	return MOD_CONT;
+	if (params.size() > 0)
+		do_squit(source, params[0]);
+	return true;
 }
 
-int anope_event_quit(const Anope::string &source, int ac, const char **av)
+bool event_quit(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 1)
-		return MOD_CONT;
-	do_quit(source, ac, av);
-	return MOD_CONT;
+	if (params.size() > 0)
+		do_quit(source, params[0]);
+	return true;
 }
 
 /* EVENT: MODE */
-int anope_event_mode(const Anope::string &source, int ac, const char **av)
+bool event_mode(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 2)
-		return MOD_CONT;
+	if (params.size() < 3)
+		return true;
 
-	if (*av[0] == '#' || *av[0] == '&')
-		do_cmode(source, ac, av);
+	if (params[0][0] == '#' || params[0][0] == '&')
+		do_cmode(source, params[0], params[2], params[1]);
 	else
-		do_umode(source, ac, av);
-	return MOD_CONT;
+		do_umode(source, params[0], params[1]);
+	return true;
 }
 
 /* EVENT: KILL */
-int anope_event_kill(const Anope::string &source, int ac, const char **av)
+bool event_kill(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-
-	m_kill(av[0], av[1]);
-	return MOD_CONT;
+	if (params.size() > 1)
+		m_kill(params[0], params[1]);
+	return true;
 }
 
 /* EVENT: KICK */
-int anope_event_kick(const Anope::string &source, int ac, const char **av)
+bool event_kick(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 3)
-		return MOD_CONT;
-	do_kick(source, ac, av);
-	return MOD_CONT;
+	if (params.size() > 2)
+		do_kick(source, params[0], params[1], params[2]);
+	return true;
 }
 
 /* EVENT: JOIN */
-int anope_event_join(const Anope::string &source, int ac, const char **av)
+bool event_join(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 1)
-		return MOD_CONT;
-	do_join(source, ac, av);
-	return MOD_CONT;
+	if (params.size() >= 2)
+		do_join(source, params[0], params[1]);
+	return true;
 }
 
 /* EVENT: MOTD */
-int anope_event_motd(const Anope::string &source, int ac, const char **av)
+bool event_motd(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	if (source.empty())
-		return MOD_CONT;
+		return true;
 
 	m_motd(source);
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_away(const Anope::string &source, int ac, const char **av)
+bool event_away(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	if (source.empty())
-		return MOD_CONT;
-	m_away(source, ac ? av[0] : "");
-	return MOD_CONT;
+		return true;
+	m_away(source, !params.empty() ? params[0] : "");
+	return true;
 }
 
-int anope_event_ping(const Anope::string &source, int ac, const char **av)
+bool event_ping(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	ircdproto->SendPong(ac > 1 ? av[1] : Config->ServerName, av[0]);
-	return MOD_CONT;
+	if (params.size() < 1)
+		return true;
+	ircdproto->SendPong(params.size() > 1 ? params[1] : Config->ServerName, params[0]);
+	return true;
 }
 
-int anope_event_error(const Anope::string &source, int ac, const char **av)
+bool event_error(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac >= 1)
-		Log(LOG_DEBUG) << av[0];
-	return MOD_CONT;
+	if (params.size() > 0)
+		Log(LOG_DEBUG) << params[0];
+	return true;
 }
 
-int anope_event_burst(const Anope::string &source, int ac, const char **av)
+bool event_burst(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	Server *s = Server::Find(source);
 
-	if (!ac)
+	if (params.empty())
 	{
 		/* for future use  - start burst */
 	}
@@ -681,7 +671,7 @@ int anope_event_burst(const Anope::string &source, int ac, const char **av)
 		if (s)
 			s->Sync(true);
 	}
-	return MOD_CONT;
+	return true;
 }
 
 bool ChannelModeFlood::IsValid(const Anope::string &value) const
@@ -695,32 +685,32 @@ bool ChannelModeFlood::IsValid(const Anope::string &value) const
 
 void moduleAddIRCDMsgs()
 {
-	Anope::AddMessage("436", anope_event_436);
-	Anope::AddMessage("AWAY", anope_event_away);
-	Anope::AddMessage("JOIN", anope_event_join);
-	Anope::AddMessage("KICK", anope_event_kick);
-	Anope::AddMessage("KILL", anope_event_kill);
-	Anope::AddMessage("MODE", anope_event_mode);
-	Anope::AddMessage("MOTD", anope_event_motd);
-	Anope::AddMessage("NICK", anope_event_nick);
-	Anope::AddMessage("PART", anope_event_part);
-	Anope::AddMessage("PING", anope_event_ping);
-	Anope::AddMessage("PRIVMSG", anope_event_privmsg);
-	Anope::AddMessage("QUIT", anope_event_quit);
-	Anope::AddMessage("SERVER", anope_event_server);
-	Anope::AddMessage("SQUIT", anope_event_squit);
-	Anope::AddMessage("TOPIC", anope_event_topic);
-	Anope::AddMessage("WHOIS", anope_event_whois);
-	Anope::AddMessage("SVSMODE", anope_event_mode);
-	Anope::AddMessage("CAPAB", anope_event_capab);
-	Anope::AddMessage("CS", anope_event_cs);
-	Anope::AddMessage("HS", anope_event_hs);
-	Anope::AddMessage("MS", anope_event_ms);
-	Anope::AddMessage("NS", anope_event_ns);
-	Anope::AddMessage("OS", anope_event_os);
-	Anope::AddMessage("SJOIN", anope_event_sjoin);
-	Anope::AddMessage("ERROR", anope_event_error);
-	Anope::AddMessage("BURST", anope_event_burst);
+	Anope::AddMessage("436", event_436);
+	Anope::AddMessage("AWAY", event_away);
+	Anope::AddMessage("JOIN", event_join);
+	Anope::AddMessage("KICK", event_kick);
+	Anope::AddMessage("KILL", event_kill);
+	Anope::AddMessage("MODE", event_mode);
+	Anope::AddMessage("MOTD", event_motd);
+	Anope::AddMessage("NICK", event_nick);
+	Anope::AddMessage("PART", event_part);
+	Anope::AddMessage("PING", event_ping);
+	Anope::AddMessage("PRIVMSG", event_privmsg);
+	Anope::AddMessage("QUIT", event_quit);
+	Anope::AddMessage("SERVER", event_server);
+	Anope::AddMessage("SQUIT", event_squit);
+	Anope::AddMessage("TOPIC", event_topic);
+	Anope::AddMessage("WHOIS", event_whois);
+	Anope::AddMessage("SVSMODE", event_mode);
+	Anope::AddMessage("CAPAB", event_capab);
+	Anope::AddMessage("CS", event_cs);
+	Anope::AddMessage("HS", event_hs);
+	Anope::AddMessage("MS", event_ms);
+	Anope::AddMessage("NS", event_ns);
+	Anope::AddMessage("OS", event_os);
+	Anope::AddMessage("SJOIN", event_sjoin);
+	Anope::AddMessage("ERROR", event_error);
+	Anope::AddMessage("BURST", event_burst);
 }
 
 static void AddModes()
diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp
index c468c0f9a..fd1143f54 100644
--- a/modules/protocol/inspircd11.cpp
+++ b/modules/protocol/inspircd11.cpp
@@ -66,11 +66,11 @@ void inspircd_cmd_chghost(const Anope::string &nick, const Anope::string &vhost)
 		ircdproto->SendGlobops(OperServ, "CHGHOST not loaded!");
 }
 
-int anope_event_idle(const Anope::string &source, int ac, const char **av)
+bool event_idle(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac == 1)
-		send_cmd(av[0], "IDLE %s %ld 0", source.c_str(), static_cast<long>(Anope::CurTime));
-	return MOD_CONT;
+	if (!params.empty())
+		send_cmd(params[0], "IDLE %s %ld 0", source.c_str(), static_cast<long>(Anope::CurTime));
+	return true;
 }
 
 static Anope::string currentpass;
@@ -296,112 +296,105 @@ class InspIRCdProto : public IRCDProto
 
 } ircd_proto;
 
-int anope_event_ftopic(const Anope::string &source, int ac, const char **av)
+bool event_ftopic(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	/* :source FTOPIC channel ts setby :topic */
-	if (ac < 4)
-		return MOD_CONT;
+	if (params.size() < 4)
+		return true;
 	
-	Channel *c = findchan(av[0]);
+	Channel *c = findchan(params[0]);
 	if (!c)
 	{
-		Log() << "TOPIC for nonexistant channel " << av[0];
-		return MOD_CONT;
+		Log() << "TOPIC for nonexistant channel " << params[0];
+		return true;
 	}
 
-	c->ChangeTopicInternal(av[2], av[3], Anope::string(av[1]).is_pos_number_only() ? convertTo<time_t>(av[1]) : Anope::CurTime);
+	c->ChangeTopicInternal(params[2], params[3], Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : Anope::CurTime);
 
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_mode(const Anope::string &source, int ac, const char **av)
+bool event_mode(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 2)
-		return MOD_CONT;
+	if (params.size() < 2)
+		return true;
 
-	if (*av[0] == '#' || *av[0] == '&')
-		do_cmode(source, ac, av);
+	if (params[0][0] == '#' || params[0][0] == '&')
+		do_cmode(source, params[0], params[1], params[2]);
 	else
 	{
 		/* InspIRCd lets opers change another
-		   users modes, we have to kludge this
-		   as it slightly breaks RFC1459
+		   users modes
 		 */
-		if (source.equals_ci(av[0]))
-			do_umode(source, ac, av);
-		else
-			do_umode(av[0], ac, av);
+		do_umode(source, params[0], params[1]);
 	}
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_opertype(const Anope::string &source, int ac, const char **av)
+bool event_opertype(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	/* opertype is equivalent to mode +o because servers
 	   dont do this directly */
-	User *u;
-	u = finduser(source);
+	User *u = finduser(source);
 	if (u && !is_oper(u))
 	{
-		const char *newav[2];
-		newav[0] = source.c_str();
-		newav[1] = "+o";
-		return anope_event_mode(source, 2, newav);
+		std::vector<Anope::string> newparams;
+		newparams.push_back(source);
+		newparams.push_back("+o");
+		return event_mode(source, newparams);
 	}
 	else
-		return MOD_CONT;
+		return true;
 }
 
-int anope_event_fmode(const Anope::string &source, int ac, const char **av)
+bool event_fmode(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	const char *newav[128];
-	int n, o;
-	Channel *c;
-
 	/* :source FMODE #test 12345678 +nto foo */
-	if (ac < 3)
-		return MOD_CONT;
+	if (params.size() < 3)
+		return true;
 
+	Channel *c = findchan(params[0]);
 	/* Checking the TS for validity to avoid desyncs */
-	if ((c = findchan(av[0])))
+	if (c)
 	{
-		time_t ts = Anope::string(av[1]).is_pos_number_only() ? convertTo<time_t>(av[1]) : 0;
+		time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0;
 		if (c->creation_time > ts)
+		{
 			/* Our TS is bigger, we should lower it */
 			c->creation_time = ts;
+			c->Reset();
+		}
 		else if (c->creation_time < ts)
 			/* The TS we got is bigger, we should ignore this message. */
-			return MOD_CONT;
+			return true;
 	}
 	else
 		/* Got FMODE for a non-existing channel */
-		return MOD_CONT;
+		return true;
 
 	/* TS's are equal now, so we can proceed with parsing */
-	n = o = 0;
-	while (n < ac)
+	std::vector<Anope::string> newparams;
+	for (unsigned n = 0; n < params.size(); ++n)
 	{
 		if (n != 1)
 		{
-			newav[o] = av[n];
-			++o;
-			Log(LOG_DEBUG) << "Param: " << newav[o - 1];
+			newparams.push_back(params[n]);
+			Log(LOG_DEBUG) << "Param: " << params[n];
 		}
-		++n;
 	}
 
-	return anope_event_mode(source, ac - 1, newav);
+	return event_mode(source, newparams);
 }
 
-int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
+bool event_fjoin(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	Channel *c = findchan(av[0]);
-	time_t ts = Anope::string(av[1]).is_pos_number_only() ? convertTo<time_t>(av[1]) : 0;
+	Channel *c = findchan(params[0]);
+	time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : 0;
 	bool keep_their_modes = true;
 
 	if (!c)
 	{
-		c = new Channel(av[0], ts);
+		c = new Channel(params[0], ts);
 		c->SetFlag(CH_SYNCING);
 	}
 	/* Our creation time is newer than what the server gave us */
@@ -417,7 +410,7 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 	else if (ts > c->creation_time)
 		keep_their_modes = false;
 
-	spacesepstream sep(av[ac - 1]);
+	spacesepstream sep(params[params.size() - 1]);
 	Anope::string buf;
 	while (sep.GetToken(buf))
 	{
@@ -481,291 +474,262 @@ int anope_event_fjoin(const Anope::string &source, int ac, const char **av)
 		c->Sync();
 	}
 
-	return MOD_CONT;
+	return true;
 }
 
 /* Events */
-int anope_event_ping(const Anope::string &source, int ac, const char **av)
+bool event_ping(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-	ircdproto->SendPong(Config->ServerName, av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		ircdproto->SendPong(Config->ServerName, params[0]);
+	return true;
 }
 
-int anope_event_436(const Anope::string &source, int ac, const char **av)
+bool event_436(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1)
-		return MOD_CONT;
-
-	m_nickcoll(av[0]);
-	return MOD_CONT;
+	if (!params.empty())
+		m_nickcoll(params[0]);
+	return true;
 }
 
-int anope_event_away(const Anope::string &source, int ac, const char **av)
+bool event_away(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (source.empty())
-		return MOD_CONT;
-	m_away(source, ac ? av[0] : "");
-	return MOD_CONT;
+	if (!source.empty())
+		m_away(source, !params.empty() ? params[0] : "");
+	return true;
 }
 
 /* Taken from hybrid.c, topic syntax is identical */
 
-int anope_event_topic(const Anope::string &source, int ac, const char **av)
+bool event_topic(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	Channel *c = findchan(av[0]);
+	Channel *c = findchan(params[0]);
 
 	if (!c)
 	{
-		Log() << "TOPIC " << merge_args(ac - 1, av + 1) << " for nonexistent channel " << av[0];
-		return MOD_CONT;
+		Log() << "TOPIC " << (params.size() > 1 ? params[1] : "") << " for nonexistent channel " << params[0];
+		return true;
 	}
 
-	c->ChangeTopicInternal(source, (ac > 1 && *av[1] ? av[1] : ""), Anope::CurTime);
+	c->ChangeTopicInternal(source, (params.size() > 1 ? params[1] : ""), Anope::CurTime);
 
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_squit(const Anope::string &source, int ac, const char **av)
+bool event_squit(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-	do_squit(source, ac, av);
-	return MOD_CONT;
+	if (!params.empty())
+		do_squit(source, params[0]);
+	return true;
 }
 
-int anope_event_rsquit(const Anope::string &source, int ac, const char **av)
+bool event_rsquit(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1 || ac > 3)
-		return MOD_CONT;
+	if (params.empty() || params.size() > 3)
+		return true;
 
 	/* Horrible workaround to an insp bug (#) in how RSQUITs are sent - mark */
-	if (ac > 1 && Config->ServerName.equals_cs(av[0]))
-		do_squit(source, ac - 1, av + 1);
+	if (params.size() > 1 && Config->ServerName.equals_cs(params[0]))
+		do_squit(source, params[1]);
 	else
-		do_squit(source, ac, av);
+		do_squit(source, params[0]);
 
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_quit(const Anope::string &source, int ac, const char **av)
+bool event_quit(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 1)
-		return MOD_CONT;
-	do_quit(source, ac, av);
-	return MOD_CONT;
+	if (!params.empty())
+		do_quit(source, params[0]);
+	return true;
 }
 
-int anope_event_kill(const Anope::string &source, int ac, const char **av)
+bool event_kill(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-
-	m_kill(av[0], av[1]);
-	return MOD_CONT;
+	if (params.size() > 1)
+		m_kill(params[0], params[1]);
+	return true;
 }
 
-int anope_event_kick(const Anope::string &source, int ac, const char **av)
+bool event_kick(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 3)
-		return MOD_CONT;
-	do_kick(source, ac, av);
-	return MOD_CONT;
+	if (params.size() > 2)
+		do_kick(source, params[0], params[1], params[2]);
+	return true;
 }
 
-int anope_event_join(const Anope::string &source, int ac, const char **av)
+bool event_join(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-	do_join(source, ac, av);
-	return MOD_CONT;
+	if (params.size() > 1)
+		do_join(source, params[0], params[1]);
+	return true;
 }
 
-int anope_event_motd(const Anope::string &source, int ac, const char **av)
+bool event_motd(const Anope::string &source, const std::vector<Anope::string> &params)
 {
 	if (source.empty())
-		return MOD_CONT;
+		return true;
 
 	m_motd(source);
-	return MOD_CONT;
+	return true;
 }
 
-int anope_event_setname(const Anope::string &source, int ac, const char **av)
+bool event_setname(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *u;
-
-	if (ac != 1)
-		return MOD_CONT;
+	if (params.empty())
+		return true;
 
-	u = finduser(source);
+	User *u = finduser(source);
 	if (!u)
 	{
 		Log(LOG_DEBUG) << "SETNAME for nonexistent user " << source;
-		return MOD_CONT;
+		return true;
 	}
 
-	u->SetRealname(av[0]);
-	return MOD_CONT;
+	u->SetRealname(params[0]);
+	return true;
 }
 
-int anope_event_chgname(const Anope::string &source, int ac, const char **av)
+bool event_chgname(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *u;
-
-	if (ac != 2)
-		return MOD_CONT;
+	if (params.size() < 2)
+		return true;
 
-	u = finduser(source);
+	User *u = finduser(source);
 	if (!u)
 	{
 		Log(LOG_DEBUG) << "FNAME for nonexistent user " << source;
-		return MOD_CONT;
+		return true;
 	}
 
-	u->SetRealname(av[0]);
-	return MOD_CONT;
+	u->SetRealname(params[0]);
+	return true;
 }
 
-int anope_event_setident(const Anope::string &source, int ac, const char **av)
+bool event_setident(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *u;
-
-	if (ac != 1)
-		return MOD_CONT;
+	if (!params.empty())
+		return true;
 
-	u = finduser(source);
+	User *u = finduser(source);
 	if (!u)
 	{
 		Log(LOG_DEBUG) << "SETIDENT for nonexistent user " << source;
-		return MOD_CONT;
+		return true;
 	}
 
-	u->SetIdent(av[0]);
-	return MOD_CONT;
+	u->SetIdent(params[0]);
+	return true;
 }
 
-int anope_event_chgident(const Anope::string &source, int ac, const char **av)
+bool event_chgident(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *u;
-
-	if (ac != 2)
-		return MOD_CONT;
+	if (params.size() < 2)
+		return true;
 
-	u = finduser(av[0]);
+	User *u = finduser(params[0]);
 	if (!u)
 	{
-		Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << av[0];
-		return MOD_CONT;
+		Log(LOG_DEBUG) << "CHGIDENT for nonexistent user " << params[0];
+		return true;
 	}
 
-	u->SetIdent(av[1]);
-	return MOD_CONT;
+	u->SetIdent(params[1]);
+	return true;
 }
 
-int anope_event_sethost(const Anope::string &source, int ac, const char **av)
+bool event_sethost(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *u;
-
-	if (ac != 1)
-		return MOD_CONT;
+	if (params.empty())
+		return true;
 
-	u = finduser(source);
+	User *u = finduser(source);
 	if (!u)
 	{
 		Log(LOG_DEBUG) << "SETHOST for nonexistent user " << source;
-		return MOD_CONT;
+		return true;
 	}
 
-	u->SetDisplayedHost(av[0]);
-	return MOD_CONT;
+	u->SetDisplayedHost(params[0]);
+	return true;
 }
 
 
-int anope_event_nick(const Anope::string &source, int ac, const char **av)
+bool event_nick(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *user;
-
-	if (ac != 1)
+	if (params.size() == 8)
 	{
-		if (ac == 8)
+		time_t ts = Anope::string(params[0]).is_pos_number_only() ? convertTo<time_t>(params[0]) : 0;
+
+		User *user = do_nick("", params[1], params[4], params[2], source, params[7], ts, params[6], params[3], "", params[5]);
+		if (user)
 		{
-			time_t ts = Anope::string(av[0]).is_pos_number_only() ? convertTo<time_t>(av[0]) : 0;
+			user->SetCloakedHost(params[3]);
 
-			user = do_nick("", av[1], av[4], av[2], source, av[7], ts, av[6], av[3], "", av[5]);
-			if (user)
+			NickAlias *na = findnick(user->nick);
+			Anope::string svidbuf;
+			if (na && na->nc->GetExtRegular("authenticationtoken", svidbuf) && svidbuf == params[0])
 			{
-				user->SetCloakedHost(av[3]);
-
-				NickAlias *na = findnick(user->nick);
-				Anope::string svidbuf;
-				if (na && na->nc->GetExtRegular("authenticationtoken", svidbuf) && svidbuf == av[0])
-				{
-					user->Login(na->nc);
-					user->SetMode(NickServ, UMODE_REGISTERED);
-				}
-				else
-					validate_user(user);
+				user->Login(na->nc);
+				user->SetMode(NickServ, UMODE_REGISTERED);
 			}
+			else
+				validate_user(user);
 		}
 	}
-	else
-		do_nick(source, av[0], "", "", "", "", 0, "", "", "", "");
-	return MOD_CONT;
+	else if (params.size() == 1)
+		do_nick(source, params[0], "", "", "", "", 0, "", "", "", "");
+	return true;
 }
 
 
-int anope_event_chghost(const Anope::string &source, int ac, const char **av)
+bool event_chghost(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	User *u;
-
-	if (ac != 1)
-		return MOD_CONT;
+	if (params.empty())
+		return true;
 
-	u = finduser(source);
+	User *u = finduser(source);
 	if (!u)
 	{
 		Log(LOG_DEBUG) << "FHOST for nonexistent user " << source;
-		return MOD_CONT;
+		return true;
 	}
 
-	u->SetDisplayedHost(av[0]);
-	return MOD_CONT;
+	u->SetDisplayedHost(params[0]);
+	return true;
 }
 
 /* EVENT: SERVER */
-int anope_event_server(const Anope::string &source, int ac, const char **av)
+bool event_server(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	do_server(source, av[0], Anope::string(av[1]).is_pos_number_only() ? convertTo<unsigned>(av[1]) : 0, av[2], "");
-	return MOD_CONT;
+	do_server(source, params[0], Anope::string(params[1]).is_pos_number_only() ? convertTo<unsigned>(params[1]) : 0, params[2], "");
+	return true;
 }
 
-int anope_event_privmsg(const Anope::string &source, int ac, const char **av)
+bool event_privmsg(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac != 2)
-		return MOD_CONT;
-	m_privmsg(source, av[0], av[1]);
-	return MOD_CONT;
+	if (params.size() > 1)
+		m_privmsg(source, params[0], params[1]);
+	return true;
 }
 
-int anope_event_part(const Anope::string &source, int ac, const char **av)
+bool event_part(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (ac < 1 || ac > 2)
-		return MOD_CONT;
-	do_part(source, ac, av);
-	return MOD_CONT;
+	if (!params.empty())
+		do_part(source, params[0], params.size() > 1 ? params[1] : "");
+	return true;
 }
 
-int anope_event_whois(const Anope::string &source, int ac, const char **av)
+bool event_whois(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (!source.empty() && ac >= 1)
-		m_whois(source, av[0]);
-	return MOD_CONT;
+	if (!source.empty() && !params.empty())
+		m_whois(source, params[0]);
+	return true;
 }
 
-int anope_event_capab(const Anope::string &source, int ac, const char **av)
+bool event_capab(const Anope::string &source, const std::vector<Anope::string> &params)
 {
-	if (!strcasecmp(av[0], "START"))
+	if (params[0].equals_cs("START"))
 	{
 		/* reset CAPAB */
 		has_servicesmod = false;
@@ -775,24 +739,24 @@ int anope_event_capab(const Anope::string &source, int ac, const char **av)
 		has_chgidentmod = false;
 		has_hidechansmod = fal