BUILD : 1.7.5 (325) BUGS : 128 139 146 147 148 NOTES : Applied patch supplied by Trystan to fix bugs listed above.

git-svn-id: svn://svn.anope.org/anope/trunk@325 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@202 5417fbe8-f217-4b02-8779-1006273d7864

3 files changed, 12 insertions, 2 deletions

diff --git a/src/channels.c b/src/channels.c
index 0c2a97328..f099eda32 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1120,6 +1120,9 @@ void do_cmode(const char *source, int ac, char **av)
     Channel *chan;
     ChannelInfo *ci = NULL;
 #ifdef IRC_BAHAMUT
+
+/* Ultimate3 doesn't send TS on Mode - TSL */
+#if !defined(IRC_ULTIMATE3)
     int i;
     char *t;
 
@@ -1143,6 +1146,8 @@ void do_cmode(const char *source, int ac, char **av)
     }
 #endif
 
+#endif
+
     chan = findchan(av[0]);
     if (!chan) {
         ci = cs_findchan(av[0]);
diff --git a/src/messages.c b/src/messages.c
index eb83909b2..887a9986f 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -409,8 +409,8 @@ static int m_client(char *source, int ac, char **av)
 static int m_snick(char *source, int ac, char **av)
 {
     if (ac != 2) {
-        User *user = do_nick(source, av[0], av[3], av[4], av[8], av[10],
-                             strtoul(av[1], NULL, 10), strtoul(av[7], NULL,
+        User *user = do_nick(source, av[0], av[3], av[4], av[7], av[10],
+                             strtoul(av[1], NULL, 10), strtoul(av[8], NULL,
                                                                0),
                              strtoul(av[5], NULL, 0), av[6]);
         if (user) {
diff --git a/src/send.c b/src/send.c
index 0c21b65d3..a0284323a 100644
--- a/src/send.c
+++ b/src/send.c
@@ -230,10 +230,15 @@ void send_mode(const char *source, const char *on, const char *fmt, ...)
 
     vsnprintf(buf, sizeof(buf), fmt, args);
 #ifdef IRC_BAHAMUT
+
+/* Ultimate3 doesn't send TS Mode - doing so will cause modes not to send */
+/* btw - this is used by channel setting was well - TSL 		*/
+#if !defined(IRC_ULTIMATE3)
     if (uplink_capab & CAPAB_TSMODE)
         send_cmd(source, "MODE %s 0 %s", on, buf);
     else
 #endif
+#endif
         send_cmd(source, "MODE %s %s", on, buf);
 }