X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=caa9489217247af5ace2ad2bed6ecb8654315774;hb=92a035a39513b9804196355ceaedad23bc73a045;hp=e8a7d0e70e3d509b23a62787c5a9c85c502e5e20;hpb=5aebbd7109de51640f6049631093f004d66583d9;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index e8a7d0e..caa9489 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/\s* (\d+ \+ \s*)? (\d+) \s+
+		Arrival:\s*(\d+) \s+
 		\QReturn ETA:\E\s*(?:(?<eta>Instant) \s+ Cancel \s+ Order
 			| (?<eta>\d+) \s+ Ticks \s+ Recall \s+ Fleet)/sx;
 	my $etare = qr/(Galaxy:\d+Universe:\d+(?:Alliance:\d+)?
@@ -632,7 +632,7 @@ sub parseconfirmations {
 			given(shift @etas){
 				when(/$missionetare/sx){
 					$mission{tick} = $3;
-					$mission{eta} = $1 + $+{eta};
+					$mission{eta} = $2 + $+{eta};
 					$mission{back} = $3 + $mission{eta} - 1;
 					$mission{target} = shift @targets;
 					$mission{lt} = shift @lts;