diff options
| author | Adam <Adam@anope.org> | 2014-05-28 12:11:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2014-05-28 12:22:39 -0400 |
| commit | f97e339314257fa37cfcab0c2289fb6812e32e85 (patch) | |
| tree | a1c9d352a771e0bb7d39d42178a7246d6f2c5434 /modules/protocol/plexus.cpp | |
| parent | f29e1cf383529a1a29f02b0669d973f5ee0b7a66 (diff) | |
| parent | ba46b8e4abd8fef991732d5c52c858a229894a25 (diff) | |
Merge branch '2.0' into 2.1
Conflicts:
.travis.yml
src/config.cpp
src/version.sh
Diffstat (limited to 'modules/protocol/plexus.cpp')
| -rw-r--r-- | modules/protocol/plexus.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 0e22ba6c0..6e2930757 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -334,8 +334,9 @@ class ProtoPlexus : public Module ModeManager::AddUserMode(new UserMode("INVIS", 'i')); ModeManager::AddUserMode(new UserModeOperOnly("LOCOPS", 'l')); ModeManager::AddUserMode(new UserMode("OPER", 'o')); - ModeManager::AddUserMode(new UserMode("PRIV", 'p')); ModeManager::AddUserMode(new UserModeOperOnly("NETADMIN", 'N')); + ModeManager::AddUserMode(new UserMode("PRIV", 'p')); + ModeManager::AddUserMode(new UserMode("ROUTING", 'q')); ModeManager::AddUserMode(new UserModeNoone("REGISTERED", 'r')); ModeManager::AddUserMode(new UserMode("REGPRIV", 'R')); ModeManager::AddUserMode(new UserModeOperOnly("SNOMASK", 's')); @@ -359,7 +360,7 @@ class ProtoPlexus : public Module ModeManager::AddChannelMode(new ChannelModeStatus("OWNER", 'q', '~', 4)); /* l/k */ - ModeManager::AddChannelMode(new ChannelModeParam("LIMIT", 'l')); + ModeManager::AddChannelMode(new ChannelModeParam("LIMIT", 'l', true)); ModeManager::AddChannelMode(new ChannelModeKey('k')); /* Add channel modes */ |