crabman77/homedecor_modpack
1
0
Fork 0
forked from nalc/homedecor_modpack
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug in showerhead spawners

Browse Source 
(if two or more running at the same time, only the last could be turned off)
This commit is contained in:
Vanessa Ezekowitz 2015-04-28 14:08:41 -04:00
parent 960dd57f7b
commit c074e47bcd
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
homedecor/bathroom_sanitation.lua
View File

@ -201,7 +201,6 @@ homedecor.register("shower_head", {
on_rightclick = function (pos, node, clicker) on_rightclick = function (pos, node, clicker)
local below = minetest.get_node({x=pos.x, y=pos.y-2.0, z=pos.z}) local below = minetest.get_node({x=pos.x, y=pos.y-2.0, z=pos.z})
local is_tray = string.find(below.name, "homedecor:shower_tray") local is_tray = string.find(below.name, "homedecor:shower_tray")
local this_spawner_meta = minetest.get_meta(pos)
local fdir = node.param2 local fdir = node.param2
local minx = fdir_to_flowpos.minx[fdir + 1] local minx = fdir_to_flowpos.minx[fdir + 1]
local maxx = fdir_to_flowpos.maxx[fdir + 1] local maxx = fdir_to_flowpos.maxx[fdir + 1]
@ -210,9 +209,20 @@ homedecor.register("shower_head", {
local velx = fdir_to_flowpos.velx[fdir + 1] local velx = fdir_to_flowpos.velx[fdir + 1]
local velz = fdir_to_flowpos.velz[fdir + 1] local velz = fdir_to_flowpos.velz[fdir + 1]
if fdir and fdir < 4 and this_spawner_meta:get_string("active") ~= "yes" and is_tray local this_spawner_meta = minetest.get_meta(pos)
or this_spawner_meta:get_string("active") == "yes" and id == nil and is_tray then local id = this_spawner_meta:get_int("active")
this_spawner_meta:set_string("active", "yes")
if id ~= 0 then
minetest.after(0, function(s_handle)
minetest.sound_stop(s_handle)
end, s_handle)
local player = clicker:get_player_name()
minetest.delete_particlespawner(id, player)
this_spawner_meta:set_int("active", nil)
return
end
if fdir and fdir < 4 and is_tray and (not id or id == 0) then
id = minetest.add_particlespawner({ id = minetest.add_particlespawner({
amount = 60, time = 0, collisiondetection = true, amount = 60, time = 0, collisiondetection = true,
minpos = {x=pos.x - minx, y=pos.y-0.45, z=pos.z - minz}, minpos = {x=pos.x - minx, y=pos.y-0.45, z=pos.z - minz},
@ -223,19 +233,21 @@ homedecor.register("shower_head", {
texture = "homedecor_water_particle.png", texture = "homedecor_water_particle.png",
}) })
s_handle = minetest.sound_play("homedecor_shower", { s_handle = minetest.sound_play("homedecor_shower", {
pos = pos, max_hear_distance = 5, loop = true pos = pos,
max_hear_distance = 5,
loop = true
}) })
elseif this_spawner_meta:get_string("active") == "yes" and id then this_spawner_meta:set_int("active", id)
this_spawner_meta:set_string("active", "no") return
minetest.after(0, function(s_handle)
minetest.sound_stop(s_handle)
end, s_handle)
local player = clicker:get_player_name()
minetest.delete_particlespawner(id, player)
end end
end, end,
on_destruct = function(pos) on_destruct = function(pos)
minetest.delete_particlespawner(id) local this_spawner_meta = minetest.get_meta(pos)
local id = this_spawner_meta:get_int("active")
if id ~= 0 then
minetest.delete_particlespawner(id)
this_spawner_meta:set_int("active", nil)
end
end end
}) })