From b94c45340e153254f9dd06ecc3445222f31d0220 Mon Sep 17 00:00:00 2001 From: brain Date: Fri, 9 Nov 2007 21:51:48 +0000 Subject: Roadmap item "Fix jointhrottle to not try 'throttle' clients during a netmerge (requires changing join event to be aware of netmerge?)" -- 1.2 only requires an extra parameter to OnUserJoin, bool sync. usually false, but FJOIN code during burst sets it to true. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8552 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/channels.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/channels.h') diff --git a/include/channels.h b/include/channels.h index 0f947ac22..c49ac35d3 100644 --- a/include/channels.h +++ b/include/channels.h @@ -122,7 +122,7 @@ class CoreExport Channel : public Extensible /** Connect a Channel to a User */ - static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs); + static Channel* ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting); /** Set default modes for the channel on creation */ @@ -375,7 +375,7 @@ class CoreExport Channel : public Extensible * been created if the channel did not exist before the user was joined to it. * If the user could not be joined to a channel, the return value may be NULL. */ - static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, time_t TS = 0); + static Channel* JoinUser(InspIRCd* ServerInstance, User *user, const char* cn, bool override, const char* key, bool bursting, time_t TS = 0); /** Write to a channel, from a user, using va_args for text * @param user User whos details to prefix the line with -- cgit v1.2.3