Fixed null alliance check

plainblack · Mar 3, 2016 · 178a669 · 178a669
1 parent f4af997
commit 178a669
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/lib/Lacuna/RPC.pm b/lib/Lacuna/RPC.pm
@@ -163,7 +163,10 @@ sub get_body { # makes for uniform error handling, and prevents staleness
                    'me.id' => $body_id,
                    -or => [
                            { 'me.empire_id'        => $session->empire->id },
-                           { 'me.alliance_id'      => $session->empire->alliance_id },
+                           $session->empire->alliance_id ? () : {
+                               'me.alliance_id'      => $session->empire->alliance_id,
+                               'me.class'            => 'Lacuna::DB::Result::Map::Body::Planet::Station'
+                           },
                            $session->_is_sitter ? () : {
                                'sitterauths.sitter_id' => $session->empire->id,
                                'me.class' => { '!=' => 'Lacuna::DB::Result::Map::Body::Planet::Station' },
@@ -202,7 +205,10 @@ sub get_building { # makes for uniform error handling, and prevents staleness
                    'me.id' => $building_id,
                    -or => [
                            { 'body.empire_id'        => $session->empire->id },
-                           { 'body.alliance_id'      => $session->empire->alliance_id },
+                           $session->empire->alliance_id ? () : {
+                               'body.alliance_id'      => $session->empire->alliance_id,
+                               'body.class'            => 'Lacuna::DB::Result::Map::Body::Planet::Station'
+                           },
                            $session->_is_sitter ? () : {
                                'sitterauths.sitter_id' => $session->empire->id,
                                'body.class' => { '!=' => 'Lacuna::DB::Result::Map::Body::Planet::Station' },