only check protection if node can be dug by quarry

This commit is contained in:
OgelGames 2020-06-12 20:51:27 +10:00
parent 309f12b5ac
commit 449c772f76

View File

@ -133,15 +133,15 @@ local function quarry_handle_purge(pos)
end
end
local function can_dig_node(pos, node, digger)
if node.name == "air" or node.name == "vacuum:vacuum" then
local function can_dig_node(pos, node_name, owner, digger)
if node_name == "air" or node_name == "vacuum:vacuum" then
return false
end
local def = minetest.registered_nodes[node.name]
if not def or not def.diggable then
local def = minetest.registered_nodes[node_name]
if not def or not def.diggable or (def.can_dig and not def.can_dig(pos, digger)) then
return false
end
if def.can_dig and not def.can_dig(pos, digger) then
if minetest.is_protected(dig_pos, owner) then
return false
end
return true
@ -203,9 +203,8 @@ local function execute_dig(pos, node, meta)
meta:set_int("purge_on", 1)
break
end
if not minetest.is_protected(dig_pos, owner) then
local dig_node = technic.get_or_load_node(dig_pos) or minetest.get_node(dig_pos)
if can_dig_node(dig_pos, dig_node, digger) then
if can_dig_node(dig_pos, dig_node.name, owner, digger) then
-- found something to dig, dig it and stop searching
minetest.remove_node(dig_pos)
local inv = meta:get_inventory()
@ -225,7 +224,6 @@ local function execute_dig(pos, node, meta)
end
break
end
end
us_used = minetest.get_us_time() - t0
end
meta:set_int("dig_index", dig_index)