Fixed error ModelCompute.lua:244

Fixed error ModelCompute.lua:244 after changer execution order of ModelCompute.prepareBlock
Helfima · Jul 9, 2023 · 6f2a655 · 6f2a655
1 parent 148d6d7
commit 6f2a655
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.12.18
+Date: 2023-07-09
+  Bugfixes:
+    - Fixed error ModelCompute.lua:244 after changer execution order of ModelCompute.prepareBlock
+---------------------------------------------------------------------------------------------------
 Version: 0.12.17
 Date: 2023-07-06
   Bugfixes:

diff --git a/data/ModelCompute.lua b/data/ModelCompute.lua
@@ -241,7 +241,7 @@ function ModelCompute.prepareBlock(block)
         for i, block_product in pairs(block_products) do
             local product_key = Product(block_product):getTableKey()
             ---recopie la valeur input
-            if block.by_factory ~= true and block.products[product_key] ~= nil then
+            if block.by_factory ~= true and block.products ~= nil and block.products[product_key] ~= nil then
                 block_product.input = block.products[product_key].input
             end
             ---pose le status
@@ -255,7 +255,7 @@ function ModelCompute.prepareBlock(block)
         for i, block_ingredient in pairs(block_ingredients) do
             local ingredient_key = Product(block_ingredient):getTableKey()
             ---recopie la valeur input
-            if block.by_factory ~= true and block.ingredients[ingredient_key] ~= nil then
+            if block.by_factory ~= true and block.ingredients ~= nil and block.ingredients[ingredient_key] ~= nil then
                 block_ingredient.input = block.ingredients[ingredient_key].input
             end
             ---pose le status

diff --git a/info.json b/info.json
@@ -1,6 +1,6 @@
 {
   "name": "helmod",
-  "version": "0.12.17",
+  "version": "0.12.18",
   "title": "Helmod: Assistant for planning your factory",
   "author": "Helfima",
   "contact": "Helfima",