diff --git a/Irpg/Main.pm b/Irpg/Main.pm index 376d702a6a22fff43216f06bf19c4bcd1a568958..bf599bd0047218052df7410636b8abaf73b0c5ea 100644 --- a/Irpg/Main.pm +++ b/Irpg/Main.pm @@ -207,8 +207,7 @@ sub moveplayers { my @who_fought = (); for my $player (keys(%$rps)) { next unless ($rps->{$player}{online}); - next if (!$questers[0] || grep { $player eq $_ } @questers); - #if (@questers) {next if (grep { $player eq $_ } @questers)}; + next if (@questers && grep { $player eq $_ } @questers); $rps->{$player}{x} += int(rand(3))-1; $rps->{$player}{y} += int(rand(3))-1; # if player goes over edge, wrap them back around @@ -221,8 +220,8 @@ sub moveplayers { if ($rps->{$positions{$rps->{$player}{x}}{$rps->{$player}{y}}{user}}{isadmin} && !$rps->{$player}{isadmin} && rand(100) < 1) { Irpg::Irc::chanmsg("$player encounters ". - $positions{$rps->{$player}{x}}{$rps->{$player}{y}}{user}. - " and bows humbly."); + $positions{$rps->{$player}{x}}{$rps->{$player}{y}}{user}. + " and bows humbly."); } if (rand($onlinecount) < 1) { $positions{$rps->{$player}{x}}{$rps->{$player}{y}}{battled}=1; @@ -238,7 +237,7 @@ sub moveplayers { # at the last move, evil users who has not fought # chase near players if ($i == $opts->{self_clock}-1 - && $rps->{$player}{alignment} == 'Evil' + && $rps->{$player}{alignment} eq 'Evil' && !(grep { $player eq $_ } @who_fought)) { evilchase($player, \%positions); } diff --git a/Irpg/Quest.pm b/Irpg/Quest.pm index cc9b0f4b880ad0c6a3424150f5aace31324ad295..7f56fb222fe8949aa65e7c70454cb4b4a7664a16 100644 --- a/Irpg/Quest.pm +++ b/Irpg/Quest.pm @@ -146,7 +146,7 @@ sub questpencheck { } sub movequesters { - return undef unless ($quest{type} == 2 && @{$quest{questers}}); + return () unless ($quest{type} == 2 && @{$quest{questers}}); my $allgo = 1; # have all users reached <p1|p2>? for (@{$quest{questers}}) { if ($quest{stage}==1) {