From 81e0d4ea7ec7aafca30fd002c17ff2f9a1847638 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 30 Mar 2021 20:55:34 -0400 Subject: [PATCH] fix faucets/taps not working on kitchen sinks anymore --- homedecor_bathroom/init.lua | 4 +--- homedecor_kitchen/init.lua | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 4acbc2fa..20e18ae2 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -239,9 +239,7 @@ local function taps_on_rightclick(pos, node, clicker, itemstack, pointed_thing) local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) if below and below.name == "homedecor:shower_tray" or - below.name == "homedecor:sink" or - below.name == "homedecor:kitchen_cabinet_with_sink" or - below.name == "homedecor:kitchen_cabinet_with_sink_locked" then + string.find(below.name, "homedecor:.*sink") then local particledef = { outlet = { x = 0, y = -0.44, z = 0.28 }, velocity_x = { min = -0.1, max = 0.1 }, diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index d4d7303c..f26aab61 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -469,10 +469,7 @@ homedecor.register("kitchen_faucet", { on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) local below = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) - if below and - below.name == "homedecor:sink" or - below.name == "homedecor:kitchen_cabinet_with_sink" or - below.name == "homedecor:kitchen_cabinet_with_sink_locked" then + if below and string.find(below.name, "homedecor:.*sink") then local particledef = { outlet = { x = 0, y = -0.19, z = 0.13 }, velocity_x = { min = -0.05, max = 0.05 },