From 3de4a98b64113c93706544d50757051c0e33f5fc Mon Sep 17 00:00:00 2001
From: Joey De Pauw <joeydepauw@gmail.com>
Date: Sat, 14 Dec 2019 18:03:46 +0100
Subject: [PATCH] v2.1

---
 better-air-filtering/changelog.txt |  5 +++
 better-air-filtering/control.lua   | 57 +++++++++++++++++-------------
 better-air-filtering/info.json     |  2 +-
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/better-air-filtering/changelog.txt b/better-air-filtering/changelog.txt
index 5132f92..f3046dc 100644
--- a/better-air-filtering/changelog.txt
+++ b/better-air-filtering/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.1
+Date: 2019.12.14
+  Fixes:
+    - Desync when upgrading from 0.1.3 should be fixed.
+---------------------------------------------------------------------------------------------------
 Version: 0.2.0
 Date: 2019.12.06
   Performance:
diff --git a/better-air-filtering/control.lua b/better-air-filtering/control.lua
index c8bae63..a58dae6 100644
--- a/better-air-filtering/control.lua
+++ b/better-air-filtering/control.lua
@@ -2,7 +2,7 @@
 --  #   Constants   #
 --  #################
 
-local INTERVAL = settings.global["baf-update-interval"].value
+local INTERVAL
 
 
 
@@ -168,7 +168,6 @@ function suctionUpdateChunk(chunkTo, dx, dy)
     --    game.print("suction: " .. totalSuction)
 
     local chunkFrom = getFilteredChunk(chunkTo.surface, chunkTo.x + dx, chunkTo.y + dy)
-    local test = chunkFrom:getTotalSuctionRate(0)
     local pollution = chunkFrom:get_pollution()
     if pollution > 0.1 then
         local toPollute = math.min(pollution, totalSuction)
@@ -530,6 +529,21 @@ function preEntityRemoved(event)
     end
 end
 
+
+
+
+-- Set up callbacks
+script.on_event({ defines.events.on_built_entity, defines.events.on_robot_built_entity }, onEntityCreated)
+
+
+-- on_entity_died should trigger both functions -> called manually
+script.on_event({ defines.events.on_player_mined_entity, defines.events.on_robot_mined_entity, defines.events.on_entity_died }, onEntityRemoved)
+script.on_event({ defines.events.on_pre_player_mined_item, defines.events.on_pre_robot_mined_item, defines.events.on_entity_died }, preEntityRemoved)
+
+
+local functions = generateFunctions()
+
+
 function refreshMetatables()
     for _, chunkListX in pairs(global.air_filtered_chunks_map) do
         for x, chunkListY in pairs(chunkListX) do
@@ -541,6 +555,18 @@ function refreshMetatables()
     end
 end
 
+function load()
+    refreshMetatables()
+
+    INTERVAL = settings.global["baf-update-interval"].value
+
+    onTick = spreadOverTicks(functions, INTERVAL)
+    script.on_event(defines.events.on_tick, onTick)
+end
+
+script.on_load(load)
+
+
 function init()
     -- gather all filters on every surface
     global.air_filtered_chunks_map = {}
@@ -556,33 +582,16 @@ function init()
     end
 end
 
-function load()
-    refreshMetatables()
-end
-
-
--- Set up callbacks
-script.on_event({ defines.events.on_built_entity, defines.events.on_robot_built_entity }, onEntityCreated)
-
-
--- on_entity_died should trigger both functions -> called manually
-script.on_event({ defines.events.on_player_mined_entity, defines.events.on_robot_mined_entity, defines.events.on_entity_died }, onEntityRemoved)
-script.on_event({ defines.events.on_pre_player_mined_item, defines.events.on_pre_robot_mined_item, defines.events.on_entity_died }, preEntityRemoved)
-
-functions = generateFunctions()
-local onTick = spreadOverTicks(functions, INTERVAL)
-script.on_event(defines.events.on_tick, onTick)
-
-script.on_load(load)
 script.on_init(init)
 script.on_configuration_changed(init)
 
-
 function onSettingsChanged(event)
-    INTERVAL = settings.global["baf-update-interval"].value
+    if event.setting == "baf-update-interval" then
+        INTERVAL = settings.global["baf-update-interval"].value
 
-    local onTick = spreadOverTicks(functions, INTERVAL)
-    script.on_event(defines.events.on_tick, onTick)
+        onTick = spreadOverTicks(functions, INTERVAL)
+        script.on_event(defines.events.on_tick, onTick)
+    end
 end
 
 script.on_event(defines.events.on_runtime_mod_setting_changed, onSettingsChanged)
diff --git a/better-air-filtering/info.json b/better-air-filtering/info.json
index 4dbcc03..1531078 100644
--- a/better-air-filtering/info.json
+++ b/better-air-filtering/info.json
@@ -1,6 +1,6 @@
 {
   "name": "better-air-filtering",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "title": "Better Air Filtering",
   "author": "Joey De Pauw",
   "contact": "joeydepauw@gmail.com",