summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoradam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-07-16 09:12:23 +0000
committeradam- <adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-07-16 09:12:23 +0000
commit49f1b9bc4947791c24a508ecdda91ca20947a0f7 (patch)
tree02fd02dea316364be58db1beaaf8cdba476109e1 /src
parent81d05eb8a7afdd02c31dd209c855583a99b70175 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/messages.c11
1 files 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;
}