Use the iterator version of Channel::KickUser() in a few places

1 files changed, 4 insertions, 3 deletions

diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp
index 9039d8551..d646d9a45 100644
--- a/src/coremods/core_channel/cmd_kick.cpp
+++ b/src/coremods/core_channel/cmd_kick.cpp
@@ -66,12 +66,13 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 		}
 	}
 
-	Membership* const memb = c->GetUser(u);
-	if (!memb)
+	const UserMembIter victimiter = c->userlist.find(u);
+	if (victimiter == c->userlist.end())
 	{
 		user->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s :They are not on that channel", u->nick.c_str(), c->name.c_str());
 		return CMD_FAILURE;
 	}
+	Membership* const memb = victimiter->second;
 
 	if (parameters.size() > 2)
 	{
@@ -112,7 +113,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
 		}
 	}
 
-	c->KickUser(user, u, reason);
+	c->KickUser(user, victimiter, reason);
 
 	return CMD_SUCCESS;
 }