From 5d5d201f8608a935d33da9d0ac2da0ca0a968710 Mon Sep 17 00:00:00 2001 From: lemming552 Date: Wed, 2 Mar 2016 21:52:23 -0700 Subject: [PATCH] And lets make the order correct --- lib/Lacuna/RPC.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Lacuna/RPC.pm b/lib/Lacuna/RPC.pm index d4cd5807..d6cade07 100644 --- a/lib/Lacuna/RPC.pm +++ b/lib/Lacuna/RPC.pm @@ -163,10 +163,10 @@ sub get_body { # makes for uniform error handling, and prevents staleness 'me.id' => $body_id, -or => [ { 'me.empire_id' => $session->empire->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' }, @@ -205,10 +205,10 @@ sub get_building { # makes for uniform error handling, and prevents staleness 'me.id' => $building_id, -or => [ { 'body.empire_id' => $session->empire->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