From 73491efaca2cdd4c1cdb7d4a2f8e2a85ed5866df Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Tue, 8 Aug 2023 16:33:35 +0100
Subject: [PATCH] 5.x

---
 mobs_bat/depends.txt       |  2 --
 mobs_birds/depends.txt     |  2 --
 mobs_butterfly/depends.txt |  2 --
 mobs_butterfly/init.lua    | 23 +++++++++++++++--------
 4 files changed, 15 insertions(+), 14 deletions(-)
 delete mode 100644 mobs_bat/depends.txt
 delete mode 100644 mobs_birds/depends.txt
 delete mode 100644 mobs_butterfly/depends.txt

diff --git a/mobs_bat/depends.txt b/mobs_bat/depends.txt
deleted file mode 100644
index cc03398..0000000
--- a/mobs_bat/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-mobs
diff --git a/mobs_birds/depends.txt b/mobs_birds/depends.txt
deleted file mode 100644
index cc03398..0000000
--- a/mobs_birds/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-mobs
diff --git a/mobs_butterfly/depends.txt b/mobs_butterfly/depends.txt
deleted file mode 100644
index cc03398..0000000
--- a/mobs_butterfly/depends.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-default
-mobs
diff --git a/mobs_butterfly/init.lua b/mobs_butterfly/init.lua
index b43ad10..407bea2 100644
--- a/mobs_butterfly/init.lua
+++ b/mobs_butterfly/init.lua
@@ -1,5 +1,5 @@
+local butterfly_mod = minetest.get_modpath("butterflies")
 
--- local variables
 local l_skins = {
 	{"bf1.png^bf2.png^bf3.png^bf4.png^bf5.png"},
 	{	"(bf1.png^[colorize:orange)"
@@ -68,7 +68,7 @@ mobs:register_mob("mobs_butterfly:butterfly", {
 
 	after_activate = function(self, staticdata, def, dtime)
 
-		if minetest.get_modpath("butterflies") then
+		if butterfly_mod then
 
 			local pos = self.object:get_pos()
 			local butter = {"white", "red", "violet"}
@@ -78,16 +78,23 @@ mobs:register_mob("mobs_butterfly:butterfly", {
 
 			self.object:remove()
 		end
-	end
+	end,
 
---	on_rightclick = function(self, clicker)
---		mobs:capture_mob(self, clicker, 10, 80, 0, true, nil)
---	end
+	on_rightclick = function(self, clicker)
+
+		if not butterfly_mod then
+			mobs:capture_mob(self, clicker, 10, 80, 0, true, nil)
+		end
+	end
 })
 
---	mobs:spawn_specific("mobs_butterfly:butterfly", {"air"}, l_spawnnear, 5, 20, 30, l_spawnchance, 1, 0, 31000)
+if not butterfly_mod then
 
---	mobs:register_egg("mobs_butterfly:butterfly", "Butterfly", "default_cloud.png", 1)
+	mobs:spawn_specific("mobs_butterfly:butterfly", {"air"},
+			l_spawnnear, 5, 20, 30, l_spawnchance, 1, 0, 31000)
+
+	mobs:register_egg("mobs_butterfly:butterfly", "Butterfly", "default_cloud.png", 1)
+end
 
 
 print("[MOD] Mobs Redo Butterfly loaded")