Michieal
/
MineClone2_For_PRs
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

clearmobs command: nametagged/tamed is exclusive

This commit is contained in:
𝕵𝖔𝖍𝖆𝖓𝖓𝖊𝖘 𝕱𝖗𝖎𝖙𝖟 2023-03-15 13:22:35 -05:00
parent a3e6f90b09
commit 150222583a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mods/ENTITIES/mcl_mobs/api.lua
View File

@ -538,7 +538,7 @@ end)
minetest.register_chatcommand("clearmobs", { minetest.register_chatcommand("clearmobs", {
privs = { maphack = true }, privs = { maphack = true },
params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]", params = "[all|monster|passive|<mob name> [<range>|nametagged|tamed]]",
description = S("Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to include tamed or nametagged mobs, or a range to specify a maximum distance from the player."), 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 local default = false
if not param or param == "" then if not param or param == "" then
@ -633,17 +633,17 @@ minetest.register_chatcommand("clearmobs", {
--minetest.log("o.nametag: ".. tostring(o.nametag)) --minetest.log("o.nametag: ".. tostring(o.nametag))
if nametagged and o.nametag then if nametagged then
if o.nametag then
--minetest.log("Namedtagged and it has a name tag. Kill it") --minetest.log("Namedtagged and it has a name tag. Kill it")
o.object:remove() o.object:remove()
end end
elseif tamed then
if tamed and o.tamed then if o.tamed then
--minetest.log("Tamed. Kill it") --minetest.log("Tamed. Kill it")
o.object:remove() o.object:remove()
end end
elseif in_range and (not o.nametag or o.nametag == "") and not o.tamed then
if in_range and (not o.nametag or o.nametag == "") and not o.tamed then
--minetest.log("No nametag or tamed. Kill it") --minetest.log("No nametag or tamed. Kill it")
o.object:remove() o.object:remove()
end end

2
mods/ENTITIES/mcl_mobs/locale/template.txt
View File

@ -9,5 +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!= Only peaceful mobs allowed!=
Give names to mobs= Give names to mobs=
Set name at anvil= Set name at anvil=
Removes specified mobs except nametagged and tamed ones. For the second parameter, use nametagged/tamed to include tamed or nametagged mobs, or a range to specify a maximum distance from the player.= 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= Default usage. Clearing hostile mobs. For more options please type: /help clearmobs=