X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_delayjoin.cpp;h=ef7d96f5adfe7d59221834dfdaa94eb5fae16321;hb=8fd2f620cef9d43a7271d05e82bdce6705b9af3b;hp=ff6f7966fe0840c0dd145e8096c78c97f88b4269;hpb=2ba3c38388fdd31ddf594302c50d2903f7af2afc;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_delayjoin.cpp b/src/modules/m_delayjoin.cpp
index ff6f7966f..ef7d96f5a 100644
--- a/src/modules/m_delayjoin.cpp
+++ b/src/modules/m_delayjoin.cpp
@@ -220,11 +220,15 @@ class ModuleDelayJoin : public Module
 
 		for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
 		{
-			/* User only appears to vanish for non-opers */
-			if (user->Visibility && user->Visibility->VisibleTo(i->first))
-			{
-				i->first->Write(std::string(tb));
-			}
+			/* User doesnt get a JOIN sent to themselves */
+			if (user == i->first)
+				continue;
+
+			/* Users with a visibility state that hides them dont appear */
+			if (user->Visibility && !user->Visibility->VisibleTo(i->first))
+				continue;
+
+			i->first->Write(std::string(tb));
 		}
 	}