Fix a bunch of weird indentation and spacing issues.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / nickcollide.cpp

diff --git a/src/modules/m_spanningtree/nickcollide.cpp b/src/modules/m_spanningtree/nickcollide.cpp
index 62e200921eb8f92699346b31d4b4f16080d06a76..bef739ed011ee174bad2220a11f39ce19bce6fd5 100644 (file)
--- a/src/modules/m_spanningtree/nickcollide.cpp
+++ b/src/modules/m_spanningtree/nickcollide.cpp
@@ -1,7 +1,12 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2019 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
  *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
@@ -73,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;
@@ -108,8 +112,8 @@ bool SpanningTreeUtilities::DoCollision(User* u, TreeServer* server, time_t remo
                 * this "local" nick is actually behind us, send a SAVE out.
                 */
                CmdBuilder params("SAVE");
-               params.push_back(u->uuid);
-               params.push_back(ConvToStr(u->age));
+               params.push(u->uuid);
+               params.push(ConvToStr(u->age));
                params.Broadcast();
 
                u->ChangeNick(u->uuid, CommandSave::SavedTimestamp);