X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=a7f6fb3020622150664e18463df8c12307150e78;hp=cd82bd910eb129021040304055fad72639c8a075;hb=95cfd7bb5173581eda52b1d920840da10fa3a333;hpb=50e2cfa738765f4de658193277b7ab6d7dc814cc diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index cd82bd9..a7f6fb3 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -630,8 +630,9 @@ sub findDuplicateFleet : Private { my $findfleet = $dbh->prepare(q{ 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 - COALESCE(uid = $1 AND num = $2 AND lc.pid = $5 AND landing_tick = $6, TRUE) +WHERE f.pid = (SELECT pid FROM users WHERE uid = $1) + AND mission = $3 AND amount = $4 AND 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} ,$m->{mission},$m->{amount}, $m->{pid}, $m->{tick});