From 52c36d45dadccd5047b01ec67edefc25737e3a24 Mon Sep 17 00:00:00 2001 From: epCode Date: Sun, 14 Feb 2021 11:18:46 -0800 Subject: [PATCH] Remove Buggy Crawling for Fixing --- mods/PLAYER/mcl_player/init.lua | 6 ------ mods/PLAYER/mcl_playerplus/init.lua | 12 +----------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/mods/PLAYER/mcl_player/init.lua b/mods/PLAYER/mcl_player/init.lua index 0c44e768cb..2ca7b2aa08 100644 --- a/mods/PLAYER/mcl_player/init.lua +++ b/mods/PLAYER/mcl_player/init.lua @@ -173,10 +173,6 @@ minetest.register_globalstep(function(dtime) player_set_animation(player, "swim_walk_mine", animation_speed_mod) elseif not controls.sneak and standing_on_water then player_set_animation(player, "swim_walk", animation_speed_mod) - elseif node_in_feet.walkable and controls.LMB then - player_set_animation(player, "swim_walk_mine", animation_speed_mod) - elseif node_in_feet.walkable then - player_set_animation(player, "swim_walk", animation_speed_mod) elseif controls.LMB and not controls.sneak and not standing_on_water then player_set_animation(player, "walk_mine", animation_speed_mod) elseif controls.LMB and controls.sneak and not standing_on_water then @@ -186,8 +182,6 @@ minetest.register_globalstep(function(dtime) else player_set_animation(player, "sneak_walk", animation_speed_mod) end - elseif controls.LMB and node_in_feet.walkable then - player_set_animation(player, "swim_mine") elseif controls.LMB and not controls.sneak and standing_on_water then player_set_animation(player, "swim_mine") elseif controls.LMB and not controls.sneak and not standing_on_water then diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index 61af0da4c4..6c21f6a352 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -40,22 +40,13 @@ minetest.register_globalstep(function(dtime) player:set_bone_position("Arm_Right_Pitch_Control", vector.new(-3,5.785,0), vector.new(0,0,0)) end - if node_in_feet.walkable and player:get_attach() == nil then - if not controls.RMB and not controls.up and not controls.down and not controls.left and not controls.right and not controls.LMB then - mcl_player.player_set_animation(player, "swim_stand") - end - player:set_properties({collisionbox = {-0.35,1,-0.35,0.35,1.8,0.35}, eye_height = 1.65, nametag_color = { r = 225, b = 225, a = 0, g = 225 }}) - player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90,0,0)) - player:set_bone_position("Body_Control", vector.new(0,12.5,0), vector.new(90,0,180)) - elseif controls.sneak and player:get_attach() == nil then - player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(0,0,0)) + if controls.sneak and player:get_attach() == nil then -- controls head pitch when sneaking player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+36,0,0)) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,1.8,0.35}, eye_height = 1.35, nametag_color = { r = 225, b = 225, a = 0, g = 225 }}) elseif minetest.get_item_group(mcl_playerinfo[name].node_stand, "water") ~= 0 and player:get_attach() == nil then - player:set_bone_position("Body_Control", vector.new(0,12.5,0), vector.new(90,0,180)) -- controls head pitch when swiming player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90,0,0)) -- sets eye height, and nametag color accordingly @@ -63,7 +54,6 @@ minetest.register_globalstep(function(dtime) else -- controls head pitch when not sneaking - player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(0,0,0)) player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch,0,0)) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,1.8,0.35}, eye_height = 1.65, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})