From: Michael Andreen <harv@ruin.nu>
Date: Wed, 11 Aug 2010 04:55:14 +0000 (+0200)
Subject: Only full fleets should be added again after 6 ticks
X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=commitdiff_plain;h=59d3ccb7336061ae83e999e06bdd55bb299dd7df

Only full fleets should be added again after 6 ticks
---

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}