diff options
| -rw-r--r-- | src/botserv.c | 7 | ||||
| -rw-r--r-- | version.log | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/botserv.c b/src/botserv.c index 47da60ca0..365c78dde 100644 --- a/src/botserv.c +++ b/src/botserv.c @@ -134,6 +134,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) int16 cstatus = 0; char *cmd; UserData *ud; + int was_action = 0; if (!u || !buf || !ci) { return; @@ -148,8 +149,10 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) * at the end, because one character just doesn't matter, * but the ACTION may create strange behaviours with the * caps or badwords kickers */ - if (!strnicmp(buf, "\1ACTION ", 8)) + if (!strnicmp(buf, "\1ACTION ", 8)) { buf += 8; + was_action = 1; + } /* Now we can make kicker stuff. We try to order the checks * from the fastest one to the slowest one, since there's @@ -410,7 +413,7 @@ void botchanmsgs(User * u, ChannelInfo * ci, char *buf) /* Fantaisist commands */ - if (buf && (ci->botflags & BS_FANTASY) && *buf == *BSFantasyCharacter) { + if (buf && (ci->botflags & BS_FANTASY) && *buf == *BSFantasyCharacter && !was_action) { cmd = strtok(buf, " "); if (cmd && (cmd[0] == *BSFantasyCharacter)) { diff --git a/version.log b/version.log index 0ef27c6f5..383dc8a27 100644 --- a/version.log +++ b/version.log @@ -9,10 +9,11 @@ VERSION_MAJOR="1" VERSION_MINOR="8" VERSION_PATCH="0" VERSION_EXTRA="-svn" -VERSION_BUILD="2199" +VERSION_BUILD="2218" # $Log$ # Changes since 1.8.0 Release +#Revision 2218 - Backport of bugfix for bug #1073 from SVN r2217, fantasy commands in CTCP ACTIONS will now be ignored instead of processed. #Revision 2199 - Correct backport of bug #1064, patch from DukePyrolator, there is no nc on the User struct in 1.8.x, use nickTrack instead, oops. #Revision 2196 - Backport of bugfix for bug #1044 from SVN r2195, CS SET MLOCK no longer requires a parameter, and leaving out the parameter renders the mlock to +r as it should be. #Revision 2193 - Backport of bugfix for bug #1065 from SVN r2192, original patch from DukePyrolator, force a user off a nick when it is suspended. |