diff options
| author | SmallJoker <SmallJoker@users.noreply.github.com> | 2018-03-29 21:44:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-29 21:44:13 +0200 |
| commit | 8f827ee6800974ee451f0e82ac5eafdff63b835e (patch) | |
| tree | ac8d57b47b1a1593a72ad90005aa5b7a38a53e37 /builtin | |
| parent | 376ed5cd3c0c61135230a2a14b873436d551d266 (diff) | |
| download | minetest-8f827ee6800974ee451f0e82ac5eafdff63b835e.tar.gz minetest-8f827ee6800974ee451f0e82ac5eafdff63b835e.tar.bz2 minetest-8f827ee6800974ee451f0e82ac5eafdff63b835e.zip | |
core.rotate_node: Do not trigger after_place_node (#6900)
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/common/misc_helpers.lua | 6 | ||||
| -rw-r--r-- | builtin/game/item.lua | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/builtin/common/misc_helpers.lua b/builtin/common/misc_helpers.lua index 88bae2b0b..aa118b443 100644 --- a/builtin/common/misc_helpers.lua +++ b/builtin/common/misc_helpers.lua @@ -341,7 +341,7 @@ if INIT == "game" then local dirs2 = {20, 23, 22, 21} function core.rotate_and_place(itemstack, placer, pointed_thing, - infinitestacks, orient_flags) + infinitestacks, orient_flags, prevent_after_place) orient_flags = orient_flags or {} local unode = core.get_node_or_nil(pointed_thing.under) @@ -394,7 +394,7 @@ if INIT == "game" then local old_itemstack = ItemStack(itemstack) local new_itemstack, removed = core.item_place_node( - itemstack, placer, pointed_thing, param2 + itemstack, placer, pointed_thing, param2, prevent_after_place ) return infinitestacks and old_itemstack or new_itemstack end @@ -415,7 +415,7 @@ if INIT == "game" then local invert_wall = placer and placer:get_player_control().sneak or false core.rotate_and_place(itemstack, placer, pointed_thing, is_creative(name), - {invert_wall = invert_wall}) + {invert_wall = invert_wall}, true) return itemstack end end diff --git a/builtin/game/item.lua b/builtin/game/item.lua index a7176711f..8fbe5b672 100644 --- a/builtin/game/item.lua +++ b/builtin/game/item.lua @@ -261,7 +261,8 @@ local function make_log(name) return name ~= "" and core.log or function() end end -function core.item_place_node(itemstack, placer, pointed_thing, param2) +function core.item_place_node(itemstack, placer, pointed_thing, param2, + prevent_after_place) local def = itemstack:get_definition() if def.type ~= "node" or pointed_thing.type ~= "node" then return itemstack, false @@ -375,7 +376,7 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2) local take_item = true -- Run callback - if def.after_place_node then + if def.after_place_node and not prevent_after_place then -- Deepcopy place_to and pointed_thing because callback can modify it local place_to_copy = {x=place_to.x, y=place_to.y, z=place_to.z} local pointed_thing_copy = copy_pointed_thing(pointed_thing) |