From 059389f036c61c3bb62d24e72d60785f3a4e8b95 Mon Sep 17 00:00:00 2001
From: root <root@milan-minetest2-devel-testing.lxd>
Date: Fri, 29 Oct 2021 13:57:02 +0200
Subject: [PATCH] update

---
 mods/ambience/init.lua                        |   5 +--
 mods/mobs_animal/chicken.lua                  |  31 ++++--------------
 .../textures/mobs_chicken_white.png           | Bin 0 -> 103 bytes
 3 files changed, 10 insertions(+), 26 deletions(-)
 create mode 100644 mods/mobs_animal/textures/mobs_chicken_white.png

diff --git a/mods/ambience/init.lua b/mods/ambience/init.lua
index b9d424cf..b3782573 100644
--- a/mods/ambience/init.lua
+++ b/mods/ambience/init.lua
@@ -134,13 +134,14 @@ local get_ambience = function(player, tod, name)
 	-- get foot and head level nodes at player position
 	local pos = player:get_pos() ; if not pos then return end
 	local prop = player:get_properties()
+	local eyeh = prop.eye_height or 1.47 -- eye level with fallback
 
-	pos.y = pos.y + prop.eye_height -- eye level
+	pos.y = pos.y + eyeh
 
 	local nod_head = pplus and name and playerplus[name]
 			and playerplus[name].nod_head or minetest.get_node(pos).name
 
-	pos.y = (pos.y - prop.eye_height) + 0.2 -- foot level
+	pos.y = (pos.y - eyeh) + 0.2 -- foot level
 
 	local nod_feet = pplus and name and playerplus[name]
 			and playerplus[name].nod_feet or minetest.get_node(pos).name
diff --git a/mods/mobs_animal/chicken.lua b/mods/mobs_animal/chicken.lua
index e5d82c42..061f3ba5 100644
--- a/mods/mobs_animal/chicken.lua
+++ b/mods/mobs_animal/chicken.lua
@@ -146,7 +146,7 @@ mobs:register_arrow("mobs_animal:egg_entity", {
 
 	hit_node = function(self, pos, node)
 
-		if math.random(1, 10) > 1 then
+		if math.random(10) > 1 then
 			return
 		end
 
@@ -160,28 +160,10 @@ mobs:register_arrow("mobs_animal:egg_entity", {
 			return
 		end
 
-		local mob = minetest.add_entity(pos, "mobs_animal:chicken")
-		local ent2 = mob:get_luaentity()
+		local staticdata = minetest.serialize(
+			{child = true, tamed = true, owner = self.playername})
 
-		mob:set_properties({
-			textures = ent2.child_texture[1],
-			visual_size = {
-				x = ent2.base_size.x / 2,
-				y = ent2.base_size.y / 2
-			},
-			collisionbox = {
-				ent2.base_colbox[1] / 2,
-				ent2.base_colbox[2] / 2,
-				ent2.base_colbox[3] / 2,
-				ent2.base_colbox[4] / 2,
-				ent2.base_colbox[5] / 2,
-				ent2.base_colbox[6] / 2
-			},
-		})
-
-		ent2.child = true
-		ent2.tamed = true
-		ent2.owner = self.playername
+		minetest.add_entity(pos, "mobs_animal:chicken", staticdata)
 	end
 })
 
@@ -215,13 +197,13 @@ local mobs_shoot_egg = function (item, player, pointed_thing)
 	ent.switch = 1 -- needed so that egg doesn't despawn straight away
 	ent._is_arrow = true -- tell advanced mob protection this is an arrow
 
-	obj:setvelocity({
+	obj:set_velocity({
 		x = dir.x * egg_VELOCITY,
 		y = dir.y * egg_VELOCITY,
 		z = dir.z * egg_VELOCITY
 	})
 
-	obj:setacceleration({
+	obj:set_acceleration({
 		x = dir.x * -3,
 		y = -egg_GRAVITY,
 		z = dir.z * -3
@@ -229,6 +211,7 @@ local mobs_shoot_egg = function (item, player, pointed_thing)
 
 	-- pass player name to egg for chick ownership
 	local ent2 = obj:get_luaentity()
+
 	ent2.playername = player:get_player_name()
 
 	item:take_item()
diff --git a/mods/mobs_animal/textures/mobs_chicken_white.png b/mods/mobs_animal/textures/mobs_chicken_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..87ab6906e3bc5a3f1bf31f17bbea0cd721a20030
GIT binary patch
literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0R?Bnv-810J0cMg8YIR
p9G=}s19EsgT^vI=t|uof&;#-U7#Nj=Uz7q_44$rjF6*2UngFSP6&C;i

literal 0
HcmV?d00001