From 5c4fd608648a25f577637b5f64900fc9359ee43c Mon Sep 17 00:00:00 2001 From: jhaakma Date: Tue, 27 Aug 2024 10:09:22 +1200 Subject: [PATCH] Fix teawarmer filter when Midnight Oil isn't installed --- Data Files/MWSE/mods/mer/ashfall/common/helperFunctions.lua | 1 + Data Files/MWSE/mods/mer/ashfall/items/teaWarmer/init.lua | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Data Files/MWSE/mods/mer/ashfall/common/helperFunctions.lua b/Data Files/MWSE/mods/mer/ashfall/common/helperFunctions.lua index 8c02a5bb..340e6ced 100644 --- a/Data Files/MWSE/mods/mer/ashfall/common/helperFunctions.lua +++ b/Data Files/MWSE/mods/mer/ashfall/common/helperFunctions.lua @@ -994,6 +994,7 @@ end ---@field blend number The amount of blending between the ground and decal texture ---@field texturingProperty niTexturingProperty ---@field object any + ---@return Ashfall.GroundTextureInfo|nil function this.getGroundTextureInfo(e) local rayhit = tes3.rayTest({ diff --git a/Data Files/MWSE/mods/mer/ashfall/items/teaWarmer/init.lua b/Data Files/MWSE/mods/mer/ashfall/items/teaWarmer/init.lua index a21ac876..b425a8fd 100644 --- a/Data Files/MWSE/mods/mer/ashfall/items/teaWarmer/init.lua +++ b/Data Files/MWSE/mods/mer/ashfall/items/teaWarmer/init.lua @@ -31,11 +31,11 @@ local function itemIsCandle(object) return object.id:lower():find("candle") ~= nil end if midnightOilInterop then - if object.id:lower() == "mer_lntrn_candle" then - end local candleIds = midnightOilInterop.getCandleIds() return candleIds[object.id:lower()] ~= nil end + + return false end local function playerHasCandle()