From dded2e0d0f20ba7e3a728c93fbb15039ec1794b8 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@lacunaexpanse.com>
Date: Fri, 14 Jan 2011 17:26:59 -0600
Subject: [PATCH] fix

---
 lib/Lacuna/DB/Result/Map/Body/Planet.pm | 2 +-
 lib/Lacuna/DB/Result/Spies.pm           | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/Lacuna/DB/Result/Map/Body/Planet.pm b/lib/Lacuna/DB/Result/Map/Body/Planet.pm
index 5a654638..8302f2b5 100644
--- a/lib/Lacuna/DB/Result/Map/Body/Planet.pm
+++ b/lib/Lacuna/DB/Result/Map/Body/Planet.pm
@@ -145,7 +145,7 @@ sub sanitize {
         $spy->update;
     }
     Lacuna->db->resultset('Lacuna::DB::Result::Spies')->search({from_body_id => $self->id})->delete_all;
-    Lacuna->db->resultset('Lacuna::DB::Result::Trades')->search({body_id => $self->id})->delete_all;
+    Lacuna->db->resultset('Lacuna::DB::Result::Market')->search({body_id => $self->id})->delete_all;
     Lacuna->db->resultset('Lacuna::DB::Result::Probes')->search({body_id => $self->id})->delete;
     $self->empire_id(undef);
     if ($self->get_type eq 'habitable planet' && $self->size >= 40 && $self->size <= 50) {
diff --git a/lib/Lacuna/DB/Result/Spies.pm b/lib/Lacuna/DB/Result/Spies.pm
index eafb1ecc..b68b0d5b 100644
--- a/lib/Lacuna/DB/Result/Spies.pm
+++ b/lib/Lacuna/DB/Result/Spies.pm
@@ -276,13 +276,6 @@ sub is_available {
             );
             return 1;
         }
-        elsif ($task eq 'Waiting On Trade') {
-            my $trade = Lacuna->db->resultset('Lacuna::DB::Result::Trades')->search({
-               offer_object_id  => $self->id,
-               offer_type       => 'prisoner',
-            });
-            $trade->withdraw if defined $trade;
-        }
         elsif ($task eq 'Travelling') {
             my $infiltration_time = $self->available_on->clone->add(hours => 1);
             if ($infiltration_time->epoch > time && $self->empire_id ne $self->on_body->empire_id) {
-- 
2.54.0