Fixed these ModuleManager::Attach calls once and for all..

modules/core/bs_main.cpp

@@ -27,7 +27,7 @@ class BotServCore : public Module
 
 		Implementation i[] = { I_OnPrivmsg, I_OnPreCommand, I_OnJoinChannel, I_OnLeaveChannel,
 					I_OnPreHelp, I_OnPostHelp, I_OnChannelModeSet };
-		ModuleManager::Attach(i, this, 7);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 	}
 

modules/core/cs_main.cpp

@@ -25,7 +25,7 @@ class ChanServCore : public Module
 			throw ModuleException("No bot named " + Config->ChanServ);
 
 		Implementation i[] = { I_OnBotPrivmsg, I_OnDelCore, I_OnPreHelp, I_OnPostHelp };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnBotPrivmsg(User *u, BotInfo *bi, Anope::string &message)

modules/core/db_mysql.cpp

@@ -132,7 +132,7 @@ class DBMySQL : public Module
 		Implementation i[] = {
 			I_OnLoadDatabase, I_OnServerConnect
 		};
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandsqlsync);
 

modules/core/db_mysql_live.cpp

@@ -162,7 +162,7 @@ class MySQLLiveModule : public Module
 		Module(modname, creator, DATABASE), SQL("mysql/main"), ACS("asynch_commands")
 	{
 		Implementation i[] = { I_OnFindChan, I_OnFindNick, I_OnFindCore, I_OnShutdown };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnShutdown()

modules/core/db_plain.cpp

@@ -360,7 +360,7 @@ class DBPlain : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnReload, I_OnDatabaseRead, I_OnLoadDatabase, I_OnDatabaseReadMetadata, I_OnSaveDatabase, I_OnModuleLoad };
-		ModuleManager::Attach(i, this, 6);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 

modules/core/enc_md5.cpp

@@ -320,7 +320,7 @@ class EMD5 : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)

modules/core/enc_none.cpp

@@ -17,7 +17,7 @@ class ENone : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnDecrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)

modules/core/enc_old.cpp

@@ -325,7 +325,7 @@ class EOld : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)

modules/core/enc_sha1.cpp

@@ -173,7 +173,7 @@ class ESHA1 : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	EventReturn OnEncrypt(const Anope::string &src, Anope::string &dest)

modules/core/enc_sha256.cpp

@@ -252,7 +252,7 @@ class ESHA256 : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnEncrypt, I_OnCheckAuthentication };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		use_iv = false;
 	}

modules/core/gl_main.cpp

@@ -60,7 +60,7 @@ class GlobalCore : public Module
 		ModuleManager::RegisterService(&this->myglobalservice);
 
 		Implementation i[] = { I_OnRestart, I_OnShutdown, I_OnNewServer, I_OnPreHelp };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnRestart()

modules/core/hs_main.cpp

@@ -28,7 +28,7 @@ class HostServCore : public Module
 			throw ModuleException("No bot named " + Config->HostServ);
 
 		Implementation i[] = { I_OnNickIdentify, I_OnNickUpdate, I_OnPreHelp };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnNickIdentify(User *u)

modules/core/ms_main.cpp

@@ -167,7 +167,7 @@ class MemoServCore : public Module
 			throw ModuleException("No bot named " + Config->MemoServ);
 
 		Implementation i[] = { I_OnNickIdentify, I_OnJoinChannel, I_OnUserAway, I_OnNickUpdate, I_OnPreHelp, I_OnPostHelp };
-		ModuleManager::Attach(i, this, 6);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->mymemoserv);
 	}

modules/core/ns_ajoin.cpp

@@ -116,7 +116,7 @@ class NSAJoin : public Module
 		ModuleManager::RegisterService(&commandnsajoin);
 
 		Implementation i[] = { I_OnNickIdentify, I_OnDatabaseWriteMetadata, I_OnDatabaseReadMetadata };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnNickIdentify(User *u)

modules/core/ns_cert.cpp

@@ -211,7 +211,7 @@ class NSCert : public Module
 			throw ModuleException("Your IRCd does not support ssl client certificates");
 
 		Implementation i[] = { I_OnUserNickChange, I_OnFingerprint };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandnscert);
 	}

