From f50c0cf6b64f37a195d74229955c26b430a04136 Mon Sep 17 00:00:00 2001
From: Iain C Docherty <github@iandocherty.com>
Date: Sat, 4 May 2013 04:32:42 -0400
Subject: [PATCH] Tweaked probes

---
 lib/Lacuna/DB/Result/Building/Observatory.pm            | 4 +++-
 lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm | 4 +++-
 lib/Lacuna/DB/Result/Empire.pm                          | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/Lacuna/DB/Result/Building/Observatory.pm b/lib/Lacuna/DB/Result/Building/Observatory.pm
index f9e413d1..9458de03 100644
--- a/lib/Lacuna/DB/Result/Building/Observatory.pm
+++ b/lib/Lacuna/DB/Result/Building/Observatory.pm
@@ -17,7 +17,9 @@ around 'build_tags' => sub {
 
 sub probes {
     my $self = shift;
-    return Lacuna->db->resultset('Probes')->search_observatory( { body_id => $self->body->id } );
+    return Lacuna->db->resultset('Probes')->search_observatory( {
+        body_id     => $self->body->id,
+    } );
 }
 
 use constant controller_class => 'Lacuna::RPC::Building::Observatory';
diff --git a/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm b/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm
index e8b2865a..2c475e5b 100644
--- a/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm
+++ b/lib/Lacuna/DB/Result/Building/Permanent/OracleOfAnid.pm
@@ -22,7 +22,9 @@ sub image_level {
 
 sub probes {
     my $self = shift;
-    return Lacuna->db->resultset('Probes')->search_oracle( { body_id => $self->body->id } );
+    return Lacuna->db->resultset('Probes')->search_oracle( {
+        body_id     => $self->body->id,
+    } );
 }
 
 after finish_upgrade => sub {
diff --git a/lib/Lacuna/DB/Result/Empire.pm b/lib/Lacuna/DB/Result/Empire.pm
index a7cbb803..5f9dabc0 100644
--- a/lib/Lacuna/DB/Result/Empire.pm
+++ b/lib/Lacuna/DB/Result/Empire.pm
@@ -119,7 +119,7 @@ sub observatory_probes {
 
     $args = {} unless defined $args;
     $args->{virtual} = 0;
-    return $self->search($args);
+    return $self->all_probes->search($args);
 }
 
 sub oracle_probes {
@@ -127,7 +127,7 @@ sub oracle_probes {
 
     $args = {} unless defined $args;
     $args->{virtual} = 1;
-    return $self->search($args);
+    return $self->all_probes->search($args);
 }
 
 sub self_destruct_date_formatted {
@@ -941,7 +941,7 @@ has count_probed_stars => (
     lazy        => 1,
     default     => sub {    
         my $self = shift;
-        return $self->probes->count;
+        return $self->all_probes->count;
     },
 );
 
@@ -954,7 +954,7 @@ before delete => sub {
     $self->taxes->delete_all;
     $self->propositions->delete_all;
     Lacuna->db->resultset('Invite')->search({ -or => {invitee_id => $self->id, inviter_id => $self->id }})->delete;
-    $self->probes->delete;
+    $self->all_probes->delete;
     Lacuna->db->resultset('AllianceInvite')->search({empire_id => $self->id})->delete;
     if ($self->alliance_id) {
         my $alliance = $self->alliance;
-- 
2.51.2