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

Move checking at right place

Browse Source
This commit is contained in:
kilbith 2015-01-24 22:41:38 +01:00
parent da2af88eb8
commit 931a5b0746
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
homedecor/furniture.lua
View File

@ -38,11 +38,6 @@ local function sit(pos, node, clicker)
local name = clicker:get_player_name() local name = clicker:get_player_name()
local meta = minetest:get_meta(pos) local meta = minetest:get_meta(pos)
local param2 = node.param2 local param2 = node.param2
if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end
if clicker:get_player_name() == meta:get_string("player") then if clicker:get_player_name() == meta:get_string("player") then
meta:set_string("player", "") meta:set_string("player", "")
pos.y = pos.y-0.5 pos.y = pos.y-0.5
@ -116,6 +111,11 @@ for i in ipairs(chaircolors) do
}, },
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit() on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit()
if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end
sit(pos, node, clicker) sit(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
clicker:setpos(pos) clicker:setpos(pos)
@ -151,6 +151,11 @@ for i in ipairs(chaircolors) do
}, },
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit() on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit()
if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end
sit(pos, node, clicker) sit(pos, node, clicker)
pos.y = pos.y-0.1 -- player's sit position. pos.y = pos.y-0.1 -- player's sit position.
clicker:setpos(pos) clicker:setpos(pos)
@ -403,6 +408,11 @@ homedecor.register("simple_bench", {
} }
}, },
on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit() on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit()
if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end
sit(pos, node, clicker) sit(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
clicker:setpos(pos) clicker:setpos(pos)
@ -440,6 +450,11 @@ homedecor.register("bench_large_1_left", {
}, },
expand = { right="homedecor:bench_large_1_right" }, expand = { right="homedecor:bench_large_1_right" },
on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit() on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit()
if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end
sit(pos, node, clicker) sit(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
clicker:setpos(pos) clicker:setpos(pos)
@ -512,6 +527,11 @@ homedecor.register("bench_large_2_left", {
}, },
expand = { right="homedecor:bench_large_2_right" }, expand = { right="homedecor:bench_large_2_right" },
on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit() on_rightclick = function(pos, node, clicker) -- don't move these functions inside sit()
if not clicker or not clicker:is_player()
or clicker:get_player_control().up == true or clicker:get_player_control().down == true
or clicker:get_player_control().left == true or clicker:get_player_control().right == true
or clicker:get_player_control().jump == true then -- make sure that the player is immobile.
return end
sit(pos, node, clicker) sit(pos, node, clicker)
pos.y = pos.y-0 -- player's sit position. pos.y = pos.y-0 -- player's sit position.
clicker:setpos(pos) clicker:setpos(pos)