X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=2ed177f9d717a179c983967c2fb6d0cdddb95e85;hp=a8a34b5661f44df010913be92a2415e574464b6b;hb=59d3ccb7336061ae83e999e06bdd55bb299dd7df;hpb=8fd8a78d262322662183a34712a65d6e6d044c8b diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index a8a34b5..2ed177f 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -656,7 +656,7 @@ sub findDuplicateFleet : Private { SELECT fid FROM fleets f LEFT JOIN launch_confirmations lc USING (fid) WHERE f.pid = (SELECT pid FROM users WHERE uid = $1) - AND mission = $3 AND amount = $4 AND tick > $6 - 6 + AND mission = $3 AND amount = $4 AND (mission <> 'Full fleet' OR tick > $6 - 6) AND COALESCE(uid = $1 AND num = $2 AND lc.pid = $5 AND landing_tick = $6, TRUE) }); my $fid = $dbh->selectrow_array($findfleet,undef,$c->user->id,$m->{num}