diff options
| author |  Sadie Powell | 2021-05-11 03:53:43 +0100 |
|---|---|---|
| committer | Sadie Powell | 2021-05-11 04:07:45 +0100 |
| commit | 3ca912ad71cdc4004401e0977be73c674bb91fbc (patch) | |
| tree | cf57b43229becfc3d9c8532a2d4f18f095f024ec /src/modules/m_spanningtree/nickcollide.cpp | |
| parent | Optimise building the link data string. (diff) | |
| parent | Send ERR_BADCHANMASK when trying to OJOIN/SAJOIN an invalid channel. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_spanningtree/nickcollide.cpp')
| -rw-r--r-- | src/modules/m_spanningtree/nickcollide.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp index f00ea2b70..0447d9548 100644 --- a/src/modules/m_spanningtree/nickcollide.cpp +++ b/src/modules/m_spanningtree/nickcollide.cpp @@ -78,8 +78,7 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo * if ident@ip is equal, and theirs is newer, or * ident@ip differ, and ours is newer */ - if((SamePerson && remotets < localts) || - (!SamePerson && remotets > localts)) + if ((SamePerson && remotets < localts) || (!SamePerson && remotets > localts)) { // Only remote needs to change bChangeLocal = false; |