Merge pull request 'Swimming collides with ice properly (clean version of #2536)' (#2551) from ice_coll_fix_clean into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2551kulmapaikka
commit
c001d307f2
|
@ -377,8 +377,8 @@ minetest.register_globalstep(function(dtime)
|
|||
set_properties_conditional(player,{collisionbox = {-0.312,0,-0.312,0.312,0.8,0.312}, eye_height = 0.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
|
||||
-- control body bone when swimming
|
||||
set_bone_position_conditional(player,"Body_Control", vector.new(0,6.3,0), vector.new(degrees(dir_to_pitch(player_velocity)) - 90,-player_vel_yaw + yaw + 180,0))
|
||||
elseif get_item_group(mcl_playerinfo[name].node_head, "opaque") == 0
|
||||
and get_item_group(mcl_playerinfo[name].node_head_top, "opaque") == 0 then
|
||||
elseif get_item_group(mcl_playerinfo[name].node_head, "solid") == 0
|
||||
and get_item_group(mcl_playerinfo[name].node_head_top, "solid") == 0 then
|
||||
-- sets eye height, and nametag color accordingly
|
||||
is_swimming = false
|
||||
set_properties_conditional(player,{collisionbox = {-0.312,0,-0.312,0.312,1.8,0.312}, eye_height = 1.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
|
||||
|
|
Loading…
Reference in New Issue