From 8cf0660f37a35afa7dc6b9c45f1fe409fec165c1 Mon Sep 17 00:00:00 2001
From: teknomunk <teknomunk@protonmail.com>
Date: Sun, 30 Jun 2024 11:01:46 -0500
Subject: [PATCH] Fix passive spawning, disable some debug logging

---
 mods/ENTITIES/mcl_mobs/spawning.lua | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/spawning.lua
index 530e1192f..9a2b1f2cc 100644
--- a/mods/ENTITIES/mcl_mobs/spawning.lua
+++ b/mods/ENTITIES/mcl_mobs/spawning.lua
@@ -582,7 +582,12 @@ local function initial_spawn_check(state, node, spawn_def)
 	local function log_fail(reason)
 		local count = (counts[reason] or 0) + 1
 		counts[reason] = count
-		--minetest.log("Spawn check for "..tostring(spawn_def and spawn_def.name).." failed - "..reason.." ("..count..")")
+		if logging then
+			minetest.log("Spawn check for "..tostring(spawn_def and spawn_def.name).." failed - "..reason.." ("..count..") "..dump({
+				state = state,
+				node = node,
+			}))
+		end
 		return false
 	end
 
@@ -665,6 +670,9 @@ local function build_state_for_position(pos, parent_state)
 	local node = get_node(pos)
 	local node_name = node.name
 
+	-- Make sure we can spawn here
+	if not node or node_name == "ignore" or node_name == "mcl_core:bedrock" then return end
+
 	-- Check if it's ground
 	local is_water = get_item_group(node_name, "water") ~= 0
 	local is_ground = false
@@ -673,14 +681,12 @@ local function build_state_for_position(pos, parent_state)
 		if not is_ground then
 			pos.y = pos.y - 1
 			node = get_node(pos)
+			node_name = node.name
 			is_ground = get_item_group(node_name,"solid") ~= 0
 		end
 		pos.y = pos.y + 1
 	end
 
-	-- Make sure we can spawn here
-	if not node or node_name == "ignore" or node_name == "mcl_core:bedrock" then return end
-
 	-- Build spawn state data
 	local state = {
 		spawn_hostile = true,
@@ -692,8 +698,8 @@ local function build_state_for_position(pos, parent_state)
 	state.dimension = dimension
 
 	state.is_ground = is_ground and get_item_group(node_name, "leaves") == 0
-	state.grass = get_item_group(node_name, "grass_block") ~= 0
-	state.water = is_water
+	state.is_grass = get_item_group(node_name, "grass_block") ~= 0
+	state.is_water = is_water
 
 	-- Check light level
 	local gotten_light = get_node_light(pos)
@@ -904,13 +910,13 @@ if mobs_spawn then
 		end
 
 		local mob_chance_offset = math_random(1, 1e6) / 1e6 * cumulative_chance
-		minetest.log("action", "mob_chance_offset = "..tostring(mob_chance_offset).."/"..tostring(cumulative_chance))
+		--minetest.log("action", "mob_chance_offset = "..tostring(mob_chance_offset).."/"..tostring(cumulative_chance))
 
 		for i = 1,#spawn_table do
 			local mob_def = spawn_table[i]
 			local mob_chance = mob_def.chance
 			if mob_chance_offset <= mob_chance then
-				minetest.log(mob_def.name.." "..mob_chance)
+				--minetest.log(mob_def.name.." "..mob_chance)
 				return mob_def
 			end