From 7b45e08be16ea2e485a325cfc27cca1d428f82d8 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Wed, 2 Mar 2016 19:24:00 -0700 Subject: [PATCH] Fixed null alliance check --- lib/Lacuna/RPC.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Lacuna/RPC.pm b/lib/Lacuna/RPC.pm index 6bbc2087..d4cd5807 100644 --- 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' }, -- 2.51.2