mod-python: generalised the setting of the PYTHONPATH environment variable

[irc/evilnet/x3.git] / src / shun.c

diff --git a/src/shun.c b/src/shun.c
index cdc30c6b0b244a594705d078adcc11f67fba55b9..15c2b9c83ca42b5dd542aa33709bbb1a9c30de10 100644 (file)
--- a/src/shun.c
+++ b/src/shun.c
@@ -3,9 +3,9 @@
  *
  * This file is part of x3.
  *
- * srvx is free software; you can redistribute it and/or modify
+ * x3 is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -122,12 +122,6 @@ shun_remove(const char *target, int announce)
             timeq_add(new_first->expires, shun_expire, 0);
         }
     }
-#ifdef WITH_PROTOCOL_BAHAMUT
-    /* Bahamut is sort of lame: It permanently remembers any AKILLs
-     * with durations longer than a day, and will never auto-expire
-     * them.  So when the time comes, we'd better remind it.  */
-    announce = 1;
-#endif
     if (announce)
         irc_unshun(target);
     return res;