Remove useless vector copy

[user/henk/code/inspircd.git] / src / xline.cpp

diff --git a/src/xline.cpp b/src/xline.cpp
index 4bd3e51b587f85822410e645edc10f6aa9771446..0424e7a09ff7482f73c2b2ab0a8f3fe8cb25a5c9 100644 (file)
--- a/src/xline.cpp
+++ b/src/xline.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -174,7 +174,11 @@ bool XLineManager::AddLine(XLine* line, User* user)
        ContainerIter x = lookup_lines.find(line->type);
        if (x != lookup_lines.end())
        {
-               return false;
+               LookupIter i = x->second.find(line->Displayable());
+               if (i != x->second.end())
+               {
+                       return false;
+               }
        }
 
        /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/
@@ -338,6 +342,10 @@ void XLineManager::ApplyLines()
        {
                User* u = (User*)(*u2);
 
+               // Don't ban people who are exempt.
+               if (u->exempt)
+                       continue;
+
                for (std::vector<XLine *>::iterator i = pending_lines.begin(); i != pending_lines.end(); i++)
                {
                        XLine *x = *i;