X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=server%2Frcon2irc%2Frcon2irc.pl;h=a29a0a1571f9d80245ae571b1e1e95926777b51e;hp=489a7e17a3eb9a1d7bfbe04bcd639338a96bb9f1;hb=ee5be7230f3f0bb1d7af75d1a472495e5a3f0196;hpb=5d21c011d874c70159ac70f2e4435c57c16a9c3e

diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl
index 489a7e17..a29a0a15 100755
--- a/server/rcon2irc/rcon2irc.pl
+++ b/server/rcon2irc/rcon2irc.pl
@@ -1293,6 +1293,18 @@ sub cond($)
 	[ irc => q{:[^ ]* 001 .*} => sub {
 		$store{irc_seen_welcome} = 1;
 		$store{irc_nick} = $store{irc_nick_requested};
+		
+		# If users for quakenet are listed, parse them into a hash and schedule a sub to query information
+		if ($config{irc_quakenet_authusers} ne '') {
+			$store{irc_quakenet_users} = { map { $_ => 1 } split / /, $config{irc_quakenet_authusers} };
+	
+			schedule sub {
+				my ($timer) = @_;
+				out irc => 0, "PRIVMSG Q :users " . $config{irc_channel};
+				schedule $timer => 300;;
+			} => 1;
+		}
+
 		return irc_joinstage(0);
 	} ],
 
@@ -1688,17 +1700,6 @@ for my $p(split ' ', $config{plugins})
 }
 
 
-# If users for quakenet are listed, parse them into a hash and schedule a sub to query information
-if ($config{irc_quakenet_authusers} ne '') {
-	$store{irc_quakenet_users} = { map { $_ => 1 } split / /, $config{irc_quakenet_authusers} };
-	
-	schedule sub {
-		my ($timer) = @_;
-		out irc => 0, "PRIVMSG Q :users " . $config{irc_channel};
-		schedule $timer => 300;;
-	} => 1;
-}
-
 
 # verify that the server is up by letting it echo back a string that causes
 # re-initialization of the required aliases
@@ -1726,7 +1727,7 @@ schedule sub {
 	my ($timer) = @_;
 
 	# log on to IRC when needed
-	if(exists $store{dp_hostname} && !exists $store{irc_logged_in})
+	if(exists $store{dp_hostname} && !exists $store{irc_seen_welcome})
 	{
 		$store{irc_nick_requested} = $config{irc_nick};
 		out irc => 1, "NICK $config{irc_nick}", "USER $config{irc_user} localhost localhost :$store{dp_hostname}";