From 49f1b9bc4947791c24a508ecdda91ca20947a0f7 Mon Sep 17 00:00:00 2001
From: adam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Thu, 16 Jul 2009 09:12:23 +0000
Subject: [PATCH] Fixed core clients to rejoin their assigned channels if
 killed

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2382 5417fbe8-f217-4b02-8779-1006273d7864
---
 src/messages.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/messages.c b/src/messages.c
index d77b62809..0c2f816f6 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -44,15 +44,14 @@ int m_kill(const char *nick, const char *msg)
 	BotInfo *bi;
 
 	/* Recover if someone kills us. */
-	/* use nickIsServices() to reduce the number of lines of code  - TSL */
-	if (nickIsServices(nick, 0)) {
-		introduce_user(nick);
-	} else if (s_BotServ && (bi = findbot(nick))) {
+	if (s_BotServ && (bi = findbot(nick)))
+	{
 		introduce_user(nick);
 		bi->RejoinAll();
-	} else {
-		do_kill(nick, msg);
 	}
+	else
+		do_kill(nick, msg);
+
 	return MOD_CONT;
 }