From e5efe42ecbb1b84837af5f76f09b7c8ab9d4248d Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 25 Oct 2012 04:30:22 -0400
Subject: Fixed showing users from the right server on unreal/bahamut

---
 modules/protocol/bahamut.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'modules/protocol/bahamut.cpp')

diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp
index d4d7b7703..181b4dc2e 100644
--- a/modules/protocol/bahamut.cpp
+++ b/modules/protocol/bahamut.cpp
@@ -381,7 +381,14 @@ struct IRCDMessageNick : IRCDMessage
 	{
 		if (params.size() == 10)
 		{
-			User *user = new User(params[0], params[4], params[5], "", params[8], source.GetServer(), params[9], params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, params[3]);
+			Server *s = Server::Find(params[6]);
+			if (s == NULL)
+			{
+				Log(LOG_DEBUG) << "User " << params[0] << " introduced from nonexistant server " << params[6] << "?";
+				return true;
+			}
+
+			User *user = new User(params[0], params[4], params[5], "", params[8], s, params[9], params[2].is_pos_number_only() ? convertTo<time_t>(params[2]) : 0, params[3]);
 			if (user && nickserv)
 			{
 				const NickAlias *na;
-- 
cgit