From 8741b1f83afd43088761bfed12ecdbe7b5aba6b4 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Sat, 22 Mar 2014 23:36:12 +0100 Subject: [PATCH] Update fleet parsing for round 56. --- lib/NDWeb/Controller/Members.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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+)? -- 2.39.2