From 2a1c57534a31abe364bf69ec2eaecb556c97fb5a Mon Sep 17 00:00:00 2001 From: mckaygerhard Date: Sun, 17 Sep 2023 20:51:19 -0400 Subject: [PATCH] Revert "antihacks: Patch fast/teleport vulnerability when attached to an entity" * This reverts commit 5d5801d1515c113f1347d50a0dafada39a7cb155. due is an older branch with no enought code for implementation of getContent --- src/content_sao.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/content_sao.cpp b/src/content_sao.cpp index ed27de52f..c22e341a9 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -1370,34 +1370,12 @@ std::string PlayerSAO::getPropertyPacket() bool PlayerSAO::checkMovementCheat() { - if (m_is_singleplayer || + if (isAttached() || m_is_singleplayer || g_settings->getBool("disable_anticheat")) { m_last_good_position = m_base_position; return false; } - if (UnitSAO *parent = dynamic_cast(getParent())) { - v3f attachment_pos; - { - int parent_id; - std::string bone; - v3f attachment_rot; - getAttachment(&parent_id, &bone, &attachment_pos, &attachment_rot); - } - v3f parent_pos = parent->getBasePosition(); - f32 diff = m_base_position.getDistanceFromSQ(parent_pos) - attachment_pos.getLengthSQ(); - const f32 maxdiff = 4.0f * BS; // fair trade-off value for various latencies - - if (diff > maxdiff * maxdiff) { - setBasePosition(parent_pos); - actionstream << "Server: " << m_player->getName() - << " moved away from parent; diff=" << sqrtf(diff) / BS - << " resetting position." << std::endl; - return true; - } - // Player movement is locked to the entity. Skip further checks - return false; - } bool cheated = false; /* Check player movements