Fix some service bot/botinfo mismatches

1 files changed, 10 insertions, 3 deletions

diff --git a/modules/protocol/hybrid.cpp b/modules/protocol/hybrid.cpp
index 1e63ed448..da412623a 100644
--- a/modules/protocol/hybrid.cpp
+++ b/modules/protocol/hybrid.cpp
@@ -22,9 +22,16 @@ class HybridProto : public IRCDProto
 		if (bi && bi->introduced)
 			return bi;
 
-		for (ServiceBot *bi2 : Serialize::GetObjects<ServiceBot *>(botinfo))
-			if (bi2->introduced)
-				return bi2;
+		for (user_map::const_iterator it = UserListByNick.begin(); it != UserListByNick.end(); ++it)
+		{
+			User *u = it->second;
+			if (u->type == UserType::BOT)
+			{
+				bi = anope_dynamic_static_cast<ServiceBot *>(u);
+				if (bi->introduced)
+					return bi;
+			}
+		}
 
 		return NULL;
 	}