Change the wording of configure, to indicate that building as ipv6 is no longer an...

[user/henk/code/inspircd.git] / src / cmd_nick.cpp

diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 3cfebea2b6a7d0c4af044b00f9d8b18f5eb2db24..0bba6af0d2a32533aff15694b5932292bf7fef16 100644 (file)
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -50,10 +50,10 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(user,parameters[0]));
                if (MOD_RESULT)
                        return CMD_FAILURE;
-               user->InvalidateCache();
                if (user->registered == REG_ALL)
                        user->WriteCommon("NICK %s",parameters[0]);
                strlcpy(user->nick, parameters[0], NICKMAX - 1);
+               user->InvalidateCache();
                FOREACH_MOD(I_OnUserPostNick,OnUserPostNick(user,oldnick));
                return CMD_SUCCESS;
        }
@@ -75,7 +75,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                        }
                        else
                        {
-                               user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+                               user->WriteServ("433 %s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]);
                                return CMD_FAILURE;
                        }
                }
@@ -96,7 +96,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
                }
 
                user->WriteCommon("NICK %s",parameters[0]);
-               
+
        }
 
        strlcpy(oldnick, user->nick, NICKMAX - 1);