Resync fix

diff --git a/ChangeLog.X3 b/ChangeLog.X3
index dc2c7bafcad25ca186c6a8f5f704cc2f870a29a4..a5f4e7c93141e28ecdef7eaf9151f945325a6759 100644 (file)
--- a/ChangeLog.X3
+++ b/ChangeLog.X3
@@ -1,6 +1,10 @@
 /***********************************************************************
  X3 ChangeLog
 
+2005-05-27  Alex Schumann  <rubin@afternet.org>
+
+       * src/chanserv.c: Resync working now
+
 2005-05-27  Reed Loden  <reed@reedloden.com>
 
        * src/chanserv.c: Fixed an incorrectly named message. Fixed some

diff --git a/src/chanserv.c b/src/chanserv.c
index daf8687bf2cfdc2a930ce151454cde57f26c5d67..566b09758eff81b3ea62ee1fdb3b8483ee70545f 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -4478,7 +4478,7 @@ static CHANSERV_FUNC(cmd_resync)
         {
             if(mn->modes & MODE_CHANOP)
             {
-                changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP);
+                changes->args[used].mode = MODE_REMOVE |  MODE_CHANOP;
                 changes->args[used++].u.member = mn;
             }
             if(!(mn->modes & MODE_HALFOP))
@@ -4486,22 +4486,24 @@ static CHANSERV_FUNC(cmd_resync)
                 changes->args[used].mode = MODE_HALFOP;
                 changes->args[used++].u.member = mn;
             }
+            /* why cant halfops keep voice
             if(mn->modes & MODE_VOICE)
             {
                 changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_VOICE);
                 changes->args[used++].u.member = mn;
             }
+            */
         }
         else if(uData && uData->access >= UL_PEON /* cData->lvlOpts[lvlGiveVoice]*/)
         {
             if(mn->modes & MODE_CHANOP)
             {
-                changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_CHANOP);
+                changes->args[used].mode = MODE_REMOVE | MODE_CHANOP;
                 changes->args[used++].u.member = mn;
             }
             if(mn->modes & MODE_HALFOP)
             {
-                changes->args[used].mode = MODE_REMOVE | (mn->modes & ~MODE_HALFOP);
+                changes->args[used].mode = MODE_REMOVE | MODE_HALFOP;
                 changes->args[used++].u.member = mn;
             }
             if(!(mn->modes & MODE_VOICE))