mobs definition.runaway_from can also contain node names

mods/ENTITIES/mcl_mobs/api.txt

@@ -128,7 +128,7 @@ functions needed for the mob to work properly which contains the following:
 						 arrow/fireball appears on mob.
 	'specific_attack'	 has a table of entity names that mob can also attack
 						 e.g. {"player", "mobs_animal:chicken"}.
-	'runaway_from'		contains a table with mob names to run away from, add
+	'runaway_from'		contains a table with mob/node names to run away from, add
 						 "player" to list to runaway from player also.
 	'pathfinding'		 set to 1 for mobs to use pathfinder feature to locate
 						 player, set to 2 so they can build/break also (only

mods/ENTITIES/mcl_mobs/movement.lua

@@ -595,15 +595,6 @@ end
 
 -- specific runaway
 local specific_runaway = function(list, what)
-	if type(list) ~= "table" then
-		list = {}
-	end
-
-	-- no list so do not run
-	if list == nil then
-		return false
-	end
-
 	-- found entity on list to attack?
 	for no = 1, #list do
 
@@ -621,33 +612,37 @@ function mob_class:check_runaway_from()
 	if not self.runaway_from and self.state ~= "flop" then
 		return
 	end
+	if type(self.runaway_from) ~= "table" then
+		return
+	end
 
 	local s = self.object:get_pos()
-	local p, sp, dist
-	local player, obj, min_player
-	local type, name = "", ""
 	local min_dist = self.view_range + 1
 	local objs = minetest.get_objects_inside_radius(s, self.view_range)
+	local runaway_pos = nil
 
 	for n = 1, #objs do
+		local name = ""
+		local player
 
 		if objs[n]:is_player() then
 
-			if mcl_mobs.invis[ objs[n]:get_player_name() ]
+			if not (mcl_mobs.invis[ objs[n]:get_player_name() ]
 			or self.owner == objs[n]:get_player_name()
-			or (not self:object_in_range(objs[n])) then
-				type = ""
-			else
+			or (not self:object_in_range(objs[n]))) then
 				player = objs[n]
-				type = "player"
 				name = "player"
+				if not (name ~= self.name
+				and specific_runaway(self.runaway_from, name)) then
+					local item = player:get_wielded_item()
+					name = item:get_name() or ""
+				end
 			end
 		else
-			obj = objs[n]:get_luaentity()
+			local obj = objs[n]:get_luaentity()
 
 			if obj then
 				player = obj.object
-				type = obj.type
 				name = obj.name or ""
 			end
 		end
@@ -656,37 +651,38 @@ function mob_class:check_runaway_from()
 		if name ~= "" and name ~= self.name
 		and specific_runaway(self.runaway_from, name) then
 
-			p = player:get_pos()
-			sp = s
-
-			-- aim higher to make looking up hills more realistic
-			p.y = p.y + 1
-			sp.y = sp.y + 1
-
-			dist = vector.distance(p, s)
-
+			local p = player:get_pos()
+			local dist = vector.distance(p, s)
 
 			-- choose closest player/mpb to runaway from
 			if dist < min_dist
-			and self:line_of_sight(sp, p, 2) == true then
+			-- aim higher to make looking up hills more realistic
+			and self:line_of_sight(vector.offset(s, 0,1,0), vector.offset(p, 0,1,0), 2) == true then
 				min_dist = dist
-				min_player = player
+				runaway_pos = p
 			end
 		end
 	end
 
-	if min_player then
+	if not runaway_pos then
 
-		local lp = player:get_pos()
-		local vec = {
-			x = lp.x - s.x,
-			y = lp.y - s.y,
-			z = lp.z - s.z
-		}
+		-- find specific node to runaway from
+		local p = minetest.find_node_near(s, self.view_range, self.runaway_from, true)
+		local dist = p and vector.distance(p, s)
+		if dist and dist < min_dist
+		--and minetest.line_of_sight(s, p) == true then
+		and self:line_of_sight(s, p) == true then
+			min_dist = dist
+			runaway_pos = p
+		end
+	end
 
+	if runaway_pos then
+
+		local vec = vector.subtract(runaway_pos, s)
 		local yaw = (atan(vec.z / vec.x) + 3 *math.pi/ 2) - self.rotate
 
-		if lp.x > s.x then
+		if runaway_pos.x > s.x then
 			yaw = yaw + math.pi
 		end