From 8cd8c858fc70d15310cdaa2f1eaa3321cc561616 Mon Sep 17 00:00:00 2001
From: Matthew Musgrove <mr.muskrat@gmail.com>
Date: Tue, 5 Apr 2011 21:53:24 -0500
Subject: [PATCH] Revert changes for abandoning space stations

---
 lib/Lacuna/DB/Result/Propositions.pm | 9 +--------
 lib/Lacuna/RPC/Body.pm               | 1 -
 var/www/public/changes.txt           | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/Lacuna/DB/Result/Propositions.pm b/lib/Lacuna/DB/Result/Propositions.pm
index 7ef83560..7e2247a2 100644
--- a/lib/Lacuna/DB/Result/Propositions.pm
+++ b/lib/Lacuna/DB/Result/Propositions.pm
@@ -107,14 +107,7 @@ sub check_status {
 sub pass {
     my $self = shift;
     $self->status('Passed');
-    my $alliance;
-    if ($self->scratch->{alliance_id}) {
-        $alliance = Lacuna->db->resultset('Lacuna::DB::Result::Alliance')->search({alliance_id => $self->scratch->{alliance_id})->single;
-    }
-    else {
-        $alliance = $self->station->alliance;
-    }
-    $alliance->send_predefined_message(
+    $self->station->alliance->send_predefined_message(
         filename    => 'parliament_vote_passed.txt',
         tag         => 'Correspondence',
         params      => [
diff --git a/lib/Lacuna/RPC/Body.pm b/lib/Lacuna/RPC/Body.pm
index e99398e7..bd01e850 100644
--- a/lib/Lacuna/RPC/Body.pm
+++ b/lib/Lacuna/RPC/Body.pm
@@ -27,7 +27,6 @@ sub abandon {
             name            => 'Abandon Station',
             description     => 'Abandon the station named {Planet '.$body->id.' '.$body->name.'}.',            
             proposed_by_id  => $empire->id,
-            scratch         => { alliance_id => $empire->alliance_id },
         });
         $proposition->station($body);
         $proposition->proposed_by($empire);
diff --git a/var/www/public/changes.txt b/var/www/public/changes.txt
index bebe8eff..1c95a76c 100644
--- a/var/www/public/changes.txt
+++ b/var/www/public/changes.txt
@@ -11,7 +11,6 @@
  - Fix: view_ships_orbiting will now return the ships that are orbiting your planet instead of just the count.
  - Fix: Fighters will return home after defending (instead of doubling the travel time).
  - Fix: Fix defender's home field advantage.
- - Fix: Abandoning Space Stations will now work.
 
 3.0402
  - API: Changed parliament propositions and laws to use email formatting rules.
-- 
2.51.2