From 5faf06012289eb3f3431a284e0e200c306b092ae Mon Sep 17 00:00:00 2001
From: ancientmarinerdev <ancientmariner_dev@proton.me>
Date: Mon, 2 Jan 2023 00:54:08 +0000
Subject: [PATCH] Fix crash and remove unused duplicate variables

---
 mods/ENTITIES/mcl_mobs/api.lua         | 14 --------------
 mods/ENTITIES/mcl_mobs/breeding.lua    |  1 -
 mods/ENTITIES/mcl_mobs/combat.lua      | 12 ++++++++++++
 mods/ENTITIES/mcl_mobs/movement.lua    |  1 -
 mods/ENTITIES/mcl_mobs/pathfinding.lua |  1 -
 mods/ENTITIES/mcl_mobs/physics.lua     |  3 +--
 6 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/mods/ENTITIES/mcl_mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua
index 46e113c54..e280bc5d8 100644
--- a/mods/ENTITIES/mcl_mobs/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api.lua
@@ -2,8 +2,6 @@ local mob_class = mcl_mobs.mob_class
 local mob_class_meta = {__index = mcl_mobs.mob_class}
 local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
 -- API for Mobs Redo: MineClone 2 Edition (MRM)
-local MAX_MOB_NAME_LENGTH = 30
-local DEFAULT_FALL_SPEED = -9.81*1.5
 
 local PATHFINDING = "gowp"
 
@@ -17,21 +15,9 @@ local function mcl_log (message)
 	end
 end
 
-
 -- Invisibility mod check
 mcl_mobs.invis = {}
 
--- localize math functions
-local atann = math.atan
-
-local function atan(x)
-	if not x or x ~= x then
-		return 0
-	else
-		return atann(x)
-	end
-end
-
 local remove_far = true
 local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
 local spawn_protected = minetest.settings:get_bool("mobs_spawn_protected") ~= false
diff --git a/mods/ENTITIES/mcl_mobs/breeding.lua b/mods/ENTITIES/mcl_mobs/breeding.lua
index 9284163cd..33e05f23b 100644
--- a/mods/ENTITIES/mcl_mobs/breeding.lua
+++ b/mods/ENTITIES/mcl_mobs/breeding.lua
@@ -1,7 +1,6 @@
 local math, vector, minetest, mcl_mobs = math, vector, minetest, mcl_mobs
 local mob_class = mcl_mobs.mob_class
 
-local MAX_MOB_NAME_LENGTH = 30
 local HORNY_TIME = 30
 local HORNY_AGAIN_TIME = 300
 local CHILD_GROW_TIME = 60*20
diff --git a/mods/ENTITIES/mcl_mobs/combat.lua b/mods/ENTITIES/mcl_mobs/combat.lua
index 24eb2f290..f60384517 100644
--- a/mods/ENTITIES/mcl_mobs/combat.lua
+++ b/mods/ENTITIES/mcl_mobs/combat.lua
@@ -8,6 +8,18 @@ local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
 local stuck_timeout = 3 -- how long before mob gets stuck in place and starts searching
 local stuck_path_timeout = 10 -- how long will mob follow path before giving up
 
+local enable_pathfinding = true
+
+local atann = math.atan
+local function atan(x)
+	if not x or x ~= x then
+		return 0
+	else
+		return atann(x)
+	end
+end
+
+
 -- check if daytime and also if mob is docile during daylight hours
 function mob_class:day_docile()
 	if self.docile_by_day == false then
diff --git a/mods/ENTITIES/mcl_mobs/movement.lua b/mods/ENTITIES/mcl_mobs/movement.lua
index 753f79281..11a1de092 100644
--- a/mods/ENTITIES/mcl_mobs/movement.lua
+++ b/mods/ENTITIES/mcl_mobs/movement.lua
@@ -4,7 +4,6 @@ local DEFAULT_FALL_SPEED = -9.81*1.5
 local FLOP_HEIGHT = 6
 local FLOP_HOR_SPEED = 1.5
 local PATHFINDING = "gowp"
-local enable_pathfinding = true
 
 local node_ice = "mcl_core:ice"
 local node_snowblock = "mcl_core:snowblock"
diff --git a/mods/ENTITIES/mcl_mobs/pathfinding.lua b/mods/ENTITIES/mcl_mobs/pathfinding.lua
index 6cb37434f..495d23cd4 100644
--- a/mods/ENTITIES/mcl_mobs/pathfinding.lua
+++ b/mods/ENTITIES/mcl_mobs/pathfinding.lua
@@ -3,7 +3,6 @@ local mob_class = mcl_mobs.mob_class
 
 local LOGGING_ON = minetest.settings:get_bool("mcl_logging_mobs_villager",false)
 local PATHFINDING = "gowp"
-local enable_pathfinding = true
 
 local LOG_MODULE = "[Mobs]"
 local function mcl_log (message)
diff --git a/mods/ENTITIES/mcl_mobs/physics.lua b/mods/ENTITIES/mcl_mobs/physics.lua
index 0dfc3a800..0617fd1e8 100644
--- a/mods/ENTITIES/mcl_mobs/physics.lua
+++ b/mods/ENTITIES/mcl_mobs/physics.lua
@@ -5,8 +5,7 @@ local ENTITY_CRAMMING_MAX = 24
 local CRAMMING_DAMAGE = 3
 local DEATH_DELAY = 0.5
 local DEFAULT_FALL_SPEED = -9.81*1.5
-local FLOP_HEIGHT = 6
-local FLOP_HOR_SPEED = 1.5
+
 local PATHFINDING = "gowp"
 local mobs_debug = minetest.settings:get_bool("mobs_debug", false)
 local mobs_drop_items = minetest.settings:get_bool("mobs_drop_items") ~= false