forked from MineClone5/MineClone5
Merge remote-tracking branch 'mcl2/master' into testing
This commit is contained in:
commit
06b482b309
|
@ -31,12 +31,14 @@ local spawn_children_on_die = function(child_mob, children_count, spawn_distance
|
||||||
speed_penalty = 0.5
|
speed_penalty = 0.5
|
||||||
end
|
end
|
||||||
local mob = minetest.add_entity(newpos, child_mob)
|
local mob = minetest.add_entity(newpos, child_mob)
|
||||||
if (not mother_stuck) then
|
if mob then
|
||||||
mob:set_velocity(vector.multiply(dir, eject_speed * speed_penalty))
|
if (not mother_stuck) then
|
||||||
|
mob:set_velocity(vector.multiply(dir, eject_speed * speed_penalty))
|
||||||
|
end
|
||||||
|
mob:set_yaw(angle - math.pi/2)
|
||||||
|
table.insert(children, mob)
|
||||||
|
angle = angle + (math.pi*2)/children_count
|
||||||
end
|
end
|
||||||
mob:set_yaw(angle - math.pi/2)
|
|
||||||
table.insert(children, mob)
|
|
||||||
angle = angle + (math.pi*2)/children_count
|
|
||||||
end
|
end
|
||||||
-- If mother was murdered, children attack the killer after 1 second
|
-- If mother was murdered, children attack the killer after 1 second
|
||||||
if self.state == "attack" then
|
if self.state == "attack" then
|
||||||
|
|
|
@ -350,7 +350,7 @@ minetest.register_abm({
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
|
|
||||||
for _,object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
|
for _,object in pairs(minetest.get_objects_inside_radius(pos, 2)) do
|
||||||
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
|
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and not object:get_luaentity()._removed then
|
||||||
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
|
||||||
-- Item must get sucked in when the item just TOUCHES the block above the hopper
|
-- Item must get sucked in when the item just TOUCHES the block above the hopper
|
||||||
-- This is the reason for the Y calculation.
|
-- This is the reason for the Y calculation.
|
||||||
|
|
Loading…
Reference in New Issue