1 diff -ur eggdrop1.6.13.long/src/botcmd.c eggdrop1.6.13.long.new/src/botcmd.c
2 --- eggdrop1.6.13.long/src/botcmd.c Sat Nov 23 01:45:24 2002
3 +++ eggdrop1.6.13.long.new/src/botcmd.c Mon Dec 23 20:52:31 2002
6 putlog(LOG_CMDS, "*", "#%s# unlink %s (%s)", rfrom, undes, par[0] ? par :
8 - i = botunlink(-3, undes, par[0] ? par : NULL);
9 + i = botunlink(-3, undes, par[0] ? par : NULL, rfrom);
11 p = strchr(from, '@');
13 diff -ur eggdrop1.6.13.long/src/botnet.c eggdrop1.6.13.long.new/src/botnet.c
14 --- eggdrop1.6.13.long/src/botnet.c Thu Aug 8 16:49:32 2002
15 +++ eggdrop1.6.13.long.new/src/botnet.c Mon Dec 23 21:01:08 2002
18 /* Break link with a tandembot
20 -int botunlink(int idx, char *nick, char *reason)
21 +int botunlink(int idx, char *nick, char *reason, char *from)
26 bots = bots_in_subtree(bot);
27 users = users_in_subtree(bot);
28 if (reason && reason[0]) {
29 - simple_sprintf(s, "%s %s (%s) (lost %d bot%s and %d user%s)",
30 - BOT_UNLINKEDFROM, dcc[i].nick, reason, bots,
31 + simple_sprintf(s, "%s %s (%s (%s)) (lost %d bot%s and %d user%s)",
32 + BOT_UNLINKEDFROM, dcc[i].nick, reason, from, bots,
33 (bots != 1) ? "s" : "", users, (users != 1) ?
35 dprintf(i, "bye %s\n", reason);
37 - simple_sprintf(s, "%s %s (lost %d bot%s and %d user%s)",
38 - BOT_UNLINKEDFROM, dcc[i].nick, bots, (bots != 1) ?
39 - "s" : "", users, (users != 1) ? "s" : "");
40 + simple_sprintf(s, "%s %s (%s) (lost %d bot%s and %d user%s)",
41 + BOT_UNLINKEDFROM, dcc[i].nick, from, bots,
42 + (bots != 1) ? "s" : "", users,
43 + (users != 1) ? "s" : "");
44 dprintf(i, "bye No reason\n");
46 chatout("*** %s\n", s);
47 diff -ur eggdrop1.6.13.long/src/cmds.c eggdrop1.6.13.long.new/src/cmds.c
48 --- eggdrop1.6.13.long/src/cmds.c Tue Sep 10 22:14:44 2002
49 +++ eggdrop1.6.13.long.new/src/cmds.c Mon Dec 23 20:53:44 2002
50 @@ -1163,14 +1163,14 @@
54 - botunlink(idx, bot, par);
55 + botunlink(idx, bot, par, dcc[idx].nick);
58 /* If we're directly connected to that bot, just do it
59 * (is nike gunna sue?)
61 if (!egg_strcasecmp(dcc[i].nick, bot))
62 - botunlink(idx, bot, par);
63 + botunlink(idx, bot, par, dcc[i].nick);
67 diff -ur eggdrop1.6.13.long/src/patch.h eggdrop1.6.13.long.new/src/patch.h
68 --- eggdrop1.6.13.long/src/patch.h Sat Nov 23 01:47:08 2002
69 +++ eggdrop1.6.13.long.new/src/patch.h Mon Dec 23 21:07:04 2002
74 -/* PATCH GOES HERE */
79 diff -ur eggdrop1.6.13.long/src/proto.h eggdrop1.6.13.long.new/src/proto.h
80 --- eggdrop1.6.13.long/src/proto.h Tue Jan 1 22:46:36 2002
81 +++ eggdrop1.6.13.long.new/src/proto.h Mon Dec 23 20:54:36 2002
84 void tell_bottree(int, int);
85 int botlink(char *, int, char *);
86 -int botunlink(int, char *, char *);
87 +int botunlink(int, char *, char *, char *);
89 void addbot(char *, char *, char *, char, int);
90 void updatebot(int, char *, char, int);
91 diff -ur eggdrop1.6.13.long/src/tcldcc.c eggdrop1.6.13.long.new/src/tcldcc.c
92 --- eggdrop1.6.13.long/src/tcldcc.c Thu Nov 21 18:53:08 2002
93 +++ eggdrop1.6.13.long.new/src/tcldcc.c Mon Dec 23 21:02:26 2002
97 if (!egg_strcasecmp(bot, dcc[i].nick))
98 - x = botunlink(-2, bot, argv[2]);
99 + x = botunlink(-2, bot, argv[2], botnetnick);
101 botnet_send_unlink(i, botnetnick, lastbot(bot), bot, argv[2]);