X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=95c7cd37b1c51052890b4dea0abdbcf96e03cfbd;hb=8e89fe75f9467969bce1dc6930befc6ef273edf6;hp=a5c98dbbfcaddaa1719c69f90c92920f0a9edd6d;hpb=1ff54f0c4d4a53003319e72e3c7cbcf4c6c025e3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index a5c98dbbf..95c7cd37b 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -92,7 +92,7 @@ class cmd_shun : public Command
 
 		if(pcnt == 1)
 		{
-			if (ServerInstance->XLines->DelLine(parameters[0], "S", user))
+			if (ServerInstance->XLines->DelLine(parameters[0], "SHUN", user))
 			{
 				ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]);
 			}
@@ -182,6 +182,9 @@ class ModuleShun : public Module
 
 	virtual void OnUserConnect(User* user)
 	{
+		if (!IS_LOCAL(user))
+			return;
+
 		// Apply lines on user connect
 		XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user);
 
@@ -194,9 +197,6 @@ class ModuleShun : public Module
 
 	virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line)
 	{
-		if (user->registered != REG_ALL)
-			return 0;
-
 		if((command != "PONG") && (command != "PING"))
 		{
 			if (user->GetExt("shunned"))