tph/Repixture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check node handler for mobspawn/village node

Browse Source
This commit is contained in:
Wuzzy 2022-07-23 14:23:24 +02:00
parent 604141ea01
commit 23a8258a35
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/mobs/api.lua
View File

@ -1630,13 +1630,17 @@ function mobs:register_egg(mobname, desc, background)
inventory_image = invimg, inventory_image = invimg,
groups = { spawn_egg = 1 }, groups = { spawn_egg = 1 },
on_place = function(itemstack, placer, pointed_thing) on_place = function(itemstack, placer, pointed_thing)
local handled, handled_itemstack = util.on_place_pointed_node_handler(itemstack, placer, pointed_thing)
if handled then
return handled_itemstack
end
local pname = placer:get_player_name() local pname = placer:get_player_name()
if peaceful_only and minetest.registered_entities[mobname].type == "monster" then if peaceful_only and minetest.registered_entities[mobname].type == "monster" then
minetest.chat_send_player(pname, minetest.colorize("#FFFF00", S("Hostile mobs are disabled!"))) minetest.chat_send_player(pname, minetest.colorize("#FFFF00", S("Hostile mobs are disabled!")))
return itemstack return itemstack
end end
local pos = pointed_thing.above if pointed_thing.type == "node" then
if pointed_thing.above then local pos = pointed_thing.above
if minetest.is_protected(pos, pname) and if minetest.is_protected(pos, pname) and
not minetest.check_player_privs(placer, "protection_bypass") then not minetest.check_player_privs(placer, "protection_bypass") then
minetest.record_protection_violation(pos, pname) minetest.record_protection_violation(pos, pname)

21
mods/rp_village/mapgen.lua
View File

@ -30,15 +30,20 @@ local check_priv = function(player)
end end
local place_entity_spawner = function(itemstack, placer, pointed_thing) local place_entity_spawner = function(itemstack, placer, pointed_thing)
if not check_priv(placer) then
return itemstack
end
if pointed_thing.type ~= "node" then if pointed_thing.type ~= "node" then
return itemstack return itemstack
end end
if util.handle_node_protection(placer, pointed_thing) then if util.handle_node_protection(placer, pointed_thing) then
return itemstack return itemstack
end end
local handled, handled_itemstack = util.on_place_pointed_node_handler(itemstack, placer, pointed_thing)
if handled then
return handled_itemstack
end
if not check_priv(placer) then
return itemstack
end
local place_pos local place_pos
itemstack, place_pos = minetest.item_place(itemstack, placer, pointed_thing) itemstack, place_pos = minetest.item_place(itemstack, placer, pointed_thing)
if placer and placer:is_player() then if placer and placer:is_player() then
@ -124,15 +129,19 @@ local village_info = {
} }
local use_village_spawner = function(itemstack, placer, pointed_thing) local use_village_spawner = function(itemstack, placer, pointed_thing)
if not check_priv(placer) then
return itemstack
end
if not pointed_thing.type == "node" then if not pointed_thing.type == "node" then
return itemstack return itemstack
end end
if util.handle_node_protection(placer, pointed_thing) then if util.handle_node_protection(placer, pointed_thing) then
return itemstack return itemstack
end end
local handled, handled_itemstack = util.on_place_pointed_node_handler(itemstack, placer, pointed_thing)
if handled then
return handled_itemstack
end
if not check_priv(placer) then
return itemstack
end
local pos = pointed_thing.above local pos = pointed_thing.above