From f57dbb6dbe0a49b0f0aa80c327904d4273a76b55 Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Tue, 7 Nov 2017 18:18:35 +0000
Subject: Work around removing shuns on nicks when the nick is online.

---
 src/modules/m_shun.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_shun.cpp')

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 8bf4d30e7..3147d5476 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -114,13 +114,17 @@ class CommandShun : public Command
 
 		if (parameters.size() == 1)
 		{
-			if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
+			if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user))
+			{
+				ServerInstance->SNO->WriteToSnoMask('x', "%s removed SHUN on %s", user->nick.c_str(), parameters[0].c_str());
+			}
+			else if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user))
 			{
 				ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s",user->nick.c_str(),target.c_str());
 			}
 			else
 			{
-				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats H.",user->nick.c_str(),target.c_str());
+				user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats H.", user->nick.c_str(), parameters[0].c_str());
 				return CMD_FAILURE;
 			}
 		}
-- 
cgit v1.3.1-10-gc9f91