From d869ed861f3d3931aa6c2d2629cfddcdf1795b7b Mon Sep 17 00:00:00 2001 From: fireartist Date: Wed, 16 May 2012 13:29:20 +0100 Subject: [PATCH] delete_supply_chain: don't bypass db remove_supply_chain was skipping removing ships from last chain. was skipping recalc_waste_production. fixed typo in method-name --- lib/Lacuna/DB/Result/Building/Trade.pm | 2 +- lib/Lacuna/RPC/Building/Trade.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Lacuna/DB/Result/Building/Trade.pm b/lib/Lacuna/DB/Result/Building/Trade.pm index 9d7a7599..47b82907 100644 --- a/lib/Lacuna/DB/Result/Building/Trade.pm +++ b/lib/Lacuna/DB/Result/Building/Trade.pm @@ -209,7 +209,7 @@ sub remove_waste_chain { sub remove_supply_chain { my ($self, $supply_chain) = @_; - if ($self->supply_chain->count == 1) { + if ($self->supply_chains->count == 1) { my $ships = $self->supply_ships; while (my $ship = $ships->next) { $self->sent_supply_ship_home($supply_chain->target, $ship); diff --git a/lib/Lacuna/RPC/Building/Trade.pm b/lib/Lacuna/RPC/Building/Trade.pm index de38cd32..efc59d8a 100644 --- a/lib/Lacuna/RPC/Building/Trade.pm +++ b/lib/Lacuna/RPC/Building/Trade.pm @@ -256,7 +256,7 @@ sub delete_supply_chain { my $chain = Lacuna->db->resultset('Lacuna::DB::Result::SupplyChain')->find($supply_chain_id); if ($chain) { - $chain->delete; + $chain->remove_supply_chain; } return $self->view_supply_chains($session_id, $building_id); } -- 2.54.0