summaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
authorparamat <mat.gregory@virginmedia.com>2017-05-09 01:59:02 +0100
committerparamat <mat.gregory@virginmedia.com>2017-05-09 03:52:28 +0100
commitda88a186766020762f5c86bc6ba1624e4feaae2c (patch)
treef8abbc09c17f951da1e768a963e9b0a68d7d8611 /src/content_cao.cpp
parentc07c642ab091b7250ecdc5defee1fec26ba73dc4 (diff)
downloadminetest-da88a186766020762f5c86bc6ba1624e4feaae2c.tar.gz
minetest-da88a186766020762f5c86bc6ba1624e4feaae2c.tar.bz2
minetest-da88a186766020762f5c86bc6ba1624e4feaae2c.zip
Revert custom player collision box and step height commits
These caused inability to pass through 2 node high spaces or step up onto slabs or steps when a new client connected to an older server.
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index d0d3eb84f..4dde2bb7b 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -1586,13 +1586,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;
-
- aabb3f collisionbox = m_selection_box;
- collisionbox.MinEdge += v3f(0, BS, 0);
- collisionbox.MaxEdge += v3f(0, BS, 0);
- player->setCollisionbox(collisionbox);
}
if ((m_is_player && !m_is_local_player) && m_prop.nametag == "")