From cea6d159659407445786e9b166f223567b863927 Mon Sep 17 00:00:00 2001
From: Jordan Leppert <jordanleppert@gmail.com>
Date: Mon, 14 Feb 2022 16:18:07 +0000
Subject: [PATCH] Spawning fixes: 1. Spawning radius fixed, we now have a cubic
 max radius mobs will spawn within, and a spherical min radius mobs won't
 spawn within. 2. Node light check fixed - we need to check the node above the
 spawn node, otherwise it always returns zero.

---
 spawning.lua | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/spawning.lua b/spawning.lua
index 20c6cb0..949733a 100644
--- a/spawning.lua
+++ b/spawning.lua
@@ -66,7 +66,7 @@ end
 function creatura.register_mob_spawn(name, def)
     local spawn = {
         chance = def.chance or 5,
-        min_radius = def.min_height or nil,
+        min_radius = def.min_radius or nil,
         max_radius = def.max_radius or nil,
         min_height = def.min_height or 0,
         max_height = def.max_height or 128,
@@ -132,7 +132,7 @@ local spawn_queue = {}
 
 local min_spawn_radius = 16
 
-local min_spawn_radius = 64
+local max_spawn_radius = 64
 
 function execute_spawns(player)
     if not player:get_pos() then return end
@@ -144,11 +144,16 @@ function execute_spawns(player)
         local spawn = creatura.registered_mob_spawns[mob]
         if not spawn
         or random(spawn.chance) > 1 then return end
+        local max_radius = spawn.max_radius or max_spawn_radius
+        local min_radius = spawn.min_radius or min_spawn_radius
         local spawn_pos_center = {
-            x = pos.x + random(-min_spawn_radius, spawn.min_radius or min_spawn_radius),
+            x = pos.x + random(-max_radius, max_radius),
             y = pos.y,
-            z = pos.z + random(-min_spawn_radius, spawn.max_radius or min_spawn_radius)
+            z = pos.z + random(-max_radius, max_radius)
         }
+        if vector.distance(pos, spawn_pos_center) < min_radius then
+            return
+        end
         local index_func
         if spawn.spawn_in_nodes then
             index_func = minetest.find_nodes_in_area
@@ -159,7 +164,7 @@ function execute_spawns(player)
         if type(spawn_on) == "string" then
             spawn_on = {spawn_on}
         end
-        local spawn_y_array = index_func(vec_raise(spawn_pos_center, -8), vec_raise(spawn_pos_center, 8), spawn_on)
+        local spawn_y_array = index_func(vec_raise(spawn_pos_center, -max_radius), vec_raise(spawn_pos_center, max_radius), spawn_on)
         if spawn_y_array[1] then
             local spawn_pos = spawn_y_array[1]
 
@@ -168,7 +173,7 @@ function execute_spawns(player)
                 return
             end
 
-            local light = minetest.get_node_light(spawn_pos) or 7
+            local light = minetest.get_node_light(vec_raise(spawn_pos, 1)) or 7
 
             if light > spawn.max_light
             or light < spawn.min_light then