Skip to content
Permalink
Browse files

Fix object interaction distance not being checked (#10547)

  • Loading branch information
rubenwardy committed Nov 9, 2020
1 parent c940a57 commit 7589cbe086a5558eea018e1e3d25e388b26d51e8
Showing with 9 additions and 8 deletions.
  1. +2 −2 doc/lua_api.txt
  2. +7 −6 src/network/serverpackethandler.cpp
@@ -6189,9 +6189,9 @@ object you are working with still exists.
* `bone`: string
* `position`: `{x=num, y=num, z=num}` (relative)
* `rotation`: `{x=num, y=num, z=num}` = Rotation on each axis, in degrees
* `forced_visible`: Boolean to control whether the attached entity
* `forced_visible`: Boolean to control whether the attached entity
should appear in first person.
* `get_attach()`: returns parent, bone, position, rotation, forced_visible,
* `get_attach()`: returns parent, bone, position, rotation, forced_visible,
or nil if it isn't attached.
* `get_children()`: returns a list of ObjectRefs that are attached to the
object.
@@ -1050,12 +1050,13 @@ void Server::handleCommand_Interact(NetworkPacket *pkt)
}
float d = playersao->getEyePosition().getDistanceFrom(target_pos);

if (!checkInteractDistance(player, d, pointed.dump())
&& pointed.type == POINTEDTHING_NODE) {
// Re-send block to revert change on client-side
RemoteClient *client = getClient(peer_id);
v3s16 blockpos = getNodeBlockPos(pointed.node_undersurface);
client->SetBlockNotSent(blockpos);
if (!checkInteractDistance(player, d, pointed.dump())) {
if (pointed.type == POINTEDTHING_NODE) {
// Re-send block to revert change on client-side
RemoteClient *client = getClient(peer_id);
v3s16 blockpos = getNodeBlockPos(pointed.node_undersurface);
client->SetBlockNotSent(blockpos);
}
return;
}
}

0 comments on commit 7589cbe

Please sign in to comment.
You can’t perform that action at this time.