Fix item duplications for water containers

jhaakma · Dec 31, 2023 · 7bd3ff4 · 7bd3ff4
1 parent 0b688d6
commit 7bd3ff4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/Data Files/MWSE/mods/mer/ashfall/heat/HeatUtil.lua b/Data Files/MWSE/mods/mer/ashfall/heat/HeatUtil.lua
@@ -106,7 +106,7 @@ local HEAT_LOSS_FULL = 1.0
 local WATER_HEAT_RATE = 40--base water heat/cooling speed
 ---@param liquidContainer Ashfall.LiquidContainer
 function HeatUtil.updateWaterHeat(liquidContainer)
-    if not liquidContainer.waterAmount then return end
+    if liquidContainer.waterAmount <= 0 then return end
     local now = tes3.getSimulationTimestamp()
     liquidContainer.lastWaterUpdated = liquidContainer.lastWaterUpdated or now
     local timeSinceLastUpdate = now - liquidContainer.lastWaterUpdated

diff --git a/Data Files/MWSE/mods/mer/ashfall/liquid/LiquidContainer.lua b/Data Files/MWSE/mods/mer/ashfall/liquid/LiquidContainer.lua
@@ -138,6 +138,7 @@ end
 ---@param reference tes3reference
 ---@return Ashfall.LiquidContainer|nil liquidContainer
 function LiquidContainer.createFromReference(reference, bottleData)
+    if not reference.supportsLuaData then return nil end
     local id = (reference.data and reference.data.utensilId) or reference.baseObject.id
     return LiquidContainer.new{
         id = id,

diff --git a/Data Files/MWSE/mods/mer/ashfall/needs/waterController.lua b/Data Files/MWSE/mods/mer/ashfall/needs/waterController.lua
@@ -376,7 +376,7 @@ event.register("cellChanged", addWaterToWorld)
 
 ---@param e itemDroppedEventData
 local function clearDataOnDrop(e)
-    if e.reference.data then
+    if e.reference.supportsLuaData then
         e.reference.data.lastWaterUpdated = nil
         e.reference.data.lastBrewUpdated = nil
         e.reference.data.lastStewUpdated = nil

diff --git a/Data Files/MWSE/mods/mer/ashfall/referenceController.lua b/Data Files/MWSE/mods/mer/ashfall/referenceController.lua
@@ -60,15 +60,13 @@ this.controllers = {
     fuelConsumer = ReferenceController:new{
         requirements = function(_, ref)
             return ref.supportsLuaData
-            and ref.data
             and ref.data.fuelLevel
         end
     },
 
     boiler = ReferenceController:new{
         requirements = function(_, ref)
             local isboiler = ref.supportsLuaData
-                and ref.data
                 and ref.data.waterHeat ~= nil
             return isboiler
         end
@@ -77,33 +75,29 @@ this.controllers = {
     stewer = ReferenceController:new{
         requirements = function(_, ref)
             return ref.supportsLuaData
-                and ref.data
-                and ref.data.utensil == "cookingPot"
-            or staticConfigs.cookingPots[ref.object.id:lower()]
+                and (ref.data.utensil == "cookingPot"
+                    or staticConfigs.cookingPots[ref.object.id:lower()])
         end,
     },
 
     brewer = ReferenceController:new{
         requirements = function(_, ref)
             return ref.supportsLuaData
-                and ref.data
-                and ref.data.utensil == "kettle"
-            or staticConfigs.kettles[ref.object.id:lower()]
+                and (ref.data.utensil == "kettle"
+                    or staticConfigs.kettles[ref.object.id:lower()])
         end
     },
 
     stewBuffedActor = ReferenceController:new{
         requirements = function(_, ref)
             return ref.supportsLuaData
-                and ref.data
                 and ref.data.stewBuffTimeLeft
         end
     },
 
     teaBuffedActor = ReferenceController:new{
         requirements = function(_, ref)
             return ref.supportsLuaData
-                and ref.data
                 and ref.data.teaBuffTimeLeft
         end
     },