Merge commit '95cd7a6aee8edb833aff92207ebed67a06913550'

1 files changed, 2 insertions, 7 deletions

diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp
index fbd0d4609..e2d304d93 100644
--- a/modules/protocol/inspircd20.cpp
+++ b/modules/protocol/inspircd20.cpp
@@ -1085,13 +1085,8 @@ void inspircd20::Mode::Run(MessageSource &source, const std::vector<Anope::strin
 		   users modes, we have to kludge this
 		   as it slightly breaks RFC1459
 		 */
-		User *u = source.GetUser();
-		// This can happen with server-origin modes.
-		if (!u)
-			u = User::Find(params[0]);
-		// if it's still null, drop it like fire.
-		// most likely situation was that server introduced a nick which we subsequently akilled
-		if (u)
+		User *u = User::Find(params[0]);
+		if (u != nullptr)
 			u->SetModesInternal(source, "%s", params[1].c_str());
 	}
 }