From 822e78fd32a2c4985c27ae0ab65ae01da0597422 Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Fri, 23 Feb 2024 17:09:42 +0000
Subject: [PATCH] tweak player detection (thx whosit)

---
 api.lua     | 38 ++++++++++++++++++--------------------
 spawner.lua | 18 ++++++++++--------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/api.lua b/api.lua
index c0f358b..ab4f27f 100644
--- a/api.lua
+++ b/api.lua
@@ -14,7 +14,7 @@ local use_vh1 = minetest.get_modpath("visual_harm_1ndicators")
 -- Global
 mobs = {
 	mod = "redo",
-	version = "20240220",
+	version = "20240223",
 	translate = S,
 	invis = minetest.global_exists("invisibility") and invisibility or {},
 	node_snow = minetest.registered_aliases["mapgen_snow"]
@@ -265,14 +265,16 @@ function mob_class:collision()
 	local x, z = 0, 0
 	local prop = self.object:get_properties()
 	local width = -prop.collisionbox[1] + prop.collisionbox[4] + 0.5
+	local pos2, vec, force
 
-	for _,object in pairs(minetest.get_objects_inside_radius(pos, width)) do
+	for _,player in pairs(minetest.get_connected_players()) do
 
-		if is_player(object) then
+		pos2 = player:get_pos()
 
-			local pos2 = object:get_pos()
-			local vec  = {x = pos.x - pos2.x, z = pos.z - pos2.z}
-			local force = (width + 0.5) - vector.distance(
+		if pos2:distance(pos) < width then
+
+			vec  = {x = pos.x - pos2.x, z = pos.z - pos2.z}
+			force = (width + 0.5) - vector.distance(
 				{x = pos.x, y = 0, z = pos.z},
 				{x = pos2.x, y = 0, z = pos2.z})
 
@@ -281,6 +283,7 @@ function mob_class:collision()
 		end
 	end
 
+
 	return({x, z})
 end
 
@@ -2243,12 +2246,13 @@ function mob_class:do_states(dtime)
 
 			local lp
 			local s = self.object:get_pos()
-			local objs = minetest.get_objects_inside_radius(s, 3)
 
-			for n = 1, #objs do
+			for _,player in pairs(minetest.get_connected_players()) do
 
-				if is_player(objs[n]) then
-					lp = objs[n]:get_pos()
+				local player_pos = player:get_pos()
+
+				if player_pos:distance(s) <= 3 then
+					lp = player_pos
 					break
 				end
 			end
@@ -3334,14 +3338,10 @@ function mob_class:mob_expire(pos, dtime)
 		if self.lifetimer <= 0 then
 
 			-- only despawn away from player
-			local objs = minetest.get_objects_inside_radius(pos, 15)
-
-			for n = 1, #objs do
-
-				if is_player(objs[n]) then
+			for _,player in pairs(minetest.get_connected_players()) do
 
+				if player:get_pos():distance(pos) <= 15 then
 					self.lifetimer = 20
-
 					return
 				end
 			end
@@ -4064,11 +4064,9 @@ function mobs:spawn_specific(name, nodes, neighbors, min_light, max_light, inter
 		end
 
 		-- only spawn a set distance away from player
-		local objs = minetest.get_objects_inside_radius(pos, mob_nospawn_range)
+		for _,player in pairs(minetest.get_connected_players()) do
 
-		for n = 1, #objs do
-
-			if is_player(objs[n]) then
+			if player:get_pos():distance(pos) <= mob_nospawn_range then
 --print("--- player too close", name)
 				return
 			end
diff --git a/spawner.lua b/spawner.lua
index ddf6979..e287081 100644
--- a/spawner.lua
+++ b/spawner.lua
@@ -97,7 +97,7 @@ minetest.register_abm({
 	label = "Mob spawner node",
 	nodenames = {"mobs:spawner"},
 	interval = 10,
-	chance = 4,
+	chance = 1,--4,
 	catch_up = false,
 
 	action = function(pos, node, active_object_count, active_object_count_wider)
@@ -150,24 +150,26 @@ minetest.register_abm({
 			return
 		end
 
-		-- spawn mob if player detected and in range
+		-- when player distance above 0, spawn mob if player detected and in range
 		if pla > 0 then
 
-			local in_range = 0
-			local objsp = minetest.get_objects_inside_radius(pos, pla)
+			local in_range, player
+			local players = minetest.get_connected_players()
 
-			for _, oir in pairs(objsp) do
+			for i = 1, #players do
 
-				if is_player(oir) then
+				player = players[i]
 
-					in_range = 1
+				if player:get_pos():distance(pos) <= pla then
+
+					in_range = true
 
 					break
 				end
 			end
 
 			-- player not found
-			if in_range == 0 then
+			if not in_range then
 				return
 			end
 		end