Fixed getShips

diff --git a/Usermgm.pm b/Usermgm.pm
index ee0187e0f73779515c20a0f6a114f15747f759ac..f8d332a402079b7f4ad76f51b0565832a08b2287 100644 (file)
--- a/Usermgm.pm
+++ b/Usermgm.pm
@@ -177,9 +177,15 @@ sub getShips {
                return;
        }
        if (officer() || dc()){
-               my $f = $ND::DBH->prepare(qq{SELECT username,SUM(amount) AS amount
-                       FROM users u JOIN fleets f USING (uid) JOIN fleet_ships fs ON f.id = fs.fleet WHERE f.fleet = 0 AND ship ILIKE ? GROUP BY username ORDER BY amount DESC
-                       });
+               my $f = $ND::DBH->prepare(qq{SELECT username,SUM(fs.amount) AS amount
+                       FROM users u 
+                               JOIN (SELECT DISTINCT ON (sender) sender AS planet,id FROM fleets
+                                       WHERE mission = 'Full fleet' AND name <> 'Unit'
+                                       ORDER BY sender,tick DESC,id DESC) f  USING (planet) 
+                               JOIN fleet_ships fs ON f.id = fs.id
+                       WHERE ship ILIKE ?
+                       GROUP BY username ORDER BY amount DESC
+               });
                $f->execute($ship);
                my $text;
                my $i = 0;