From 6b31d8846ca66c4402192f198047b822ab57813e Mon Sep 17 00:00:00 2001 From: JT Smith Date: Sun, 27 Mar 2011 17:44:31 -0500 Subject: [PATCH] better --- lib/Lacuna/DB/Result/Map/Body/Planet.pm | 6 ------ lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/Lacuna/DB/Result/Map/Body/Planet.pm b/lib/Lacuna/DB/Result/Map/Body/Planet.pm index 4354e877..55996159 100644 --- a/lib/Lacuna/DB/Result/Map/Body/Planet.pm +++ b/lib/Lacuna/DB/Result/Map/Body/Planet.pm @@ -237,12 +237,6 @@ around get_status => sub { $out->{empire}{alignment} = $self->empire->is_isolationist ? 'ally-isolationist' : 'ally'; } } - if ($self->isa('Lacuna::DB::Result::Map::Body::Planet::Station') && defined $self->alliance) { - $out->{alliance} = { - id => $self->alliance->id, - name => $self->alliance->name, - } - } } return $out; }; diff --git a/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm b/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm index b35af9da..95edd990 100644 --- a/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm +++ b/lib/Lacuna/DB/Result/Map/Body/Planet/Station.pm @@ -24,6 +24,18 @@ has parliament => ( }, ); +around get_status => sub { + my ($orig, $self, $empire) = @_; + my $out = $orig->($self); + if (defined $self->alliance) { + $out->{alliance} = { + id => $self->alliance->id, + name => $self->alliance->name, + } + } + return $out; +}; + sub has_room_in_build_queue { return 1; } -- 2.51.2