Revert m_xline_db Get the xlines from the core, don't maintain a seperate list (reverse-merged from commit 183b182b3d6c0c32f4d10e131a55adbf54b8be01)

1 files changed, 16 insertions, 12 deletions

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 1918f3fc5..683c14afa 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -25,6 +25,7 @@
 
 class ModuleXLineDB : public Module
 {
+	std::vector<XLine *> xlines;
 	bool reading_db;			// If this is true, addlines are as a result of db reading, so don't bother flushing the db to disk.
 						// DO REMEMBER TO SET IT, otherwise it's annoying :P
  public:
@@ -49,6 +50,7 @@ class ModuleXLineDB : public Module
 	void OnAddLine(User* source, XLine* line)
 	{
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Adding a line");
+		xlines.push_back(line);
 
 		if (!reading_db)
 		{
@@ -74,6 +76,15 @@ class ModuleXLineDB : public Module
 	void RemoveLine(XLine *line)
 	{
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Removing a line");
+		for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
+		{
+			if ((*i) == line)
+			{
+				xlines.erase(i);
+				break;
+			}
+		}
+
 		WriteDatabase();
 	}
 
@@ -108,19 +119,12 @@ class ModuleXLineDB : public Module
 		fprintf(f, "VERSION 1\n");
 
 		// Now, let's write.
-		std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
-		for (std::vector<std::string>::const_iterator it = types.begin(); it != types.end(); ++it)
+		XLine *line;
+		for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
 		{
-			XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
-			if (!lookup)
-				continue;
-
-			for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
-			{
-				XLine *line = i->second;
-				fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
-					ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
-			}
+			line = (*i);
+			fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
+				ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
 		}
 
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");