[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Mon Jan 22 22:35:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-01-23 04:34:06 UTC

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

Log message:

applied revengebot.patch (slightly modified by myself) -- please test as I dont use revengebot ever

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.51 eggdrop1.6/doc/UPDATES1.6:1.52
--- eggdrop1.6/doc/UPDATES1.6:1.51	Mon Jan 22 17:47:32 2001
+++ eggdrop1.6/doc/UPDATES1.6	Mon Jan 22 22:33:55 2001
@@ -4,9 +4,11 @@
 
 1.6.3
 Found by  Fixed by  What...
+PPSlim    PPSlim/   +revengebot no longer requires that the bot has a 
+          guppy     user-record for itself.
 project10 guppy     made the reserved-port setting into reserved-portrange
 various   Tothwolf  added i18n support to fix our problems with tcl
-          ppslim    some minor doc fixes
+          PPSlim    some minor doc fixes
 GregMo    Sup       `.note' wasn't correctly requiring a message parameter.
           Jason     fixed it so that +d or +k users cannot remove hosts and
                     thus circumvent auto-kick or deop
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.47 eggdrop1.6/src/mod/irc.mod/irc.c:1.48
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.47	Tue Jan 16 11:13:22 2001
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Mon Jan 22 22:33:56 2001
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot 
  * 
- * $Id: irc.c,v 1.47 2001/01/16 17:13:22 guppy Exp $
+ * $Id: irc.c,v 1.48 2001/01/23 04:33:56 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -88,28 +88,27 @@
   struct flag_record fr = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
   struct flag_record fr2 = { FR_GLOBAL | FR_CHAN, 0, 0, 0, 0, 0 };
 
-  get_user_flagrec(u, &fr, chan->dname);
+  /* Do not take revenge upon ourselves */
+  if (match_my_nick(badnick))
+    return 0;
+
   get_user_flagrec(u2, &fr2, chan->dname);
 
-  /* If we don't even know the user we'll probably not want to protect
-   * it.
-   */
+  /* Why protect people we do not even know? */
   if (!u2)
     return 0;
 
+  get_user_flagrec(u, &fr, chan->dname);
+ 
   /* Kickee is not a friend? */
   if (!chan_friend(fr) && !glob_friend(fr) &&
-      /* ... and I didn't kick them? */
-      !match_my_nick(badnick) &&
       /* ... and they didn't kick themself? */
       rfc_casecmp(badnick, victim)) {
     /* They kicked ME? and I'm revenging?... muahaHAHAHA! */
     if (mevictim) {
       if (channel_revengebot(chan))
         return 1;
-    }
-    /* Revenge for others? */
-    else if (channel_revenge(chan) &&
+    } else if (channel_revenge(chan) &&
               /* ... and protecting friends, and kicked is a valid friend? */
              ((channel_protectfriends(chan) &&
                (chan_friend(fr2) || (glob_friend(fr2) && !chan_deop(fr2)))) ||
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.418 eggdrop1.6/src/patch.h:1.419
--- eggdrop1.6/src/patch.h:1.418	Mon Jan 22 17:47:33 2001
+++ eggdrop1.6/src/patch.h	Mon Jan 22 22:33:56 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.418 2001/01/22 23:47:33 guppy Exp $
+ * $Id: patch.h,v 1.419 2001/01/23 04:33:56 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("980207019");		/* current unixtime */
+patch("980223268");		/* current unixtime */
 /*
  *
  *
  */
-patch("reserved-portrange");
+patch("revengebot");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list