From 20fbb250d7981db1cf589927197a93b5ffc395a0 Mon Sep 17 00:00:00 2001
From: Ian Docherty <github@iandocherty.com>
Date: Sun, 30 Dec 2012 22:16:58 -0500
Subject: [PATCH] Fix double calculation of reschedule queue

---
 lib/Lacuna/DB/Result/Building.pm       | 2 +-
 lib/Lacuna/RPC/Building/Development.pm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/Lacuna/DB/Result/Building.pm b/lib/Lacuna/DB/Result/Building.pm
index 4de30bbb..ccacebc3 100755
--- a/lib/Lacuna/DB/Result/Building.pm
+++ b/lib/Lacuna/DB/Result/Building.pm
@@ -850,7 +850,7 @@ sub finish_upgrade {
         $body->needs_surface_refresh(1);
         $body->update;
         my $empire = $body->empire; 
-#31 is the actual Max level for the Terra & Gas Platforms.
+        # 31 is the actual Max level for the Terra & Gas Platforms.
         if ($new_level >= 1 and $new_level <= 31) {
             $empire->add_medal('building'.$new_level);
         }
diff --git a/lib/Lacuna/RPC/Building/Development.pm b/lib/Lacuna/RPC/Building/Development.pm
index f4fcef05..6b271030 100644
--- a/lib/Lacuna/RPC/Building/Development.pm
+++ b/lib/Lacuna/RPC/Building/Development.pm
@@ -64,7 +64,7 @@ sub subsidize_one_build {
     }
     $empire->spend_essentia($subsidy, 'construction subsidy');
     $empire->update;
-    $scheduled_building->reschedule_queue;
+#    $scheduled_building->reschedule_queue;
     $building->subsidize_build_queue($scheduled_building);
 
     return {
@@ -81,7 +81,7 @@ sub cancel_build {
     }
     my $empire              = $self->get_empire_by_session($args->{session_id});
     my $building            = $self->get_building($empire, $args->{building_id});
-    my $scheduled_building  = Lacuna->db->resultset('Building')->find($args->{scheduled_id});
+    my $scheduled_building  = Lacuna->db->resultset('Building')->find({id => $args->{scheduled_id}});
     if ($scheduled_building->body_id != $building->body_id) {
         confess [1003, "That building is not on the same planet as your development ministry."];
     }
-- 
2.51.2