Just to mess with om's head, remove helperfuncs.h from everywhere

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

diff --git a/src/cmd_part.cpp b/src/cmd_part.cpp
index 39a9621404e867b6ff915e024b8498fd6f3e2ca2..afa59580c1eda2b10efc2dbf5396ba3628fa140d 100644 (file)
--- a/src/cmd_part.cpp
+++ b/src/cmd_part.cpp
@@ -17,22 +17,26 @@
 #include "inspircd.h"
 #include "users.h"
 #include "commands.h"
-#include "helperfuncs.h"
+
 #include "commands/cmd_part.h"
 
-extern InspIRCd* ServerInstance;
+
 
 void cmd_part::Handle (const char** parameters, int pcnt, userrec *user)
 {
        if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
                return;
+
+       chanrec* c = ServerInstance->FindChan(parameters[0]);
        
-       if (pcnt > 1)
+       if (c)
        {
-               del_channel(user,parameters[0],parameters[1],false);
+               if (!c->PartUser(user, pcnt > 1 ? parameters[0] : NULL))
+                       /* Arse, who stole our channel! :/ */
+                       delete c;
        }
        else
        {
-               del_channel(user,parameters[0],NULL,false);
+               user->WriteServ( "401 %s %s :No such channel", user->nick, parameters[0]);
        }
 }