RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-31 07:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'refs/remotes/origin/merlijn/rcon2irc-fix'

Browse Source
This commit is contained in:
Rudolf Polzer 2010-08-24 05:30:51 +02:00
commit 731e4a4f46
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server/rcon2irc/votestop.pl
View File

@ -13,7 +13,7 @@
$store{plugin_votestop} = \%vs; }
# add a dependency on joinsparts.pl
if (defined %config && $config{plugins} !~ m/joinsparts.pl /gi) {
if (defined %config && $config{plugins} !~ m/joinsparts\.pl/gi) {
die "votestop.pl depends on joinsparts.pl but it appears to not be loaded.";
}
@ -60,13 +60,15 @@ sub time_to_seconds {
}
$vs->{currentvote} = $id;
$vs->{command} = $command;
return 0;
} ],
[ dp => q{:vote:v(yes|no|timeout|stop):.*} => sub {
my ($cmd) = @_;
$store{plugin_votestop}->{currentvote} = undef;
my $vs = $store{plugin_votestop};
$vs->{currentvote} = undef;
$vs->{command} = undef;
if ($cmd eq 'stop' && $vs->{vstopignore}) {
$vs->{vstopignore} = undef;
@ -80,10 +82,11 @@ sub time_to_seconds {
my ($id) = @_;
my $vs = $store{plugin_votestop};
if (defined $store{plugin_votestop}->{currentvote} && $id == $store{plugin_votestop}->{currentvote}) {
if (defined $vs->{currentvote} && $id == $vs->{currentvote}) {
$vs->{vstopignore} = 1;
out dp => 0, "sv_cmd vote stop";
out irc => 0, "PRIVMSG $config{irc_channel} :* vote \00304$command\017 by " . $store{"playernick_byid_$id"} .
out dp => 0, "say Vote was stopped as player left the server";
out irc => 0, "PRIVMSG $config{irc_channel} :* vote \00304" . $vs->{command} . "\017 by " . $store{"playernick_byid_$id"} .
"\017 was stopped because he left the server";
}
@ -93,9 +96,10 @@ sub time_to_seconds {
[ dp => q{:gamestart:(.*):[0-9.]*} => sub {
my $vs = $store{plugin_votestop};
if (defined $store{plugin_votestop}->{currentvote}) {
if (defined $vs->{currentvote}) {
out dp => 0, "sv_cmd vote stop";
$store{plugin_votestop}->{currentvote} = undef;
$vs->{currentvote} = undef;
$vs->{command} = undef;
$vs->{vstopignore} = undef;
}