From 6101de8d68e186664eddf70418b8b5960cae8d87 Mon Sep 17 00:00:00 2001 From: cora Date: Wed, 10 Aug 2022 20:00:30 +0200 Subject: [PATCH 1/2] Fix parrot punch spam --- mods/ENTITIES/mobs_mc/parrot.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua index 80a5b9318..9ee03ac58 100644 --- a/mods/ENTITIES/mobs_mc/parrot.lua +++ b/mods/ENTITIES/mobs_mc/parrot.lua @@ -118,7 +118,7 @@ end mcl_mobs:register_mob("mobs_mc:parrot", { description = S("Parrot"), - type = "npc", + type = "passive", spawn_class = "passive", pathfinding = 1, hp_min = 6, From 374e30b4a55bfaac152f153b15b5ae1905eafe36 Mon Sep 17 00:00:00 2001 From: cora Date: Wed, 10 Aug 2022 20:05:25 +0200 Subject: [PATCH 2/2] stay on players shoulder in when flying in creative --- mods/ENTITIES/mobs_mc/parrot.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua index 9ee03ac58..d4b6c12e6 100644 --- a/mods/ENTITIES/mobs_mc/parrot.lua +++ b/mods/ENTITIES/mobs_mc/parrot.lua @@ -92,7 +92,8 @@ local function check_perch(self,dtime) local n1 = minetest.get_node(vector.offset(p:get_pos(),0,-0.6,0)).name local n2 = minetest.get_node(vector.offset(p:get_pos(),0,0,0)).name local n3 = minetest.get_node(vector.offset(p:get_pos(),0,1,0)).name - if n1 == "air" or minetest.get_item_group(n2,"water") > 0 or minetest.get_item_group(n2,"lava") > 0 then + if ( n1 == "air" or minetest.get_item_group(n2,"water") > 0 or minetest.get_item_group(n2,"lava") > 0) and + not minetest.is_creative_enabled(p:get_player_name()) then o:set_detach() self.detach_timer = 0 return