5 files changed, 18 insertions, 20 deletions

diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp
index a2d26739d..5df23e721 100644
--- a/modules/commands/hs_del.cpp
+++ b/modules/commands/hs_del.cpp
@@ -64,9 +64,9 @@ class CommandHSDelAll : public Command
 		{
 			FOREACH_MOD(I_OnDeleteVhost, OnDeleteVhost(na));
 			const NickCore *nc = na->nc;
-			for (std::list<Serialize::Reference<NickAlias> >::const_iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end; ++it)
+			for (unsigned i = 0; i < nc->aliases->size(); ++i)
 			{
-				na = *it;
+				na = nc->aliases->at(i);
 				na->RemoveVhost();
 			}
 			Log(LOG_ADMIN, source, this) << "for all nicks in group " << nc->display;
diff --git a/modules/commands/hs_group.cpp b/modules/commands/hs_group.cpp
index 9027fddac..ee997f704 100644
--- a/modules/commands/hs_group.cpp
+++ b/modules/commands/hs_group.cpp
@@ -20,9 +20,9 @@ class CommandHSGroup : public Command
 		if (!na || !na->HasVhost())
 			return;
 	
-		for (std::list<Serialize::Reference<NickAlias> >::const_iterator it = na->nc->aliases.begin(), it_end = na->nc->aliases.end(); it != it_end;)
+		for (unsigned i = 0; i < na->nc->aliases->size(); ++i)
 		{
-			NickAlias *nick = *it++;
+			NickAlias *nick = na->nc->aliases->at(i);
 			if (nick)
 				nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
 		}
diff --git a/modules/commands/hs_set.cpp b/modules/commands/hs_set.cpp
index cfad860a3..11ecbca5a 100644
--- a/modules/commands/hs_set.cpp
+++ b/modules/commands/hs_set.cpp
@@ -108,9 +108,9 @@ class CommandHSSetAll : public Command
 		if (!na || !na->HasVhost())
 			return;
 	
-		for (std::list<Serialize::Reference<NickAlias> >::const_iterator it = na->nc->aliases.begin(), it_end = na->nc->aliases.end(); it != it_end;)
+		for (unsigned i = 0; i < na->nc->aliases->size(); ++i)
 		{
-			NickAlias *nick = *it++;
+			NickAlias *nick = na->nc->aliases->at(i);
 			if (nick)
 				nick->SetVhost(na->GetVhostIdent(), na->GetVhostHost(), na->GetVhostCreator());
 		}
diff --git a/modules/commands/ns_group.cpp b/modules/commands/ns_group.cpp
index f94fe2d86..1b21887a6 100644
--- a/modules/commands/ns_group.cpp
+++ b/modules/commands/ns_group.cpp
@@ -130,7 +130,7 @@ class CommandNSGroup : public Command
 			source.Reply(NICK_IDENTIFY_REQUIRED, Config->UseStrictPrivMsgString.c_str(), Config->NickServ.c_str());
 		else if (na && Config->NSNoGroupChange)
 			source.Reply(_("Your nick is already registered."));
-		else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
+		else if (Config->NSMaxAliases && (target->nc->aliases->size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper())
 			source.Reply(_("There are too many nicks in %s's group."));
 		else if (u->nick.length() <= Config->NSGuestNickPrefix.length() + 7 &&
 			u->nick.length() >= Config->NSGuestNickPrefix.length() + 1 &&
@@ -214,7 +214,7 @@ class CommandNSUngroup : public Command
 		Anope::string nick = !params.empty() ? params[0] : "";
 		NickAlias *na = NickAlias::Find(!nick.empty() ? nick : u->nick);
 
-		if (u->Account()->aliases.size() == 1)
+		if (u->Account()->aliases->size() == 1)
 			source.Reply(_("Your nick is not grouped to anything, you can't ungroup it."));
 		else if (!na)
 			source.Reply(NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str());
@@ -224,16 +224,16 @@ class CommandNSUngroup : public Command
 		{
 			NickCore *oldcore = na->nc;
 
-			std::list<Serialize::Reference<NickAlias> >::iterator it = std::find(oldcore->aliases.begin(), oldcore->aliases.end(), na);
-			if (it != oldcore->aliases.end())
-				oldcore->aliases.erase(it);
+			std::vector<NickAlias *>::iterator it = std::find(oldcore->aliases->begin(), oldcore->aliases->end(), na);
+			if (it != oldcore->aliases->end())
+				oldcore->aliases->erase(it);
 
 			if (na->nick.equals_ci(oldcore->display))
-				oldcore->SetDisplay(oldcore->aliases.front());
+				oldcore->SetDisplay(oldcore->aliases->front());
 
 			NickCore *nc = new NickCore(na->nick);
 			na->nc = nc;
-			nc->aliases.push_back(na);
+			nc->aliases->push_back(na);
 
 			nc->pass = oldcore->pass;
 			if (!oldcore->email.empty())
@@ -300,11 +300,9 @@ class CommandNSGList : public Command
 
 		ListFormatter list;
 		list.AddColumn("Nick").AddColumn("Expires");
-		for (std::list<Serialize::Reference<NickAlias> >::const_iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end;)
+		for (unsigned i = 0; i < nc->aliases->size(); ++i)
 		{
-			const NickAlias *na2 = *it++;
-			if (!na2)
-				continue;
+			const NickAlias *na2 = nc->aliases->at(i);
 
 			ListFormatter::ListEntry entry;
 			entry["Nick"] = na2->nick;
@@ -319,7 +317,7 @@ class CommandNSGList : public Command
 		for (unsigned i = 0; i < replies.size(); ++i)
 			source.Reply(replies[i]);
 
-		source.Reply(_("%d nicknames in the group."), nc->aliases.size());
+		source.Reply(_("%d nicknames in the group."), nc->aliases->size());
 	}
 
 	bool OnHelp(CommandSource &source, const Anope::string &subcommand) anope_override
diff --git a/modules/commands/ns_suspend.cpp b/modules/commands/ns_suspend.cpp
index 675db1330..a4cc7f355 100644
--- a/modules/commands/ns_suspend.cpp
+++ b/modules/commands/ns_suspend.cpp
@@ -73,9 +73,9 @@ class CommandNSSuspend : public Command
 			nc->ExtendMetadata("suspend:expire", stringify(Anope::CurTime + expiry_secs));
 
 
-		for (std::list<Serialize::Reference<NickAlias> >::iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end;)
+		for (unsigned i = 0; i < nc->aliases->size(); ++i)
 		{
-			NickAlias *na2 = *it++;
+			NickAlias *na2 = nc->aliases->at(i);
 
 			if (na2 && *na2->nc == *na->nc)
 			{