modules/core/ns_main.cpp

@@ -147,7 +147,7 @@ class NickServCore : public Module
 
 		Implementation i[] = { I_OnDelNick, I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickIdentify, I_OnNickGroup,
 		I_OnNickUpdate, I_OnUserNickChange, I_OnPreHelp, I_OnPostHelp };
-		ModuleManager::Attach(i, this, 9);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->mynickserv);
 	}

modules/core/os_forbid.cpp

@@ -207,7 +207,7 @@ class OSForbid : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnUserConnect, I_OnUserNickChange, I_OnJoinChannel, I_OnPreCommand, I_OnDatabaseWrite, I_OnDatabaseRead };
-		ModuleManager::Attach(i, this, 6);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 		
 		ModuleManager::RegisterService(&this->forbidService);
 

modules/core/os_ignore.cpp

@@ -294,7 +294,7 @@ class OSIgnore : public Module
 		ModuleManager::RegisterService(&commandosignore);
 
 		Implementation i[] = { I_OnDatabaseRead, I_OnDatabaseWrite, I_OnBotPrivmsg };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->osignoreservice);
 	}

modules/core/os_main.cpp

@@ -293,7 +293,7 @@ class OperServCore : public Module
 			throw ModuleException("No bot named " + Config->OperServ);
 
 		Implementation i[] = { I_OnBotPrivmsg, I_OnServerQuit, I_OnUserModeSet, I_OnUserModeUnset, I_OnUserConnect, I_OnUserNickChange, I_OnPreHelp };
-		ModuleManager::Attach(i, this, 7);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&sglines);
 		ModuleManager::RegisterService(&szlines);

modules/core/os_news.cpp

@@ -381,7 +381,7 @@ class OSNews : public Module
 		ModuleManager::RegisterService(&commandosrandomnews);
 
 		Implementation i[] = { I_OnUserModeSet, I_OnUserConnect, I_OnDatabaseRead, I_OnDatabaseWrite };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->newsservice);
 	}

modules/core/os_oper.cpp

@@ -174,7 +174,7 @@ class OSOper : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnDatabaseWrite, I_OnDatabaseRead };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandosoper);
 	}

modules/core/os_session.cpp

@@ -725,7 +725,7 @@ class OSSession : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnUserConnect, I_OnUserLogoff };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&commandossession);
 		ModuleManager::RegisterService(&commandosexception);

modules/extra/bs_autoassign.cpp

@@ -21,7 +21,7 @@ class BSAutoAssign : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnChanRegistered, I_OnReload };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		this->OnReload();
 	}

modules/extra/cs_entrymsg.cpp

@@ -166,7 +166,7 @@ class CSEntryMessage : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnJoinChannel, I_OnReload, I_OnDatabaseReadMetadata, I_OnDatabaseWriteMetadata }; 
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 			
 		ModuleManager::RegisterService(&commandentrymsg);
 

modules/extra/cs_set_misc.cpp

@@ -60,7 +60,7 @@ class CSSetMisc : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnChanInfo, I_OnDatabaseWriteMetadata, I_OnDatabaseReadMetadata };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->commandcssetmisc);
 		ModuleManager::RegisterService(&this->commandcssasetmisc);

modules/extra/hs_request.cpp

@@ -312,7 +312,7 @@ class HSRequest : public Module
 		ModuleManager::RegisterService(&commandhswaiting);
 
 		Implementation i[] = { I_OnDelNick, I_OnDatabaseRead, I_OnDatabaseWrite, I_OnReload };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		this->OnReload();
 	}

modules/extra/m_async_commands.cpp

@@ -118,7 +118,7 @@ class ModuleAsynchCommands : public Module, public Pipe, public AsynchCommandsSe
 		main_mutex.Lock();
 
 		Implementation i[] = { I_OnDeleteObject, I_OnPreCommand };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::SetPriority(this, PRIORITY_FIRST);
 

modules/extra/m_dnsbl.cpp

@@ -87,7 +87,7 @@ class ModuleDNSBL : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnReload, I_OnUserConnect };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 	}

