From 49920cfe8dc7869bb8235c6fe2b8ef26e2a523ca Mon Sep 17 00:00:00 2001 From: TeTpaAka Date: Fri, 29 May 2015 20:30:55 +0200 Subject: Player collisionbox: Make settable Breaks compatibility with old clients. --- src/content_cao.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/content_cao.cpp') diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 49c2049eb..2cc675573 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -972,7 +972,7 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) if (m_is_visible) { int old_anim = player->last_animation; float old_anim_speed = player->last_animation_speed; - m_position = player->getPosition() + v3f(0,BS,0); + m_position = player->getPosition(); m_velocity = v3f(0,0,0); m_acceleration = v3f(0,0,0); pos_translator.vect_show = m_position; @@ -1512,6 +1512,7 @@ void GenericCAO::processMessage(const std::string &data) if (m_is_local_player) { LocalPlayer *player = m_env->getLocalPlayer(); player->makes_footstep_sound = m_prop.makes_footstep_sound; + player->setCollisionbox(m_selection_box); } if ((m_is_player && !m_is_local_player) && m_prop.nametag == "") -- cgit v1.2.3