Permalink
Browse files

Merge pull request #39 from lemming552/develop

Fix for seizing stars.
  • Loading branch information...
lemming552 committed Jul 22, 2012
2 parents f1e6c3b + 0ecba3e commit ca7bf0ef1a78b516383b3f3cac1df43fc3134e6d
Showing with 7 additions and 3 deletions.
  1. +1 −1 lib/Lacuna.pm
  2. +1 −1 lib/Lacuna/DB/Result/Mission.pm
  3. +1 −1 lib/Lacuna/RPC/Building/Parliament.pm
  4. +4 −0 var/www/public/changes.txt
View
@@ -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});
@@ -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)) {
@@ -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);
@@ -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

0 comments on commit ca7bf0e

Please sign in to comment.