Luanti/minetest_game
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

solve mergeconflicts

Browse source 
* tmp drop farming+boats
    * correct tnt
    * drop original readme.txt
This commit is contained in:
Milan* 2017-03-11 13:09:26 +01:00
commit c836129bff
78 changed files with 1432 additions and 383 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mods/screwdriver/init.lua
View file

@ -52,7 +52,8 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses)
local new_param2 = preservePart + rotationPart
local should_rotate = true
if ndef and ndef.on_rotate then -- Node provides a handler, so let the handler decide instead if the node can be rotated
-- Node provides a handler, so let the handler decide instead if the node can be rotated
if ndef and ndef.on_rotate then
-- Copy pos and node because callback can modify it
local result = ndef.on_rotate(vector.new(pos),
{name = node.name, param1 = node.param1, param2 = node.param2},
@ -66,7 +67,7 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses)
if not ndef or not ndef.paramtype2 == "facedir" or
ndef.on_rotate == false or
(ndef.drawtype == "nodebox" and
not ndef.node_box.type == "fixed") or
(ndef.node_box and ndef.node_box.type ~= "fixed")) or
node.param2 == nil then
return
end