X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=8bf4d30e7bf341d4d6ce773bc7c1734455bb586e;hb=00cd97160ae8909ca12b8807a8114cad1f6a06b1;hp=096d2f9eee97799e15ead02d952a043c68573ba8;hpb=a4db7bf9af00b32d4f5c1922997d02b0b8be59e5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp
index 096d2f9ee..8bf4d30e7 100644
--- a/src/modules/m_shun.cpp
+++ b/src/modules/m_shun.cpp
@@ -30,10 +30,10 @@ class Shun : public XLine
 public:
 	std::string matchtext;
 
-	Shun(time_t s_time, long d, std::string src, std::string re, std::string shunmask)
+	Shun(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& shunmask)
 		: XLine(s_time, d, src, re, "SHUN")
+		, matchtext(shunmask)
 	{
-		this->matchtext = shunmask;
 	}
 
 	~Shun()
@@ -108,8 +108,8 @@ class CommandShun : public Command
 
 		std::string target = parameters[0];
 		
-		User *find = ServerInstance->FindNick(target.c_str());
-		if (find)
+		User *find = ServerInstance->FindNick(target);
+		if ((find) && (find->registered == REG_ALL))
 			target = std::string("*!*@") + find->GetIPString();
 
 		if (parameters.size() == 1)
@@ -168,6 +168,9 @@ class CommandShun : public Command
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
+		if (IS_LOCAL(user))
+			return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
 		return ROUTE_BROADCAST;
 	}
 };
@@ -182,12 +185,16 @@ class ModuleShun : public Module
 
  public:
 	ModuleShun() : cmd(this)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->XLines->RegisterFactory(&f);
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 
 		Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}