diff options
| -rw-r--r-- | include/modules.h | 7 | ||||
| -rw-r--r-- | modules/protocol/hybrid.cpp | 2 | ||||
| -rw-r--r-- | modules/protocol/plexus.cpp | 4 | ||||
| -rw-r--r-- | modules/protocol/ratbox.cpp | 2 | ||||
| -rw-r--r-- | src/servers.cpp | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/include/modules.h b/include/modules.h index 0d121089a..90dd23807 100644 --- a/include/modules.h +++ b/include/modules.h @@ -719,11 +719,6 @@ class CoreExport Module : public Extensible */ virtual void OnNickDrop(CommandSource &source, NickAlias *na) { throw NotImplementedException(); } - /** Called when a nick is forbidden - * @param na The nick alias of the forbidden nick - */ - virtual void OnNickForbidden(NickAlias *na) { throw NotImplementedException(); } - /** Called when a user groups their nick * @param u The user grouping * @param target The target they're grouping to @@ -1094,7 +1089,7 @@ enum Implementation I_OnPreUserLogoff, I_OnPostUserLogoff, I_OnBotCreate, I_OnBotChange, I_OnBotDelete, I_OnAccessDel, I_OnAccessAdd, I_OnAccessClear, I_OnLevelChange, I_OnChanDrop, I_OnChanRegistered, I_OnChanSuspend, I_OnChanUnsuspend, I_OnCreateChan, I_OnDelChan, I_OnChannelCreate, I_OnChannelDelete, I_OnAkickAdd, I_OnAkickDel, I_OnCheckKick, - I_OnChanInfo, I_OnCheckPriv, I_OnGroupCheckPriv, I_OnNickDrop, I_OnNickForbidden, I_OnNickGroup, I_OnNickIdentify, + I_OnChanInfo, I_OnCheckPriv, I_OnGroupCheckPriv, I_OnNickDrop, I_OnNickGroup, I_OnNickIdentify, I_OnUserLogin, I_OnNickLogout, I_OnNickRegister, I_OnNickSuspend, I_OnNickUnsuspended, I_OnDelNick, I_OnNickCoreCreate, I_OnDelCore, I_OnChangeCoreDisplay, I_OnNickClearAccess, I_OnNickAddAccess, I_OnNickEraseAccess, I_OnNickClearCert, I_OnNickAddCert, I_OnNickEraseCert, I_OnNickInfo, I_OnBotInfo, I_OnCheckAuthentication, I_OnNickUpdate, diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp index 9d928a106..84f7db001 100644 --- a/modules/protocol/hybrid.cpp +++ b/modules/protocol/hybrid.cpp @@ -610,7 +610,7 @@ class ProtoHybrid : public Module ModeManager::AddUserMode(new UserModeOperOnly("CALLERID", 'g')); ModeManager::AddUserMode(new UserMode("INVIS", 'i')); ModeManager::AddUserMode(new UserModeOperOnly("LOCOPS", 'l')); - ModeManager::AddUserMode(new UserMode("OPER", 'o')); + ModeManager::AddUserMode(new UserModeOperOnly("OPER", 'o')); ModeManager::AddUserMode(new UserModeNoone("REGISTERED", 'r')); ModeManager::AddUserMode(new UserModeOperOnly("SNOMASK", 's')); ModeManager::AddUserMode(new UserMode("WALLOPS", 'w')); diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 0770d20a4..04d90be7e 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -333,10 +333,10 @@ class ProtoPlexus : public Module ModeManager::AddUserMode(new UserMode("CALLERID", 'g')); ModeManager::AddUserMode(new UserMode("INVIS", 'i')); ModeManager::AddUserMode(new UserModeOperOnly("LOCOPS", 'l')); - ModeManager::AddUserMode(new UserMode("OPER", 'o')); + ModeManager::AddUserMode(new UserModeOperOnly("OPER", 'o')); ModeManager::AddUserMode(new UserModeOperOnly("NETADMIN", 'N')); ModeManager::AddUserMode(new UserMode("PRIV", 'p')); - ModeManager::AddUserMode(new UserMode("ROUTING", 'q')); + ModeManager::AddUserMode(new UserModeOperOnly("ROUTING", 'q')); ModeManager::AddUserMode(new UserModeNoone("REGISTERED", 'r')); ModeManager::AddUserMode(new UserMode("REGPRIV", 'R')); ModeManager::AddUserMode(new UserModeOperOnly("SNOMASK", 's')); diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 89e0f0176..8fd9a30cf 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -253,7 +253,7 @@ class ProtoRatbox : public Module // k = skill? ModeManager::AddUserMode(new UserModeOperOnly("LOCOPS", 'l')); // n = nchange - ModeManager::AddUserMode(new UserMode("OPER", 'o')); + ModeManager::AddUserMode(new UserModeOperOnly("OPER", 'o')); // r = rej ModeManager::AddUserMode(new UserModeOperOnly("SNOMASK", 's')); ModeManager::AddUserMode(new UserModeNoone("PROTECTED", 'S')); diff --git a/src/servers.cpp b/src/servers.cpp index 3f698815c..e1b66baa8 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -385,7 +385,7 @@ const Anope::string Servers::TS6_SID_Retrieve() if (!IRCD || !IRCD->RequiresID) return ""; - static Anope::string current_sid = Config->GetBlock("options")->Get<const Anope::string>("id"); + static Anope::string current_sid = Config->GetBlock("serverinfo")->Get<const Anope::string>("id"); if (current_sid.empty()) current_sid = "00A"; |