From: Merlijn Hofstra <mhofstra@gmail.com>
Date: Sat, 8 May 2010 12:23:06 +0000 (+0200)
Subject: actually base of most recent version
X-Git-Tag: xonotic-v0.1.0preview~469^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5074d54a78d383aa1da3eb579a393b515cf4ceaa;p=xonotic%2Fxonotic.git

actually base of most recent version
---

diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl
index 489a7e17..c1c2a4ef 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