Column for shipname has been renamed

[NDIRC.git] / Delling.pm

diff --git a/Delling.pm b/Delling.pm
index dc4a0b09b02dbc8049708ab02bded2272029be70..f19bf2a366271e06525641a03ffbe6115be75874 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -127,7 +127,7 @@ FROM users u WHERE hostmask = ?
                        if ($user->{password} eq ''){
                                $irc->yield(privmsg => $disp->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
                        }
-                       if ($tick > 36 && not defined $user->{pid}){
+                       if ($tick > 12 && not defined $user->{pid}){
                                $irc->yield(privmsg => $disp->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
                        }
 
@@ -207,7 +207,7 @@ FROM users u
        JOIN fleets f USING (fid)
        JOIN fleet_ships fs USING (fid)
        JOIN defense_missions dm ON f.fid = dm.fleet
-       JOIN ship_stats ss ON fs.ship = ss.name
+       JOIN ship_stats ss USING (ship)
 WHERE NOT dm.announced
 GROUP BY username,call,tick,dm.fleet,p.value
                });