# HG changeset patch # User "Rex Tsai " # Date 1226297983 -28800 # Node ID 5f6f845bbb1d8c029242bae9ecba58540aab36ff # Parent 64549ddddf4adb19b1c7102f8c1110797347a6c6 check if the city still exist. diff -r 64549ddddf4a -r 5f6f845bbb1d Ikariam.pm --- a/Ikariam.pm Fri Nov 07 15:18:23 2008 +0800 +++ b/Ikariam.pm Mon Nov 10 14:19:43 2008 +0800 @@ -628,15 +628,22 @@ my $cityId = shift; my $res = $self->{mech}->get(sprintf("http://%s/index.php?view=plunder&destinationCityId=%d", $self->{server}, $cityId)); + my $extractor = Ikariam::Extractor->new(content => $res->content); # check peace treaty - my $treaty = Ikariam::Extractor->new(content => $res->content)->find('//div[@class="warning"]'); + my $treaty = $extractor->find('//div[@class="warning"]'); if(!defined($treaty)) { - $self->{mech}->submit_form( - form_number => 1, - fields => { - cargo_army_302 => '3', # 劍士 + my @forms = $self->{mech}->forms(); + if($#forms < 1) { + my $city = Ikariam::Cities->retrieve($cityId); + $city->delete; + } else { + $self->{mech}->submit_form( + form_number => 1, + fields => { + cargo_army_302 => '3', # 劍士 } - ); + ); + } } else { # put the id in the friends.txt file. Ikariam::Cities->has_a(user => 'Ikariam::User');