lanxu/MineClone2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Mobs fixes' (#3032) from mobs_cleanup into master

Browse Source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3032
This commit is contained in:
cora 2022-11-28 03:26:53 +00:00
commit c4808beef4
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ENTITIES/mcl_mobs/movement.lua
View File

@ -754,7 +754,7 @@ function mob_class:check_herd(dtime)
y = o:get_yaw() y = o:get_yaw()
end end
if p then if p then
go_to_pos(self,p) self:go_to_pos(p)
elseif y then elseif y then
self:set_yaw(y) self:set_yaw(y)
end end

2
mods/ENTITIES/mobs_mc/horse.lua
View File

@ -441,7 +441,7 @@ local horse = {
on_breed = function(parent1, parent2) on_breed = function(parent1, parent2)
local pos = parent1.object:get_pos() local pos = parent1.object:get_pos()
local child = mcl_mobs:spawn_child(pos, parent1.name) local child = mcl_mobs.spawn_child(pos, parent1.name)
if child then if child then
local ent_c = child:get_luaentity() local ent_c = child:get_luaentity()
local p = math.random(1, 2) local p = math.random(1, 2)

2
mods/ENTITIES/mobs_mc/llama.lua
View File

@ -221,7 +221,7 @@ mcl_mobs.register_mob("mobs_mc:llama", {
else else
parent = parent2 parent = parent2
end end
child = mcl_mobs:spawn_child(pos, parent.name) child = mcl_mobs.spawn_child(pos, parent.name)
if child then if child then
local ent_c = child:get_luaentity() local ent_c = child:get_luaentity()
ent_c.base_texture = table.copy(ent_c.base_texture) ent_c.base_texture = table.copy(ent_c.base_texture)

2
mods/ENTITIES/mobs_mc/pig.lua
View File

@ -186,7 +186,7 @@ mcl_mobs.register_mob("mobs_mc:pig", {
on_breed = function(parent1, parent2) on_breed = function(parent1, parent2)
local pos = parent1.object:get_pos() local pos = parent1.object:get_pos()
local child = mcl_mobs:spawn_child(pos, parent1.name) local child = mcl_mobs.spawn_child(pos, parent1.name)
if child then if child then
local ent_c = child:get_luaentity() local ent_c = child:get_luaentity()
ent_c.tamed = true ent_c.tamed = true

2
mods/ENTITIES/mobs_mc/sheep.lua
View File

@ -267,7 +267,7 @@ mcl_mobs.register_mob("mobs_mc:sheep", {
on_breed = function(parent1, parent2) on_breed = function(parent1, parent2)
-- Breed sheep and choose a fur color for the child. -- Breed sheep and choose a fur color for the child.
local pos = parent1.object:get_pos() local pos = parent1.object:get_pos()
local child = mcl_mobs:spawn_child(pos, parent1.name) local child = mcl_mobs.spawn_child(pos, parent1.name)
if child then if child then
local ent_c = child:get_luaentity() local ent_c = child:get_luaentity()
local color1 = parent1.color local color1 = parent1.color

4
mods/ITEMS/mcl_throwing/register.lua
View File

@ -141,7 +141,7 @@ local function egg_on_step(self, dtime)
local r = math.random(1,8) local r = math.random(1,8)
if r == 1 then if r == 1 then
mcl_mobs:spawn_child(self._lastpos, "mobs_mc:chicken") mcl_mobs.spawn_child(self._lastpos, "mobs_mc:chicken")
-- BONUS ROUND: 1/32 chance to spawn 3 additional chicks -- BONUS ROUND: 1/32 chance to spawn 3 additional chicks
local r = math.random(1,32) local r = math.random(1,32)
@ -153,7 +153,7 @@ local function egg_on_step(self, dtime)
} }
for o=1, 3 do for o=1, 3 do
local pos = vector.add(self._lastpos, offsets[o]) local pos = vector.add(self._lastpos, offsets[o])
mcl_mobs:spawn_child(pos, "mobs_mc:chicken") mcl_mobs.spawn_child(pos, "mobs_mc:chicken")
end end
end end
end end