return;
}
if(my $user = dc()){
- my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,0)});
+ my $findid = $ND::DBH->prepare_cached(q{SELECT planetid(?,?,?,tick())});
my ($id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
my $rv = $ND::DBH->do(q{UPDATE planets SET planet_status = 'Hostile' WHERE id = $1},undef,$id);
if ($rv == 1){
$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z nick");
return;
}
- if (my $user = officer){
+ if (my $user = intel){
my $findid = $ND::DBH->prepare_cached(q{SELECT nick, id FROM planets
- WHERE id = planetid(?,?,?,0)});
+ WHERE id = planetid(?,?,?,tick())});
my ($oldnick,$id) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
- if ($ND::DBH->do('UPDATE planets SET nick = $1 WHERE id = $2'
+ if ($id && $ND::DBH->do('UPDATE planets SET nick = $1 WHERE id = $2'
,undef,$nick,$id)){
unless (defined $oldnick){
$ND::server->command("msg $ND::target $x:$y:$z nick has been set to $ND::B$nick");
$ND::server->command("msg $ND::target $x:$y:$z nick has been changed from $ND::B$oldnick$ND::B to $ND::B$nick");
}
intel_log $user->{uid},$id,"Set nick to: $nick";
+ }else{
+ $ND::server->command("msg $ND::target Couldn't find any planet with coords $x:$y:$z");
}
}
}
$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z ally | | % can be used for wildcards \%-crew\% will match [F-Crew]");
return;
}
- if (my $user = officer){
+ if (my $user = intel){
my $aid;
if ($ally ne 'unknown'){
($aid,$ally) = $ND::DBH->selectrow_array("SELECT id,name FROM alliances WHERE name ILIKE ?",undef,$ally);
}
if ($ally){
- my $findid = $ND::DBH->prepare_cached(q{SELECT id,alliance FROM current_planet_stats
+ my $findid = $ND::DBH->prepare(q{SELECT id,alliance FROM current_planet_stats
WHERE x = ? AND y = ? and z = ?});
my ($id,$alliance) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);
- if($id && $ND::DBH->do('UPDATE planets SET alliance_id = $1 WHERE id = $2'
+ unless ($id){
+ $ND::server->command("msg $ND::target Couldn't find a planet at $x:$y:$z");
+ return;
+ }
+ if($ND::DBH->do('UPDATE planets SET alliance_id = $1 WHERE id = $2'
,undef,$aid,$id)){
if (defined $alliance){
$ND::server->command("msg $ND::target Changed $x:$y:$z from $ND::B$alliance$ND::B to $ND::B$ally");
}
intel_log $user->{uid},$id,"Set alliance_id to: $aid ($ally)";
}else{
- $ND::server->command("msg $ND::target Couldn't find a planet at $x:$y:$z");
+ $ND::server->command("msg $ND::target Couldn't set alliance_id to: $aid");
}
}else{
$ND::server->command("msg $ND::target Couldn't find such an alliance");
$ND::server->command("notice $ND::nick Usage: .$command X:Y:Z channel");
return;
}
- if (my $user = officer()){
+ if (my $user = intel){
my $findid = $ND::DBH->prepare_cached(q{SELECT id,channel FROM current_planet_stats
WHERE x = ? AND y = ? and z = ?});
my ($id,$c) = $ND::DBH->selectrow_array($findid,undef,$x,$y,$z);