From 6f1b8f50dd8a9f73c9e02e64253e7e45642a88d0 Mon Sep 17 00:00:00 2001 From: brain Date: Tue, 8 Aug 2006 12:52:24 +0000 Subject: Change to chanrec::PartUser. As with KickUser and ServerKickUser, returns the number of users left, if it returns 0, delete the chanrec git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4786 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/modules/m_remove.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/modules/m_remove.cpp') diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index ab0f2dbaa..bab5ea11b 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -181,10 +181,12 @@ class RemoveBase /* Build up the part reason string. */ reason << "Removed by " << user->nick << reasonparam; - - Srv->PartUserFromChannel(target, channel->name, reason.str()); + WriteChannelWithServ(Srv->GetServerName().c_str(), channel, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick); WriteServ(target->fd, "NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str()); + + if (!channel->PartUser(target, reason.str().c_str())) + delete channel; } else { -- cgit v1.2.3