From 5866983bf5facb5d7bc9a39fff2c1badd28f92f6 Mon Sep 17 00:00:00 2001
From: ancientmarinerdev <ancientmariner_dev@proton.me>
Date: Wed, 2 Nov 2022 23:06:10 +0000
Subject: [PATCH] Villager will try to take the job block closest to them

---
 mods/ENTITIES/mobs_mc/villager.lua | 56 ++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 19 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index 440a5d127..b256d3de1 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -847,6 +847,7 @@ end
 local function look_for_job(self, requested_jobsites)
 	mcl_log("Looking for jobs")
 
+	-- This logic is done twice. Remove this.
 	local looking_for_type = jobsites
 	if requested_jobsites then
 		--mcl_log("Looking for jobs of my type: " .. tostring(requested_jobsites))
@@ -858,34 +859,51 @@ local function look_for_job(self, requested_jobsites)
 	local p = self.object:get_pos()
 	local nn = minetest.find_nodes_in_area(vector.offset(p,-48,-48,-48),vector.offset(p,48,48,48), looking_for_type)
 
+	local distance_to_closest_block = nil
+	local closest_block = nil
+
 	--Ideally should check for closest available. It'll make pathing easier.
-	for _,n in pairs(nn) do
+	for i,n in pairs(nn) do
 		local m = minetest.get_meta(n)
-		--mcl_log("Job owner: ".. m:get_string("villager"))
+		mcl_log("Block: " .. minetest.pos_to_string(n).. "Job owner: ".. m:get_string("villager"))
 
 		if m:get_string("villager") == "" then
-			mcl_log("It's a free job for me (".. minetest.pos_to_string(p) .. ")! I might be interested: "..minetest.pos_to_string(n) )
+			-- Distance check
+			local distance_to_block = vector.distance(self.object:get_pos(), n)
+			mcl_log("Distance to block ".. i .. ": ".. distance_to_block)
 
-			local gp = mcl_mobs:gopath(self,n,function(self)
-				mcl_log("Arrived at block callback")
-				if self and self.state == "stand" then
-					self.order = WORK
-				else
-					mcl_log("no self. passing param to callback failed")
-				end
-
-			end)
-			if gp then
-				if n then
-					mcl_log("We can path to this block.. " .. tostring(n))
-				end
-				return n
-			else
-				mcl_log("We could not path to block or it's not ready to path yet.")
+			if not distance_to_closest_block or distance_to_closest_block > distance_to_block then
+				mcl_log("This block is closer than the last.")
+				closest_block = n
+				distance_to_closest_block = distance_to_block
 			end
 		end
 	end
 
+	if closest_block then
+		mcl_log("It's a free job for me (" .. minetest.pos_to_string(p) .. ")! I might be interested: ".. minetest.pos_to_string(closest_block) )
+
+		local gp = mcl_mobs:gopath(self, closest_block,function(self)
+			mcl_log("Arrived at block callback")
+			if self and self.state == "stand" then
+				self.order = WORK
+			else
+				mcl_log("no self. passing param to callback failed")
+			end
+		end)
+
+		if gp then
+			if closest_block then
+				mcl_log("We can path to this block.. " .. tostring(closest_block))
+			end
+			return closest_block
+		else
+			mcl_log("We could not path to block or it's not ready to path yet.")
+		end
+	else
+		mcl_log("We don't have a job block to path to")
+	end
+
 	return nil
 end