Merge pull request 'clearmobs command improvement' (#3543) from clearmobs into master

Reviewed-on: MineClone2/MineClone2#3543
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>

mods/ENTITIES/mcl_mobs/api.lua

@@ -535,11 +535,11 @@ minetest.register_globalstep(function(dtime)
 end)
 
 
-minetest.register_chatcommand("clearmobs",{
+minetest.register_chatcommand("clearmobs", {
-	privs={maphack=true},
+	privs = { maphack = true },
-	params = "[<all>|<hostile/passive>|<name>] [<nametagged>|<range>]",
+	params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]",
-	description=S("Removes specified spawned mobs except nametagged and tamed ones. For param2, use nametagged to remove those with a nametag, or range for all mobs in a distance of the current player to be removed."),
+	description = S("Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player."),
-	func=function(player, param)
+	func = function(player, param)
 		local default = false
 		if not param or param == "" then
 			default = true
@@ -550,6 +550,7 @@ minetest.register_chatcommand("clearmobs",{
 
 		local all = false
 		local nametagged = false
+		local tamed = false
 
 		local mob_name, mob_type, range
 
@@ -577,6 +578,8 @@ minetest.register_chatcommand("clearmobs",{
 			--minetest.log ("unsafe: [" .. unsafe .. "]")
 			if unsafe == "nametagged" then
 				nametagged = true
+			elseif unsafe == "tamed" then
+				tamed = true
 			end
 
 			local num = tonumber(unsafe)
@@ -629,14 +632,20 @@ minetest.register_chatcommand("clearmobs",{
 					end
 
 					--minetest.log("o.nametag: ".. tostring(o.nametag))
-					if in_range and ( (not o.nametag or o.nametag == "" ) and not o.tamed ) then
+
-						--minetest.log("No nametag or tamed. Kill it")
+					if nametagged then
-						o.object:remove()
+						if o.nametag then
-					elseif nametagged and o.nametag then
 							--minetest.log("Namedtagged and it has a name tag. Kill it")
 							o.object:remove()
-					else
+						end
-						--minetest.log("Tamed or out of range, do not kill")
+					elseif tamed then
+						if o.tamed then
+							--minetest.log("Tamed. Kill it")
+							o.object:remove()
+						end
+					elseif in_range and (not o.nametag or o.nametag == "") and not o.tamed then
+						--minetest.log("No nametag or tamed. Kill it")
+						o.object:remove()
 					end
 				end
 			end

mods/ENTITIES/mcl_mobs/locale/template.txt

@@ -9,3 +9,5 @@ Before you use the name tag, you need to set a name at an anvil. Then you can us
 Only peaceful mobs allowed!=
 Give names to mobs=
 Set name at anvil=
+Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to select only nametagged/tamed mobs, or a range to specify a maximum distance from the player.=
+Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=