From 590dd9292f0d3cdd95c3ba1786ad8ff9487bb400 Mon Sep 17 00:00:00 2001 From: w00t Date: Sun, 22 Feb 2009 10:54:09 +0000 Subject: Don't remove an expired xline on add, simply drop duplicates (1.1 behaviour). This can lead to bouncing between servers. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11140 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/xline.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/xline.cpp') diff --git a/src/xline.cpp b/src/xline.cpp index 307ffc21c..4bd3e51b5 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -170,18 +170,11 @@ bool XLineManager::AddLine(XLine* line, User* user) if (line->duration && ServerInstance->Time() > line->expiry) return false; // Don't apply expired XLines. - /* If the line exists, check if its an expired line */ + /* Don't apply duplicate xlines */ ContainerIter x = lookup_lines.find(line->type); if (x != lookup_lines.end()) { - LookupIter i = x->second.find(line->Displayable()); - if (i != x->second.end()) - { - if (i->second->duration && ServerInstance->Time() > i->second->expiry) - ExpireLine(x, i); - else - return false; - } + return false; } /*ELine* item = new ELine(ServerInstance, ServerInstance->Time(), duration, source, reason, ih.first.c_str(), ih.second.c_str());*/ -- cgit v1.2.3