Merge pull request #297 from t4im/fix/drill_pointed_thing

Vanessa Ezekowitz

2017-03-06 05dfc14fdb487857052524e7324d2f2f278e9976

 technic/tools/mining_drill.lua

@@ -8,7 +8,7 @@
   recipe = {
      {'moreores:tin_ingot',            'technic:diamond_drill_head', 'moreores:tin_ingot'},
      {'technic:stainless_steel_ingot', 'technic:motor',              'technic:stainless_steel_ingot'},
      {'',                              'technic:red_energy_crystal', 'moreores:copper_ingot'},
      {'',                              'technic:red_energy_crystal', 'default:copper_ingot'},
   }
})
minetest.register_craft({
@@ -51,12 +51,12 @@
      minetest.record_protection_violation(pos, player:get_player_name())
      return
   end
   local node=minetest.env:get_node(pos)
   local node=minetest.get_node(pos)
   if node.name == "air" or node.name == "ignore" then return end
   if node.name == "default:lava_source" then return end
   if node.name == "default:lava_flowing" then return end
   if node.name == "default:water_source" then minetest.env:remove_node(pos) return end
   if node.name == "default:water_flowing" then minetest.env:remove_node(pos) return end
   if node.name == "default:water_source" then minetest.remove_node(pos) return end
   if node.name == "default:water_flowing" then minetest.remove_node(pos) return end
   minetest.node_dig(pos,node,player)
end

@@ -230,7 +230,7 @@
end

local function pos_is_pointable(pos)
   local node = minetest.env:get_node(pos)
   local node = minetest.get_node(pos)
   local nodedef = minetest.registered_nodes[node.name]
   return nodedef and nodedef.pointable
end
@@ -252,10 +252,9 @@
   mode=mode+1
   if mode>=5 then mode=1 end
   minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(2, mode)..": "..mining_drill_mode_text[mode][1])
   item["name"]="technic:mining_drill_mk2_"..mode
    itemstack:set_name("technic:mining_drill_mk2_"..mode);
   meta["mode"]=mode
   item["metadata"]=minetest.serialize(meta)
   itemstack:replace(item)
    itemstack:set_metadata(minetest.serialize(meta))
   return itemstack
end

@@ -276,10 +275,9 @@
   mode=mode+1
   if mode>=6 then mode=1 end
   minetest.chat_send_player(player_name, S("Mining Drill Mk%d Mode %d"):format(3, mode)..": "..mining_drill_mode_text[mode][1])
   item["name"]="technic:mining_drill_mk3_"..mode
    itemstack:set_name("technic:mining_drill_mk3_"..mode);
   meta["mode"]=mode
   item["metadata"]=minetest.serialize(meta)
   itemstack:replace(item)
    itemstack:set_metadata(minetest.serialize(meta))
   return itemstack
end

@@ -296,11 +294,13 @@
   end
   local charge_to_take = cost_to_use(2, meta.mode)
   if meta.charge >= charge_to_take then
      local pos = minetest.get_pointed_thing_position(pointed_thing, above)
      local pos = minetest.get_pointed_thing_position(pointed_thing, false)
      drill_dig_it(pos, user, meta.mode)
      meta.charge = meta.charge - charge_to_take
      itemstack:set_metadata(minetest.serialize(meta))
      technic.set_RE_wear(itemstack, meta.charge, max_charge[2])
      if not technic.creative_mode then
         meta.charge = meta.charge - charge_to_take
         itemstack:set_metadata(minetest.serialize(meta))
         technic.set_RE_wear(itemstack, meta.charge, max_charge[2])
      end
   end
   return itemstack
end
@@ -317,11 +317,13 @@
   end
   local charge_to_take = cost_to_use(3, meta.mode)
   if meta.charge >= charge_to_take then
      local pos = minetest.get_pointed_thing_position(pointed_thing, above)
      local pos = minetest.get_pointed_thing_position(pointed_thing, false)
      drill_dig_it(pos, user, meta.mode)
      meta.charge = meta.charge - charge_to_take
      itemstack:set_metadata(minetest.serialize(meta))
      technic.set_RE_wear(itemstack, meta.charge, max_charge[3])
      if not technic.creative_mode then
         meta.charge = meta.charge - charge_to_take
         itemstack:set_metadata(minetest.serialize(meta))
         technic.set_RE_wear(itemstack, meta.charge, max_charge[3])
      end
   end
   return itemstack
end
@@ -344,11 +346,13 @@
      end
      local charge_to_take = cost_to_use(1, 1)
      if meta.charge >= charge_to_take then
         local pos = minetest.get_pointed_thing_position(pointed_thing, above)
         local pos = minetest.get_pointed_thing_position(pointed_thing, false)
         drill_dig_it(pos, user, 1)
         meta.charge = meta.charge - charge_to_take
         itemstack:set_metadata(minetest.serialize(meta))
         technic.set_RE_wear(itemstack, meta.charge, max_charge[1])
         if not technic.creative_mode then
            meta.charge = meta.charge - charge_to_take
            itemstack:set_metadata(minetest.serialize(meta))
            technic.set_RE_wear(itemstack, meta.charge, max_charge[1])
         end
      end
      return itemstack
   end,