1 files changed, 5 insertions, 17 deletions

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index c78bfa638..1cda4484f 100644
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -226,13 +226,6 @@ class CommandWatch : public Command
 			User* target = ServerInstance->FindNick(nick);
 			if (target)
 			{
-				if (target->Visibility && !target->Visibility->VisibleTo(user))
-				{
-					(*wl)[nick] = "";
-					user->WriteNumeric(605, "%s %s * * 0 :is offline",user->nick.c_str(), nick);
-					return CMD_FAILURE;
-				}
-
 				(*wl)[nick] = std::string(target->ident).append(" ").append(target->dhost).append(" ").append(ConvToStr(target->age));
 				user->WriteNumeric(604, "%s %s %s :is online",user->nick.c_str(), nick, (*wl)[nick].c_str());
 				if (IS_AWAY(target))
@@ -410,8 +403,7 @@ class Modulewatch : public Module
 		{
 			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
-				if (!user->Visibility || user->Visibility->VisibleTo(user))
-					(*n)->WriteNumeric(inum, numeric);
+				(*n)->WriteNumeric(inum, numeric);
 			}
 		}
 
@@ -425,8 +417,7 @@ class Modulewatch : public Module
 		{
 			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
-				if (!user->Visibility || user->Visibility->VisibleTo(*n))
-					(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str() ,user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) ServerInstance->Time());
+				(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str() ,user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) ServerInstance->Time());
 
 				watchlist* wl;
 				if ((*n)->GetExt("watchlist", wl))
@@ -496,8 +487,7 @@ class Modulewatch : public Module
 		{
 			for (std::deque<User*>::iterator n = x->second.begin(); n != x->second.end(); n++)
 			{
-				if (!user->Visibility || user->Visibility->VisibleTo(*n))
-					(*n)->WriteNumeric(600, "%s %s %s %s %lu :arrived online", (*n)->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
+				(*n)->WriteNumeric(600, "%s %s %s %s %lu :arrived online", (*n)->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
 
 				watchlist* wl;
 				if ((*n)->GetExt("watchlist", wl))
@@ -519,8 +509,7 @@ class Modulewatch : public Module
 				watchlist* wl;
 				if ((*n)->GetExt("watchlist", wl))
 				{
-					if (!user->Visibility || user->Visibility->VisibleTo(*n))
-	 					(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str(), oldnick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
+					(*n)->WriteNumeric(601, "%s %s %s %s %lu :went offline", (*n)->nick.c_str(), oldnick.c_str(), user->ident.c_str(), user->dhost.c_str(), (unsigned long) user->age);
 					(*wl)[oldnick.c_str()] = "";
 				}
 			}
@@ -534,8 +523,7 @@ class Modulewatch : public Module
 				if ((*n)->GetExt("watchlist", wl))
 				{
 					(*wl)[user->nick.c_str()] = std::string(user->ident).append(" ").append(user->dhost).append(" ").append(ConvToStr(user->age));
-					if (!user->Visibility || user->Visibility->VisibleTo(*n))
-						(*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str());
+					(*n)->WriteNumeric(600, "%s %s %s :arrived online", (*n)->nick.c_str(), user->nick.c_str(), (*wl)[user->nick.c_str()].c_str());
 				}
 			}
 		}