X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=208a8c8d6da71ab5407f939de8a13b66b5cf0fdd;hb=8741b1f83afd43088761bfed12ecdbe7b5aba6b4;hp=e8a7d0e70e3d509b23a62787c5a9c85c502e5e20;hpb=5aebbd7109de51640f6049631093f004d66583d9;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index e8a7d0e..208a8c8 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -517,7 +517,7 @@ WHERE uid = $1 AND num = $2 AND back > tick() }else{ $m->{pid} = $c->user->planet; } - }elsif ($m->{target} =~ /^(\d+):(\d+):(\d+)$/) { + }elsif ($m->{target} ~~ /^(\d+):(\d+):(\d+)$/) { $m->{pid} = $dbh->selectrow_array($findplanet,undef,$1,$2,$3); unless ($m->{pid}){ $m->{warning} = "No planet at $m->{target}, try again next tick."; @@ -585,9 +585,9 @@ sub parseconfirmations { $missions =~ s/\(\s/(/g; $missions =~ s/\s\)/)/g; my $returnetare = qr/(\d+) \s+ - Arrival:(\d+)/sx; - my $missionetare = qr/(\d+) (\s+ \(\+\d+\))? \s+ - Arrival:(\d+) \s+ + Arrival:\s*(\d+)/sx; + my $missionetare = qr/(\d+) (\s* \+ \s* \d+)? \s+ + Arrival:\s*(\d+) \s+ \QReturn ETA:\E\s*(?:(?Instant) \s+ Cancel \s+ Order | (?\d+) \s+ Ticks \s+ Recall \s+ Fleet)/sx; my $etare = qr/(Galaxy:\d+Universe:\d+(?:Alliance:\d+)?