X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Commands%2FPA.pm;h=2dcb00671d0c90ccc3355f138606ffd50ce7100d;hp=808f4092020ef9b67dc9addaa3ba0441009783b7;hb=ae37bc6b64270f8c65298a36fce1f4bad761231f;hpb=0d6e6e233601ba9b1dd9fe874e804424a10fa09c diff --git a/Commands/PA.pm b/Commands/PA.pm index 808f409..2dcb006 100644 --- a/Commands/PA.pm +++ b/Commands/PA.pm @@ -126,7 +126,7 @@ sub xp my ($avalue,$ascore) = $c->model->selectrow_array(q{ SELECT value,score FROM current_planet_stats -WHERE id = (SELECT planet FROM users WHERE hostmask ILIKE ?) +WHERE pid = (SELECT pid FROM users WHERE hostmask ILIKE ?) }, undef, $c->host); my ($tvalue,$tscore,$tsize) = $c->model->selectrow_array(q{ SELECT value,score,size FROM current_planet_stats @@ -167,7 +167,7 @@ sub fco my ($value,$score) = $c->model->selectrow_array(q{ SELECT value,score FROM planet_stats WHERE tick = $2 AND - id = (SELECT planet FROM users WHERE hostmask ILIKE $1) + pid = (SELECT pid FROM users WHERE hostmask ILIKE $1) }, undef, $c->host,$tick); unless ($value){ $c->reply("You don't have a planet registered."); @@ -175,7 +175,7 @@ SELECT value,score FROM planet_stats WHERE tick = $2 AND } my $attackers = $c->model->prepare(q{ SELECT coords(p.x,p.y,p.z), ruler, planet FROM current_planet_stats p - JOIN planet_stats ps using (id) + JOIN planet_stats ps using (pid) WHERE ps.tick = $1 AND trunc(2000.0*$2*$3/ps.value)::int = $4 }); $attackers->execute($tick,$agents,$value,$stolen);