Merge tag 'v2.0.25' into master.

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

diff --git a/src/modules/m_spanningtree/save.cpp b/src/modules/m_spanningtree/save.cpp
index 8f0eced7333af7fb2495c4a4f670bf913354ebf6..7131b49feeb295592cfaf7fd7e77dd325dae973c 100644 (file)
--- a/src/modules/m_spanningtree/save.cpp
+++ b/src/modules/m_spanningtree/save.cpp
@@ -28,20 +28,14 @@
  */
 CmdResult CommandSave::Handle(User* user, std::vector<std::string>& params)
 {
-       User* u = ServerInstance->FindNick(params[0]);
-       if ((!u) || (IS_SERVER(u)))
+       User* u = ServerInstance->FindUUID(params[0]);
+       if (!u)
                return CMD_FAILURE;
 
        time_t ts = atol(params[1].c_str());
 
        if (u->age == ts)
-       {
-               if (!u->ForceNickChange(u->uuid))
-               {
-                       ServerInstance->Users->QuitUser(u, "Nickname collision");
-               }
-       }
+               u->ChangeNick(u->uuid, SavedTimestamp);
 
        return CMD_SUCCESS;
 }
-