diff options
| author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-03-27 19:51:13 +0000 |
|---|---|---|
| committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2006-03-27 19:51:13 +0000 |
| commit | 6dc0b83a416ef200ef7eba04ee6dc7e69842f5cc (patch) | |
| tree | bab42817043ca24ecfd9c84fd93367550965c952 | |
| parent | 6bba4e9bf05c91e536f9eba4913c4d9a4a26002d (diff) | |
Fix for desync in channels with keys a'la services
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3779 e03df62e-2008-0410-955e-edbf42e46eb7
| -rw-r--r-- | src/modules/m_spanningtree.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/m_spanningtree.cpp b/src/modules/m_spanningtree.cpp index f504c28bf..660e40ae7 100644 --- a/src/modules/m_spanningtree.cpp +++ b/src/modules/m_spanningtree.cpp @@ -1200,7 +1200,7 @@ class TreeSocket : public InspSocket const char* n = ""; if (x & UCMODE_OP) - { + ; { n = "@"; } else if (x & UCMODE_HOP) @@ -3516,11 +3516,7 @@ class ModuleSpanningTree : public Module std::deque<std::string> params; params.clear(); params.push_back(channel->name); - if (*channel->key) - { - // if the channel has a key, force the join by emulating the key. - params.push_back(channel->key); - } + if (channel->GetUserCounter() > 1) { // not the first in the channel |