Index: src/modules/m_svsnick.c
===================================================================
RCS file: /home/cmunk/ircsystems/cvsroot/unreal/src/modules/Attic/m_svsnick.c,v
retrieving revision 1.1.2.13.2.2
diff -u -r1.1.2.13.2.2 m_svsnick.c
--- src/modules/m_svsnick.c     25 Feb 2005 18:14:35 -0000      1.1.2.13.2.2
+++ src/modules/m_svsnick.c     4 Nov 2005 10:21:03 -0000
@@ -109,28 +109,19 @@
                         acptr->lastnick = TS2ts(parv[3]);
                         sendto_common_channels(acptr, ":%s NICK :%s", parv[1],
                             parv[2]);
-                        if (IsPerson(acptr))
-                                add_history(acptr, 1);
+                        add_history(acptr, 1);
                         sendto_serv_butone_token(NULL, parv[1], MSG_NICK,
                             TOK_NICK, "%s :%ld", parv[2], TS2ts(parv[3]));
-                        if (acptr->name[0])
-                        {
-                               (void)del_from_client_hash_table(acptr->name, acptr);
-                                if (IsPerson(acptr))
-                                        hash_check_watch(acptr, RPL_LOGOFF);
-                        }
-                        if (MyClient(acptr))
-                        {
-                               sendto_snomask(SNO_NICKCHANGE, "*** Notice -- %s (%s@%s) has changed his/her nickname to %s",
-                                       acptr->name, acptr->user->username, acptr->user->realhost, parv[2]);
-
-                                RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, acptr, parv[2]);
-                        }
+
+                       (void)del_from_client_hash_table(acptr->name, acptr);
+                        hash_check_watch(acptr, RPL_LOGOFF);
+
+                       sendto_snomask(SNO_NICKCHANGE, "*** Notice -- %s (%s@%s) has been forced to change his/her nickname to %s",
+                               acptr->name, acptr->user->username, acptr->user->realhost, parv[2]);
+                        RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, acptr, parv[2]);
                         (void)strlcpy(acptr->name, parv[2], sizeof acptr->name);
                         (void)add_to_client_hash_table(parv[2], acptr);
-                        if (IsPerson(acptr))
-                                hash_check_watch(acptr, RPL_LOGON);
-
+                        hash_check_watch(acptr, RPL_LOGON);
                 }
         }
         return 0;