Allow new full fleets if the old one is a few ticks old

diff --git a/lib/NDWeb.pm b/lib/NDWeb.pm
index 51c5e7f730b24096cfb3c3a4b73a2f7aed5c1a9e..b72d765a9e971d0b3e99545a195b7245af2fd415 100644 (file)
--- a/lib/NDWeb.pm
+++ b/lib/NDWeb.pm
@@ -47,6 +47,8 @@ sub signal_bots {
        system 'killall','-USR1', 'ndbot.pl';
 }
 
+#$SIG{__WARN__} = sub { NDWeb->log->warn(@_); };
+
 # Configure the application.
 #
 # Note that settings in ndweb.conf (or other external

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index cd82bd910eb129021040304055fad72639c8a075..a7f6fb3020622150664e18463df8c12307150e78 100644 (file)
--- 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});