mdk
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Use a vector and fix the merge fail >_<

This commit is contained in:
codiac 2023-08-14 10:48:27 +10:00
parent 034382c883
commit 0d16acdd42
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/ENTITIES/mcl_mobs/physics.lua
View File

@ -675,7 +675,7 @@ function mob_class:do_env_damage()
self.standing_in = node_ok(pos, "air").name self.standing_in = node_ok(pos, "air").name
self.standing_on = node_ok(pos2, "air").name self.standing_on = node_ok(pos2, "air").name
local pos3 = {x=pos.x, y=pos.y+1, z=pos.z} local pos3 = vector.offset(pos, 0, 1, 0)
self.standing_under = node_ok(pos3, "air").name self.standing_under = node_ok(pos3, "air").name
-- don't fall when on ignore, just stand still -- don't fall when on ignore, just stand still
@ -943,7 +943,7 @@ function mob_class:falling(pos)
-- in water then float up -- in water then float up
if registered_node.groups.water then if registered_node.groups.water then
if acc and self.floats == 1 minetest.registered_nodes[node_ok(vector.offset(pos,0,self.collisionbox[5] -0.25,0)).name].groups.water then if acc and self.floats == 1 and minetest.registered_nodes[node_ok(vector.offset(pos,0,self.collisionbox[5] -0.25,0)).name].groups.water then
self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0)) self.object:set_acceleration(vector.new(0, -self.fall_speed / (math.max(1, v.y) ^ 2), 0))
end end
else else