diff options
| author | DTA7 <dta7e@t-online.de> | 2017-09-21 21:52:52 +0200 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2018-06-03 17:31:59 +0200 |
| commit | e8286e8894cf132eeda4bac9924e5fd8c74a7eb2 (patch) | |
| tree | 08293b665aa8941da3442aa798097fb368e462a2 /builtin | |
| parent | b8f473be21b932c0c0cdb9ae3bfb4243f262a763 (diff) | |
| download | minetest-e8286e8894cf132eeda4bac9924e5fd8c74a7eb2.tar.gz minetest-e8286e8894cf132eeda4bac9924e5fd8c74a7eb2.tar.bz2 minetest-e8286e8894cf132eeda4bac9924e5fd8c74a7eb2.zip | |
Set placer to nil instead of a non-functional one in item_OnPlace (#6449)
* Set placer to nil instead of a non-functional one
This requires nil checks in core.rotate_node and core.rotate_and_place.
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/common/misc_helpers.lua | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua index 1e282f886..51abed1be 100644 --- a/builtin/common/misc_helpers.lua +++ b/builtin/common/misc_helpers.lua @@ -349,7 +349,7 @@ if INIT == "game" then itemstack, pointed_thing) return end - local fdir = core.dir_to_facedir(placer:get_look_dir()) + local fdir = placer and core.dir_to_facedir(placer:get_look_dir()) or 0 local wield_name = itemstack:get_name() local above = pointed_thing.above @@ -369,9 +369,9 @@ if INIT == "game" then iswall = false end - if core.is_protected(pos, placer:get_player_name()) then - core.record_protection_violation(pos, - placer:get_player_name()) + local name = placer and placer:get_player_name() or "" + if core.is_protected(pos, name) then + core.record_protection_violation(pos, name) return end @@ -432,9 +432,11 @@ if INIT == "game" then end core.rotate_node = function(itemstack, placer, pointed_thing) + local name = placer and placer:get_player_name() or "" + local invert_wall = placer and placer:get_player_control().sneak or false core.rotate_and_place(itemstack, placer, pointed_thing, - is_creative(placer:get_player_name()), - {invert_wall = placer:get_player_control().sneak}) + is_creative(name), + {invert_wall = invert_wall}) return itemstack end end |