[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Tue Dec 5 20:33:00 CST 2000


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2000-12-06 02:32:28 UTC

Modified files:
     doc/UPDATES1.6 src/chan.h src/patch.h src/mod/irc.mod/chan.c
     src/mod/irc.mod/irc.c

Log message:

guppy: Eule's efnetcycle patch

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.28 eggdrop1.6/doc/UPDATES1.6:1.29
--- eggdrop1.6/doc/UPDATES1.6:1.28	Tue Nov 28 21:10:24 2000
+++ eggdrop1.6/doc/UPDATES1.6	Tue Dec  5 20:32:17 2000
@@ -4,6 +4,8 @@
 
 1.6.2
 Found by  Fixed by  What...
+          Eule      hopefully fixed the cycle-flood problem on some efnet
+                    servers
           Eule      autovoice now uses autoop delay also
           Tothwolf  cleaned up some language entries
           Sup       default-port was set in the wrong location. 
Index: eggdrop1.6/src/chan.h
diff -u eggdrop1.6/src/chan.h:1.19 eggdrop1.6/src/chan.h:1.20
--- eggdrop1.6/src/chan.h:1.19	Mon Nov 20 23:18:04 2000
+++ eggdrop1.6/src/chan.h	Tue Dec  5 20:32:17 2000
@@ -3,7 +3,7 @@
  *   stuff common to chan.c and mode.c
  *   users.h needs to be loaded too
  * 
- * $Id: chan.h,v 1.19 2000/11/21 05:18:04 guppy Exp $
+ * $Id: chan.h,v 1.20 2000/12/06 02:32:17 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -210,7 +210,9 @@
 #define CHAN_STATIC         0x8000000	/* channels that are NOT dynamic      */
 #define CHAN_ASKEDBANS      0x10000000
 #define CHAN_ASKEDMODES     0x20000000  /* find out key-info on IRCu          */
-#define CHAN_JUPED          0x40000000  /* Is channel juped                     */
+#define CHAN_JUPED          0x40000000  /* Is channel juped                   */
+#define CHAN_STOP_CYCLE     0x80000000  /* Some efnetservers have defined
+    NO_CHANOPS_WHEN_SPLIT              */
 
 #define CHAN_ASKED_EXEMPTS  0x0001
 #define CHAN_ASKED_INVITED  0x0002
@@ -257,6 +259,7 @@
 #define channel_dynamicinvites(chan) (chan->ircnet_status & CHAN_DYNAMICINVITES)
 #define channel_nouserinvites(chan) (chan->ircnet_status & CHAN_NOUSERINVITES)
 #define channel_juped(chan) (chan->status & CHAN_JUPED)
+#define channel_stop_cycle(chan) (chan->status & CHAN_STOP_CYCLE)
 
 struct msgq_head {
   struct msgq *head;
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.60 eggdrop1.6/src/mod/irc.mod/chan.c:1.61
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.60	Tue Nov 28 21:10:24 2000
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Tue Dec  5 20:32:18 2000
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  * 
- * $Id: chan.c,v 1.60 2000/11/29 03:10:24 guppy Exp $
+ * $Id: chan.c,v 1.61 2000/12/06 02:32:18 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -1001,6 +1001,8 @@
   }
   else if (me_op(chan))
     recheck_channel(chan, 1);
+  else if (chan->channel.members == 1)
+    chan->status |= CHAN_STOP_CYCLE;
   /* do not check for i-lines here. */
   return 0;
 }
@@ -1527,6 +1529,7 @@
     putlog(LOG_MISC, "*", "joined %s but didn't want to!", chname);
     dprintf(DP_MODE, "PART %s\n", chname);
   } else if (!channel_pending(chan)) {
+    chan->status &= ~CHAN_STOP_CYCLE;
     strcpy(uhost, from);
     nick = splitnick(&uhost);
     detect_chan_flood(nick, uhost, from, chan, FLOOD_JOIN, NULL);
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.45 eggdrop1.6/src/mod/irc.mod/irc.c:1.46
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.45	Tue Nov 28 21:10:24 2000
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Tue Dec  5 20:32:18 2000
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot 
  * 
- * $Id: irc.c,v 1.45 2000/11/29 03:10:24 guppy Exp $
+ * $Id: irc.c,v 1.46 2000/12/06 02:32:18 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -538,7 +538,7 @@
   for (m = chan->channel.member; m && m->nick[0]; m = m->next)
     if (!chan_issplit(m))
       i++;
-  if (i == 1 && channel_cycle(chan)) {
+  if (i == 1 && channel_cycle(chan) && !channel_stop_cycle(chan)) {
     if (chan->name[0] != '+') {	/* Its pointless to cycle + chans for ops */
       putlog(LOG_MISC, "*", "Trying to cycle %s to regain ops.", chan->dname);
       dprintf(DP_MODE, "PART %s\n", chan->name);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.395 eggdrop1.6/src/patch.h:1.396
--- eggdrop1.6/src/patch.h:1.395	Tue Nov 28 21:10:24 2000
+++ eggdrop1.6/src/patch.h	Tue Dec  5 20:32:17 2000
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.395 2000/11/29 03:10:24 guppy Exp $
+ * $Id: patch.h,v 1.396 2000/12/06 02:32:17 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("975466601");		/* current unixtime */
+patch("976068938");		/* current unixtime */
 /*
  *
  *
  */
-patch("delayvoice");
+patch("efnetcycle");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list