forked from VoxeLibre/VoxeLibre
Compare commits
4 Commits
environmen
...
master
Author | SHA1 | Date |
---|---|---|
kno10 | 253a06fa08 | |
kno10 | dcfd31d17a | |
teknomunk | c34aecfcab | |
Mikita Wiśniewski | 9cb4f51468 |
|
@ -388,7 +388,7 @@ end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local function on_step_work (self, dtime)
|
local function on_step_work(self, dtime, moveresult)
|
||||||
local pos = self.object:get_pos()
|
local pos = self.object:get_pos()
|
||||||
if not pos then return end
|
if not pos then return end
|
||||||
|
|
||||||
|
@ -402,7 +402,7 @@ local function on_step_work (self, dtime)
|
||||||
-- Do we abandon out of here now?
|
-- Do we abandon out of here now?
|
||||||
end
|
end
|
||||||
|
|
||||||
if self:falling(pos) then return end
|
if self:falling(pos, moveresult) then return end
|
||||||
if self:step_damage (dtime, pos) then return end
|
if self:step_damage (dtime, pos) then return end
|
||||||
|
|
||||||
if self.state == "die" then return end
|
if self.state == "die" then return end
|
||||||
|
@ -502,11 +502,11 @@ end
|
||||||
|
|
||||||
|
|
||||||
-- main mob function
|
-- main mob function
|
||||||
function mob_class:on_step(dtime)
|
function mob_class:on_step(dtime, moveresult)
|
||||||
if not DEVELOPMENT then
|
if not DEVELOPMENT then
|
||||||
-- Removed as bundled Lua (5.1 doesn't support xpcall)
|
-- Removed as bundled Lua (5.1 doesn't support xpcall)
|
||||||
--local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
|
--local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
|
||||||
local status, retVal = pcall(on_step_work, self, dtime)
|
local status, retVal = pcall(on_step_work, self, dtime, moveresult)
|
||||||
if status then
|
if status then
|
||||||
return retVal
|
return retVal
|
||||||
else
|
else
|
||||||
|
@ -521,7 +521,7 @@ function mob_class:on_step(dtime)
|
||||||
log_error (dump(retVal), dump(pos), dump(self))
|
log_error (dump(retVal), dump(pos), dump(self))
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
return on_step_work (self, dtime)
|
return on_step_work (self, dtime, moveresult)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -615,7 +615,7 @@ function mcl_mobs.register_egg(mob_id, desc, background_color, overlay_color, ad
|
||||||
|
|
||||||
pos.y = pos.y - 1
|
pos.y = pos.y - 1
|
||||||
local mob = mcl_mobs.spawn(pos, mob_name)
|
local mob = mcl_mobs.spawn(pos, mob_name)
|
||||||
if not object then
|
if not mob then
|
||||||
pos.y = pos.y + 1
|
pos.y = pos.y + 1
|
||||||
mob = mcl_mobs.spawn(pos, mob_name)
|
mob = mcl_mobs.spawn(pos, mob_name)
|
||||||
if not mob then return end
|
if not mob then return end
|
||||||
|
|
|
@ -927,7 +927,8 @@ end
|
||||||
|
|
||||||
-- falling and fall damage
|
-- falling and fall damage
|
||||||
-- returns true if mob died
|
-- returns true if mob died
|
||||||
function mob_class:falling(pos)
|
function mob_class:falling(pos, moveresult)
|
||||||
|
if moveresult and moveresult.touching_ground then return false end
|
||||||
|
|
||||||
if self.fly and self.state ~= "die" then
|
if self.fly and self.state ~= "die" then
|
||||||
return
|
return
|
||||||
|
|
|
@ -74,7 +74,7 @@ function mcl_bamboo.break_orphaned(pos)
|
||||||
local node_name = node_below.name
|
local node_name = node_below.name
|
||||||
|
|
||||||
-- short circuit checks.
|
-- short circuit checks.
|
||||||
if mcl_bamboo.is_dirt(node_name) or mcl_bamboo.is_bamboo(node_name) or mcl_bamboo.is_bamboo(minetest.get_node(pos).name) == false then
|
if node_name == "ignore" or mcl_bamboo.is_dirt(node_name) or mcl_bamboo.is_bamboo(node_name) or mcl_bamboo.is_bamboo(minetest.get_node(pos).name) == false then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -79,7 +79,7 @@ minetest.register_lbm({
|
||||||
local node_name = node.name
|
local node_name = node.name
|
||||||
node.name = node_name .. "_small"
|
node.name = node_name .. "_small"
|
||||||
minetest.swap_node(pos, node)
|
minetest.swap_node(pos, node)
|
||||||
select_and_spawn_entity(pos, node)
|
mcl_chests.select_and_spawn_entity(pos, node)
|
||||||
if node_name == "mcl_chests:trapped_chest_on" then
|
if node_name == "mcl_chests:trapped_chest_on" then
|
||||||
minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " .. minetest.pos_to_string(pos))
|
minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " .. minetest.pos_to_string(pos))
|
||||||
mcl_chests.chest_update_after_close(pos)
|
mcl_chests.chest_update_after_close(pos)
|
||||||
|
|
|
@ -196,7 +196,7 @@ function kelp.find_unsubmerged(pos, node, height)
|
||||||
for i=1,height do
|
for i=1,height do
|
||||||
walk_pos.y = y + i
|
walk_pos.y = y + i
|
||||||
local walk_node = mt_get_node(walk_pos)
|
local walk_node = mt_get_node(walk_pos)
|
||||||
if not kelp.is_submerged(walk_node) then
|
if walk_node.name ~= "ignore" and not kelp.is_submerged(walk_node) then
|
||||||
return walk_pos, walk_node, height, i
|
return walk_pos, walk_node, height, i
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue