diff --git a/lib/Lacuna.pm b/lib/Lacuna.pm index b661ccea..6ffb5735 100644 --- a/lib/Lacuna.pm +++ b/lib/Lacuna.pm @@ -7,7 +7,7 @@ use Config::JSON; useall __PACKAGE__; -our $VERSION = 3.0861; +our $VERSION = 3.0862; my $config = Config::JSON->new('/data/Lacuna-Server/etc/lacuna.conf'); my $db = Lacuna::DB->connect($config->get('db/dsn'),$config->get('db/username'),$config->get('db/password'), { mysql_enable_utf8 => 1}); diff --git a/lib/Lacuna/DB/Result/Mission.pm b/lib/Lacuna/DB/Result/Mission.pm index caed028a..6245476d 100644 --- a/lib/Lacuna/DB/Result/Mission.pm +++ b/lib/Lacuna/DB/Result/Mission.pm @@ -394,7 +394,7 @@ sub format_items { if ($movement->{target_body_id}) { $target = $bodies->find($movement->{target_body_id}); } - else { + elsif ($movement->{target_star_id}) { $target = $stars->find($movement->{target_star_id}); } unless (defined($target)) { diff --git a/lib/Lacuna/RPC/Building/Parliament.pm b/lib/Lacuna/RPC/Building/Parliament.pm index 78dfd3d1..d5438b01 100644 --- a/lib/Lacuna/RPC/Building/Parliament.pm +++ b/lib/Lacuna/RPC/Building/Parliament.pm @@ -279,7 +279,7 @@ sub propose_seize_star { unless ($star_id) { confess [1002, 'Must specify a star id to seize.']; } - if ($self->in_neutral_area) { + if ($building->body->in_neutral_area) { confess [1009, 'Your station is in the Neutral Area and is not allowed to seize any star.']; } my $star = Lacuna->db->resultset('Lacuna::DB::Result::Map::Star')->find($star_id); diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt index 322c7864..0259c6ef 100644 --- a/var/www/public/changes.txt +++ b/var/www/public/changes.txt @@ -1,3 +1,7 @@ +3.0862: + - Fix: Fixed broken seize method for Parliament. + - Fix: Checked for an empty argument SQL call. + 3.0861: - Mod: Neutral Zone now enforced via Code. - Add: Added water and energy to PCC and SCC Resources details