forked from Mirrorlandia_minetest/minetest
Patch fast/teleport vulnerability when attached to an entity (#10340)
This commit is contained in:
parent
917e357bca
commit
65c15e137f
@ -558,11 +558,34 @@ void PlayerSAO::setMaxSpeedOverride(const v3f &vel)
|
|||||||
|
|
||||||
bool PlayerSAO::checkMovementCheat()
|
bool PlayerSAO::checkMovementCheat()
|
||||||
{
|
{
|
||||||
if (isAttached() || m_is_singleplayer ||
|
if (m_is_singleplayer ||
|
||||||
g_settings->getBool("disable_anticheat")) {
|
g_settings->getBool("disable_anticheat")) {
|
||||||
m_last_good_position = m_base_position;
|
m_last_good_position = m_base_position;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (UnitSAO *parent = dynamic_cast<UnitSAO *>(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;
|
bool cheated = false;
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user