Athemis/MineClone2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

try to fix mobs stuck forever in water

Browse source
This commit is contained in:
Alexander Minges 2020-05-01 22:39:11 +02:00
parent faea58469f
commit 8180f79d6c
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
mods/ENTITIES/mcl_mobs/api.lua
View file

@ -2044,7 +2044,7 @@ local do_states = function(self, dtime)
local is_in_danger = false
if lp then
minetest.log(self.name .. ": " .. minetest.get_node(lp).name)
-- minetest.log(self.name .. ": " .. minetest.get_node(lp).name)
-- if mob is flying, only check the block it is inside
if self.fly then
if is_node_dangerous(self, self.standing_in) then
@ -2066,17 +2066,35 @@ local do_states = function(self, dtime)
-- is the chosen destination safe and walkable? Retry if not (max 10 iterations)
local i = 0
while i < 10 do
local max_i = 10
while i < max_i do
local node_above_ok = false
if lp then
nn = minetest.get_node(lp).name
-- minetest.log("Found solid block: " .. nn)
if not is_node_dangerous(self, nn) and minetest.registered_nodes[nn].walkable then break
local pos = {x = lp.x, y = lp.y + 2, z = lp.z}
local node_above = minetest.get_node(pos)
local nn_above = node_above.name
minetest.log("Node: " .. nn .. " Node above: " .. nn_above)
if self.breath_max ~= -1 then
-- water-breathing mobs don't have to avoid water, but air
if self.breathes_in_water and minetest.get_item_group(nn_above, "water") then
node_above_ok = true
elseif not self.breathes_in_water and nn_above == "air" then
node_above_ok = true
end
else
node_above_ok = true
end
if not is_node_dangerous(self, nn) and minetest.registered_nodes[nn].walkable and node_above_ok then
minetest.log(self.name .. ": Found solid block: " .. nn .. " Above: " .. nn_above)
break
end
-- look for solid node 5 blocks around the mob's position
elseif i < 5 then
elseif i < (max_i / 2) then
lp = minetest.find_node_near(s, 5, {"group:solid"})
-- after 5 iterations double search radius
elseif i < 10 then
elseif i < max_i then
lp = minetest.find_node_near(s, 10, {"group:solid"})
end
i = i + 1