mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-22 18:41:09 +01:00
Merge pull request 'Show elytra animation when using elytra' (#4108) from elytra into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/4108 Reviewed-by: the-real-herowl <the-real-herowl@noreply.git.minetest.land>
This commit is contained in:
commit
681175c463
2 changed files with 2 additions and 2 deletions
|
@ -242,7 +242,7 @@ minetest.register_globalstep(function(dtime)
|
||||||
player:get_meta():set_int("mcl_damage:damage_animation", 0)
|
player:get_meta():set_int("mcl_damage:damage_animation", 0)
|
||||||
end)
|
end)
|
||||||
elseif mcl_playerplus.elytra[player] and mcl_playerplus.elytra[player].active then
|
elseif mcl_playerplus.elytra[player] and mcl_playerplus.elytra[player].active then
|
||||||
player_set_animation(player, "stand")
|
|
||||||
elseif walking and velocity.x > 0.35
|
elseif walking and velocity.x > 0.35
|
||||||
or walking and velocity.x < -0.35
|
or walking and velocity.x < -0.35
|
||||||
or walking and velocity.z > 0.35
|
or walking and velocity.z > 0.35
|
||||||
|
|
|
@ -366,7 +366,7 @@ minetest.register_globalstep(function(dtime)
|
||||||
set_properties(player, player_props_elytra)
|
set_properties(player, player_props_elytra)
|
||||||
|
|
||||||
-- control body bone when flying
|
-- control body bone when flying
|
||||||
local body_rot = vector.new((75 - degrees(dir_to_pitch(player_velocity))), -player_vel_yaw + yaw, 0)
|
local body_rot = vector.new(degrees(dir_to_pitch(player_velocity)) + 110, -player_vel_yaw + yaw, 180)
|
||||||
set_bone_pos(player, "Body_Control", nil, body_rot)
|
set_bone_pos(player, "Body_Control", nil, body_rot)
|
||||||
elseif parent then
|
elseif parent then
|
||||||
set_properties(player, player_props_riding)
|
set_properties(player, player_props_riding)
|
||||||
|
|
Loading…
Reference in a new issue