From 2922421f4a88e56a0a1c819f62bf2bc287835388 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Thu, 1 Dec 2016 04:22:40 -0500
Subject: Update several mods:

biome_lib, boost_cart, building_blocks, castle, homedecor, glooptest,
currency, roads, invsaw, maptools, mesecons, moreblocks, nixie_tubes,
pipeworks, signs_lib, technic, unified_inventory, unifiedbricks, worldedit,
xban2
---
 technic/machines/MV/wind_mill.lua | 21 ++++++++++++++-------
 technic/machines/other/frames.lua |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'technic/machines')

diff --git a/technic/machines/MV/wind_mill.lua b/technic/machines/MV/wind_mill.lua
index 1377c67..28a075d 100644
--- a/technic/machines/MV/wind_mill.lua
+++ b/technic/machines/MV/wind_mill.lua
@@ -33,8 +33,15 @@ local function check_wind_mill(pos)
 	if pos.y < 30 then
 		return false
 	end
+	pos = {x=pos.x, y=pos.y, z=pos.z}
 	for i = 1, 20 do
-		local node = minetest.get_node({x=pos.x, y=pos.y-i, z=pos.z})
+		pos.y = pos.y - 1
+		local node = minetest.get_node_or_nil(pos)
+		if not node then
+			-- we reached CONTENT_IGNORE, we can assume, that nothing changed
+			-- as the user will have to load the block to change it
+			return
+		end
 		if node.name ~= "technic:wind_mill_frame" then
 			return false
 		end
@@ -45,17 +52,17 @@ end
 local run = function(pos, node)
 	local meta = minetest.get_meta(pos)
 	local machine_name = S("Wind %s Generator"):format("MV")
-	local power = math.min(pos.y * 100, 5000)
 
-	if not check_wind_mill(pos) then
+	local check = check_wind_mill(pos)
+	if check == false then
 		meta:set_int("MV_EU_supply", 0)
 		meta:set_string("infotext", S("%s Improperly Placed"):format(machine_name))
-		return
-	else
+	elseif check == true then
+		local power = math.min(pos.y * 100, 5000)
 		meta:set_int("MV_EU_supply", power)
+		meta:set_string("infotext", S("@1 (@2 EU)", machine_name, technic.pretty_num(power)))
 	end
-
-	meta:set_string("infotext", S("@1 (@2 EU)", machine_name, technic.pretty_num(power)))
+	-- check == nil: assume nothing has changed
 end
 
 minetest.register_node("technic:wind_mill", {
diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua
index b3f39b9..2d630a2 100644
--- a/technic/machines/other/frames.lua
+++ b/technic/machines/other/frames.lua
@@ -320,7 +320,7 @@ local nodeboxes= {
 			else
 				--local pointed_thing = {type = "node", under = pos}
 				if pointed_thing then
-					minetest.item_place_node(itemstack, placer, pointed_thing)
+					return minetest.item_place_node(itemstack, placer, pointed_thing)
 				end
 			end
 		end,
-- 
cgit v1.2.3