X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=ed9b6ce253876f7e3ebb8969431cda6b613288a3;hb=7acb4ced207da7308d471a4ca434ce1cc7b9e9cb;hp=d18f57916b4fddf0a26f8a43d7a99496d90329a2;hpb=6c7a3ceb6c674a9af09da955ee0238e9291cf29a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp
index d18f57916..ed9b6ce25 100644
--- a/src/modules/m_remove.cpp
+++ b/src/modules/m_remove.cpp
@@ -60,7 +60,10 @@ class RemoveBase : public Command
 		const std::string& username = parameters[neworder ? 1 : 0];
 
 		/* Look up the user we're meant to be removing from the channel */
-		target = ServerInstance->FindNick(username);
+		if (IS_LOCAL(user))
+			target = ServerInstance->FindNickOnly(username);
+		else
+			target = ServerInstance->FindNick(username);
 
 		/* And the channel we're meant to be removing them from */
 		channel = ServerInstance->FindChan(channame);
@@ -81,7 +84,7 @@ class RemoveBase : public Command
 		int ulevel = channel->GetPrefixValue(user);
 		int tlevel = channel->GetPrefixValue(target);
 
-		if (ServerInstance->ULine(target->server))
+		if (target->server->IsULine())
 		{
 			user->WriteNumeric(482, "%s :Only a u-line may remove a u-line from a channel.", channame.c_str());
 			return CMD_FAILURE;