diff -r d0f758d0ff91 -r 9541b2a76067 gameServer/HWProtoNEState.hs
--- a/gameServer/HWProtoNEState.hs	Fri Jan 28 22:34:07 2011 +0300
+++ b/gameServer/HWProtoNEState.hs	Sat Jan 29 13:43:07 2011 +0300
@@ -20,7 +20,7 @@
     let cl = irnc `client` ci
     if not . B.null $ nick cl then return [ProtocolError "Nickname already chosen"]
         else
-        if haveSameNick irnc then return [{-AnswerClients [sendChan cl] ["WARNING", "Nickname already in use"], -}ByeClient "Nickname already in use"]
+        if haveSameNick irnc then return [NoticeMessage NickAlreadyInUse]
             else
             if illegalName newNick then return [ByeClient "Illegal nickname"]
                 else
@@ -57,10 +57,5 @@
         else
         return [ByeClient "Authentication failed"]
 
-{-
-
-handleCmd_NotEntered clID clients _ ["DUMP"] =
-    if isAdministrator (clients IntMap.! clID) then [Dump] else []
--}
 
 handleCmd_NotEntered _ = return [ProtocolError "Incorrect command (state: not entered)"]