6 files changed, 8 insertions, 8 deletions
diff --git a/src/commands/cmd_kick.cpp b/src/commands/cmd_kick.cpp
index 10022d105..033a00c41 100644
--- a/src/commands/cmd_kick.cpp
+++ b/src/commands/cmd_kick.cpp
@@ -76,7 +76,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 			return CMD_FAILURE;
 		}
 
-		if (ServerInstance->ULine(u->server))
+		if (u->server->IsULine())
 		{
 			user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You may not kick a u-lined client", c->name.c_str());
 			return CMD_FAILURE;
diff --git a/src/commands/cmd_privmsg.cpp b/src/commands/cmd_privmsg.cpp
index 79437432f..07d4a9cf7 100644
--- a/src/commands/cmd_privmsg.cpp
+++ b/src/commands/cmd_privmsg.cpp
@@ -188,7 +188,7 @@ CmdResult MessageCommandBase::HandleMessage(const std::vector<std::string>& para
 
 			nickonly.assign(destnick, 0, targetserver - destnick);
 			dest = ServerInstance->FindNickOnly(nickonly);
-			if (dest && strcasecmp(dest->server.c_str(), targetserver + 1))
+			if (dest && strcasecmp(dest->server->GetName().c_str(), targetserver + 1))
 			{
 				/* Incorrect server for user */
 				user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such nick/channel", parameters[0].c_str());
diff --git a/src/commands/cmd_stats.cpp b/src/commands/cmd_stats.cpp
index 846af57db..5aa608f14 100644
--- a/src/commands/cmd_stats.cpp
+++ b/src/commands/cmd_stats.cpp
@@ -164,7 +164,7 @@ void CommandStats::DoStats(char statschar, User* user, string_list &results)
 			for (std::list<User*>::const_iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); ++i)
 			{
 				User* oper = *i;
-				if (!ServerInstance->ULine(oper->server))
+				if (!oper->server->IsULine())
 				{
 					LocalUser* lu = IS_LOCAL(oper);
 					results.push_back(sn+" 249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " +
diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index edfeeda42..a059a3f9c 100644
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -168,7 +168,7 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
 
 		/* Don't allow server name matches if HideWhoisServer is enabled, unless the command user has the priv */
 		if (!match && (ServerInstance->Config->HideWhoisServer.empty() || cuser->HasPrivPermission("users/auspex")))
-			match = InspIRCd::Match(user->server, matchtext);
+			match = InspIRCd::Match(user->server->GetName(), matchtext);
 
 		return match;
 	}
@@ -204,7 +204,7 @@ void CommandWho::SendWhoLine(User* user, const std::vector<std::string>& parms,
 	if (!ServerInstance->Config->HideWhoisServer.empty() && !user->HasPrivPermission("servers/auspex"))
 		wholine.append(ServerInstance->Config->HideWhoisServer);
 	else
-		wholine.append(u->server);
+		wholine.append(u->server->GetName());
 
 	wholine.append(" " + u->nick + " ");
 
diff --git a/src/commands/cmd_whois.cpp b/src/commands/cmd_whois.cpp
index a6a4447b9..fdc2ad045 100644
--- a/src/commands/cmd_whois.cpp
+++ b/src/commands/cmd_whois.cpp
@@ -144,8 +144,8 @@ void CommandWhois::DoWhois(User* user, User* dest, unsigned long signon, unsigne
 	}
 	else
 	{
-		std::string serverdesc = ServerInstance->GetServerDescription(dest->server);
-		ServerInstance->SendWhoisLine(user, dest, 312, "%s %s :%s", dest->nick.c_str(), dest->server.c_str(), serverdesc.c_str());
+		std::string serverdesc = ServerInstance->GetServerDescription(dest->server->GetName());
+		ServerInstance->SendWhoisLine(user, dest, 312, "%s %s :%s", dest->nick.c_str(), dest->server->GetName().c_str(), serverdesc.c_str());
 	}
 
 	if (dest->IsAway())
diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index fab65aae3..6a561907e 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -215,7 +215,7 @@ CommandWhowas::~CommandWhowas()
 }
 
 WhoWasGroup::WhoWasGroup(User* user) : host(user->host), dhost(user->dhost), ident(user->ident),
-	server(user->server), gecos(user->fullname), signon(user->signon)
+	server(user->server->GetName()), gecos(user->fullname), signon(user->signon)
 {
 }