modules/extra/m_helpchan.cpp

@@ -17,7 +17,7 @@ class HelpChannel : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnChannelModeSet, I_OnReload };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 	}

modules/extra/m_ldap.cpp

@@ -346,7 +346,7 @@ class ModuleLDAP : public Module, public Pipe
 		me = this;
 
 		Implementation i[] = { I_OnReload, I_OnModuleUnload };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 	}

modules/extra/m_ldap_authentication.cpp

@@ -181,7 +181,7 @@ class NSIdentifyLDAP : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnReload, I_OnPreCommand, I_OnCheckAuthentication, I_OnNickIdentify, I_OnNickRegister };
-		ModuleManager::Attach(i, this, 5);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 		ModuleManager::SetPriority(this, PRIORITY_FIRST);
 
 		OnReload();

modules/extra/m_ldap_oper.cpp

@@ -90,7 +90,7 @@ class LDAPOper : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnReload, I_OnNickIdentify, I_OnDelCore };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 	}

modules/extra/m_statusupdate.cpp

@@ -15,7 +15,7 @@ class StatusUpdate : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnAccessAdd, I_OnAccessChange, I_OnAccessDel, I_OnAccessClear };
-		ModuleManager::Attach(i, this, 4);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 	}
 
 	void OnAccessAdd(ChannelInfo *ci, User *u, ChanAccess *access)

modules/extra/m_xmlrpc.cpp

@@ -232,7 +232,7 @@ class ModuleXMLRPC : public Module
 		ModuleManager::RegisterService(&this->xmlrpcinterface);
 
 		Implementation i[] = { I_OnReload };
-		ModuleManager::Attach(i, this, 1);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 		
 		OnReload();
 	}

modules/extra/ns_maxemail.cpp

@@ -59,7 +59,7 @@ class NSMaxEmail : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnReload, I_OnPreCommand };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		OnReload();
 	}

modules/extra/ns_set_misc.cpp

@@ -76,7 +76,7 @@ class NSSetMisc : public Module
 		this->SetAuthor("Anope");
 
 		Implementation i[] = { I_OnNickInfo, I_OnDatabaseWriteMetadata, I_OnDatabaseReadMetadata };
-		ModuleManager::Attach(i, this, 3);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		ModuleManager::RegisterService(&this->commandnssetmisc);
 		ModuleManager::RegisterService(&this->commandnssasetmisc);

modules/protocol/inspircd12.cpp

@@ -758,7 +758,7 @@ class ProtoInspIRCd : public Module
 		Capab.SetFlag(CAPAB_NOQUIT);
 
 		Implementation i[] = { I_OnUserNickChange, I_OnServerSync };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		if (Config->Numeric.empty())
 			throw ModuleException("This IRCd protocol requires a server id to be set in Anope's configuration.");

modules/protocol/inspircd20.cpp

@@ -753,7 +753,7 @@ class ProtoInspIRCd : public Module
 		Capab.SetFlag(CAPAB_NOQUIT);
 
 		Implementation i[] = { I_OnUserNickChange, I_OnServerSync };
-		ModuleManager::Attach(i, this, 2);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		if (Config->Numeric.empty())
 			throw ModuleException("This IRCd protocol requires a server id to be set in Anope's configuration.");

modules/protocol/plexus.cpp

@@ -659,7 +659,7 @@ class ProtoPlexus : public Module
 		this->AddModes();
 
 		Implementation i[] = { I_OnServerSync };
-		ModuleManager::Attach(i, this, 1);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		if (Config->Numeric.empty())
 			throw ModuleException("This IRCd protocol requires a server id to be set in Anope's configuration.");

modules/protocol/ratbox.cpp

@@ -591,7 +591,7 @@ class ProtoRatbox : public Module
 		this->AddModes();
 
 		Implementation i[] = { I_OnServerSync };
-		ModuleManager::Attach(i, this, 1);
+		ModuleManager::Attach(i, this, sizeof(i) / sizeof(Implementation));
 
 		if (Config->Numeric.empty())
 			throw ModuleException("This IRCd protocol requires a server id to be set in Anope's configuration.");